Skip to content

fix: tooltip displayed on receipt page #60704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cristipaval merged 8 commits into from
May 1, 2025
Merged

fix: tooltip displayed on receipt page #60704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9d04dcf
fix: the product training tooltip display on receipt page
linhvovan29546 Apr 23, 2025
237e648
fix: eslint fail
linhvovan29546 Apr 23, 2025
e7d613b
fix: eslint fail
linhvovan29546 Apr 23, 2025
01ae2eb
fix: update canBeMissing
linhvovan29546 Apr 23, 2025
9b7d337
Merge branch 'main' into fix/58959-tooltip-display-on-receipt-page
linhvovan29546 Apr 25, 2025
2ce1636
Merge branch 'main' into fix/58959-tooltip-display-on-receipt-page
linhvovan29546 Apr 28, 2025
5313722
Merge branch 'Expensify:main' into fix/58959-tooltip-display-on-recei…
linhvovan29546 Apr 28, 2025
c2d162a
Merge branch 'Expensify:main' into fix/58959-tooltip-display-on-recei…
linhvovan29546 Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/pages/iou/request/IOURequestStartPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ function IOURequestStartPage({
<IOURequestStepScan
route={route}
navigation={navigation}
isTooltipAllowed
/>
</TabScreenWithFocusTrapWrapper>
)}
Expand Down
3 changes: 2 additions & 1 deletion src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ function IOURequestStepScan({
},
transaction,
currentUserPersonalDetails,
isTooltipAllowed = false,
}: IOURequestStepScanProps) {
const theme = useTheme();
const styles = useThemeStyles();
Expand Down Expand Up @@ -544,7 +545,7 @@ function IOURequestStepScan({

const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip} = useProductTrainingContext(
CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP,
!getIsUserSubmittedExpenseOrScannedReceipt() && Permissions.canUseManagerMcTest(betas) && isTabActive && !isUserInvitedToWorkspace(),
isTooltipAllowed && !getIsUserSubmittedExpenseOrScannedReceipt() && Permissions.canUseManagerMcTest(betas) && isTabActive && !isUserInvitedToWorkspace(),
{
onConfirm: setTestReceiptAndNavigate,
onDismiss: () => {
Expand Down
3 changes: 2 additions & 1 deletion src/pages/iou/request/step/IOURequestStepScan/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ function IOURequestStepScan({
},
transaction,
currentUserPersonalDetails,
isTooltipAllowed = false,
}: Omit<IOURequestStepScanProps, 'user'>) {
const theme = useTheme();
const styles = useThemeStyles();
Expand Down Expand Up @@ -604,7 +605,7 @@ function IOURequestStepScan({

const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip} = useProductTrainingContext(
CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP,
!getIsUserSubmittedExpenseOrScannedReceipt() && Permissions.canUseManagerMcTest(betas) && isTabActive && !isUserInvitedToWorkspace(),
isTooltipAllowed && !getIsUserSubmittedExpenseOrScannedReceipt() && Permissions.canUseManagerMcTest(betas) && isTabActive && !isUserInvitedToWorkspace(),
{
onConfirm: setTestReceiptAndNavigate,
onDismiss: () => {
Expand Down
3 changes: 3 additions & 0 deletions src/pages/iou/request/step/IOURequestStepScan/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ type IOURequestStepScanProps = WithCurrentUserPersonalDetailsProps &
WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_SCAN | typeof SCREENS.MONEY_REQUEST.CREATE> & {
/** Holds data related to Money Request view state, rather than the underlying Money Request data. */
transaction: OnyxEntry<OnyxTypes.Transaction>;

/* If the tooltip is allowed to be shown */
isTooltipAllowed?: boolean;
};

export default IOURequestStepScanProps;