merge main

Expensify · Feb 6, 2024 · 79c4485 · 79c4485
2 parents 2a8a2ff + 8563c0f
commit 79c4485
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/__mocks__/@react-navigation/native/index.js → __mocks__/@react-navigation/native/index.ts b/__mocks__/@react-navigation/native/index.js → __mocks__/@react-navigation/native/index.ts
@@ -1,7 +1,7 @@
 import {useIsFocused as realUseIsFocused} from '@react-navigation/native';
 
 // We only want this mocked for storybook, not jest
-const useIsFocused = process.env.NODE_ENV === 'test' ? realUseIsFocused : () => true;
+const useIsFocused: typeof realUseIsFocused = process.env.NODE_ENV === 'test' ? realUseIsFocused : () => true;
 
 export * from '@react-navigation/core';
 export * from '@react-navigation/native';

diff --git a/src/components/ReportActionItem/MoneyRequestPreview.tsx b/src/components/ReportActionItem/MoneyRequestPreview.tsx
@@ -321,7 +321,7 @@ function MoneyRequestPreview({
                                     {shouldShowDescription && <RenderHTML html={parser.replace(merchantOrDescription)} />}
                                     {shouldShowMerchant && <Text style={[styles.textLabelSupporting, styles.textNormal]}>{merchantOrDescription}</Text>}
                                 </View>
-                                {isBillSplit && participantAccountIDs.length > 0 && requestAmount && requestAmount > 0 && (
+                                {isBillSplit && participantAccountIDs.length > 0 && !!requestAmount && requestAmount > 0 && (
                                     <Text style={[styles.textLabel, styles.colorMuted, styles.ml1, styles.amountSplitPadding]}>
                                         {translate('iou.amountEach', {
                                             amount: CurrencyUtils.convertToDisplayString(

diff --git a/src/pages/ShareCodePage.tsx b/src/pages/ShareCodePage.tsx
@@ -109,7 +109,8 @@ function ShareCodePage({report, session, currentUserPersonalDetails}: ShareCodeP
                             isAnonymousAction
                             title={translate('common.download')}
                             icon={Expensicons.Download}
-                            onPress={qrCodeRef.current?.download}
+                            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+                            onPress={() => qrCodeRef.current?.download?.()}
                         />
                     )}