Skip to content
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

[Held requests] Hold Request education modal reappears after relogin #40435

Merged
merged 16 commits into from
Jun 19, 2024
Merged

[Held requests] Hold Request education modal reappears after relogin #40435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ce3a19d
rename values to use dismissedHoldUseExplanation added to the backend
cdOut Apr 18, 2024
facf730
add api call to save the value on the backend
cdOut Apr 18, 2024
0a1c090
fix prettier
cdOut Apr 18, 2024
681a688
Merge branch 'main' into hold-interstitial/backend-fix
cdOut May 9, 2024
600a1cc
Merge branch 'main' into hold-interstitial/backend-fix
cdOut Jun 3, 2024
92b9c2b
correct ONYXKEYS value for dismissal
cdOut Jun 3, 2024
12ea46c
use dismissed nvp in interstitial display logic
cdOut Jun 3, 2024
ba3a413
add useOnyx parameters to fix initialValue bug
cdOut Jun 3, 2024
c019474
Merge branch 'main' into hold-interstitial/backend-fix
cdOut Jun 4, 2024
5c992d1
Merge branch 'main' into hold-interstitial/backend-fix
cdOut Jun 5, 2024
f881f97
correct nvp name in onyxkeys setup
cdOut Jun 5, 2024
c2c8f73
add initialValue to omit null
cdOut Jun 7, 2024
df875b3
Merge branch 'main' into hold-interstitial/backend-fix
cdOut Jun 7, 2024
a39e7fc
code cleanup
cdOut Jun 7, 2024
d2e846b
Merge branch 'main' into hold-interstitial/backend-fix
cdOut Jun 17, 2024
6873dd9
fix prettier
cdOut Jun 17, 2024
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
6 changes: 3 additions & 3 deletions src/ONYXKEYS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ const ONYXKEYS = {
/** Whether the user has tried focus mode yet */
NVP_TRY_FOCUS_MODE: 'nvp_tryFocusMode',

/** Whether the user has been shown the hold educational interstitial yet */
NVP_HOLD_USE_EXPLAINED: 'holdUseExplained',
/** Whether the user has dismissed the hold educational interstitial */
NVP_DISMISSED_HOLD_USE_EXPLANATION: 'nvp_dismissedHoldUseExplanation',

/** Store the state of the subscription */
NVP_PRIVATE_SUBSCRIPTION: 'nvp_private_subscription',
Expand Down Expand Up @@ -635,7 +635,7 @@ type OnyxValuesMapping = {
[ONYXKEYS.NVP_BLOCKED_FROM_CHAT]: string;
[ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID]: string;
[ONYXKEYS.NVP_TRY_FOCUS_MODE]: boolean;
[ONYXKEYS.NVP_HOLD_USE_EXPLAINED]: boolean;
[ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION]: boolean;
[ONYXKEYS.FOCUS_MODE_NOTIFICATION]: boolean;
[ONYXKEYS.NVP_LAST_PAYMENT_METHOD]: OnyxTypes.LastPaymentMethod;
[ONYXKEYS.NVP_RECENT_WAYPOINTS]: OnyxTypes.RecentWaypoint[];
Expand Down
11 changes: 5 additions & 6 deletions src/components/MoneyRequestHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@ function MoneyRequestHeader({report, parentReportAction, policy, shouldUseNarrow
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${(parentReportAction as ReportAction & OriginalMessageIOU)?.originalMessage?.IOUTransactionID ?? -1}`);
const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
const [session] = useOnyx(ONYXKEYS.SESSION);
const [holdUseExplained, holdUseExplainedResult] = useOnyx(ONYXKEYS.NVP_HOLD_USE_EXPLAINED);
const isLoadingHoldUseExplained = isLoadingOnyxValue(holdUseExplainedResult);

const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true});
const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult);
const styles = useThemeStyles();
const theme = useTheme();
const {translate} = useLocalize();
Expand Down Expand Up @@ -180,8 +179,8 @@ function MoneyRequestHeader({report, parentReportAction, policy, shouldUseNarrow
if (isLoadingHoldUseExplained) {
return;
}
setShouldShowHoldMenu(isOnHold && !holdUseExplained);
}, [isOnHold, holdUseExplained, isLoadingHoldUseExplained]);
setShouldShowHoldMenu(isOnHold && !dismissedHoldUseExplanation);
}, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);

useEffect(() => {
if (!shouldShowHoldMenu) {
Expand All @@ -198,7 +197,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, shouldUseNarrow
}, [isSmallScreenWidth, shouldShowHoldMenu]);

const handleHoldRequestClose = () => {
IOU.setShownHoldUseExplanation();
IOU.dismissHoldUseExplanation();
};

if (canDeleteRequest) {
Expand Down
24 changes: 20 additions & 4 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import type {
RequestMoneyParams,
SendInvoiceParams,
SendMoneyParams,
SetNameValuePairParams,
SplitBillParams,
StartSplitBillParams,
SubmitReportParams,
Expand Down Expand Up @@ -6677,8 +6678,23 @@ function setMoneyRequestTaxAmount(transactionID: string, taxAmount: number | nul
Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {taxAmount});
}

function setShownHoldUseExplanation() {
Onyx.set(ONYXKEYS.NVP_HOLD_USE_EXPLAINED, true);
function dismissHoldUseExplanation() {
const parameters: SetNameValuePairParams = {
name: ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION,
robertjchen marked this conversation as resolved.
Show resolved Hide resolved
value: true,
};

const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION,
robertjchen marked this conversation as resolved.
Show resolved Hide resolved
value: true,
},
];

API.write(WRITE_COMMANDS.SET_NAME_VALUE_PAIR, parameters, {
optimisticData,
});
}

/**
Expand Down Expand Up @@ -6977,7 +6993,8 @@ export {
setMoneyRequestTag,
setMoneyRequestTaxAmount,
setMoneyRequestTaxRate,
setShownHoldUseExplanation,
dismissHoldUseExplanation,
updateMoneyRequestDate,
setSplitShares,
resetSplitShares,
setIndividualShare,
Expand All @@ -6993,7 +7010,6 @@ export {
updateMoneyRequestAmountAndCurrency,
updateMoneyRequestBillable,
updateMoneyRequestCategory,
updateMoneyRequestDate,
updateMoneyRequestDescription,
updateMoneyRequestDistance,
updateMoneyRequestMerchant,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ProcessMoneyRequestHoldPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function ProcessMoneyRequestHoldPage() {
const {translate} = useLocalize();

const onConfirm = useCallback(() => {
IOU.setShownHoldUseExplanation();
IOU.dismissHoldUseExplanation();
Navigation.goBack();
}, []);

cdOut marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading