Skip to content

Commit a202ac3

Browse files
authored
Merge pull request #60704 from linhvovan29546/fix/58959-tooltip-display-on-receipt-page
fix: tooltip displayed on receipt page
2 parents a865bac + c2d162a commit a202ac3

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

src/pages/iou/request/IOURequestStartPage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ function IOURequestStartPage({
176176
<IOURequestStepScan
177177
route={route}
178178
navigation={navigation}
179+
isTooltipAllowed
179180
/>
180181
</TabScreenWithFocusTrapWrapper>
181182
)}

src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ function IOURequestStepScan({
7878
},
7979
transaction,
8080
currentUserPersonalDetails,
81+
isTooltipAllowed = false,
8182
}: IOURequestStepScanProps) {
8283
const theme = useTheme();
8384
const styles = useThemeStyles();
@@ -544,7 +545,7 @@ function IOURequestStepScan({
544545

545546
const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip} = useProductTrainingContext(
546547
CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP,
547-
!getIsUserSubmittedExpenseOrScannedReceipt() && Permissions.canUseManagerMcTest(betas) && isTabActive && !isUserInvitedToWorkspace(),
548+
isTooltipAllowed && !getIsUserSubmittedExpenseOrScannedReceipt() && Permissions.canUseManagerMcTest(betas) && isTabActive && !isUserInvitedToWorkspace(),
548549
{
549550
onConfirm: setTestReceiptAndNavigate,
550551
onDismiss: () => {

src/pages/iou/request/step/IOURequestStepScan/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ function IOURequestStepScan({
8484
},
8585
transaction,
8686
currentUserPersonalDetails,
87+
isTooltipAllowed = false,
8788
}: Omit<IOURequestStepScanProps, 'user'>) {
8889
const theme = useTheme();
8990
const styles = useThemeStyles();
@@ -604,7 +605,7 @@ function IOURequestStepScan({
604605

605606
const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip} = useProductTrainingContext(
606607
CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP,
607-
!getIsUserSubmittedExpenseOrScannedReceipt() && Permissions.canUseManagerMcTest(betas) && isTabActive && !isUserInvitedToWorkspace(),
608+
isTooltipAllowed && !getIsUserSubmittedExpenseOrScannedReceipt() && Permissions.canUseManagerMcTest(betas) && isTabActive && !isUserInvitedToWorkspace(),
608609
{
609610
onConfirm: setTestReceiptAndNavigate,
610611
onDismiss: () => {

src/pages/iou/request/step/IOURequestStepScan/types.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ type IOURequestStepScanProps = WithCurrentUserPersonalDetailsProps &
88
WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_SCAN | typeof SCREENS.MONEY_REQUEST.CREATE> & {
99
/** Holds data related to Money Request view state, rather than the underlying Money Request data. */
1010
transaction: OnyxEntry<OnyxTypes.Transaction>;
11+
12+
/* If the tooltip is allowed to be shown */
13+
isTooltipAllowed?: boolean;
1114
};
1215

1316
export default IOURequestStepScanProps;

0 commit comments

Comments
 (0)