Skip to content

fix: billing card currency form wait until request has finished before closing #46635

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
blimpich merged 8 commits into from
Aug 15, 2024
Merged

fix: billing card currency form wait until request has finished before closing #46635

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
02ac29b
fix: billing card currency form wait until request has finished befor…
nkdengineer Aug 1, 2024
7842da8
fix: rename form to match BE
nkdengineer Aug 1, 2024
267e235
change draft form name
nkdengineer Aug 1, 2024
b602a88
Merge branch 'main' into fix/45645
nkdengineer Aug 5, 2024
abafcb7
Merge branch 'main' into fix/45645
nkdengineer Aug 6, 2024
c491dac
Merge branch 'main' into fix/45645
nkdengineer Aug 9, 2024
971d771
Merge branch 'main' into fix/45645
nkdengineer Aug 12, 2024
0923d44
fix: add prev is loading
nkdengineer Aug 12, 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
4 changes: 2 additions & 2 deletions src/ONYXKEYS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,8 @@ const ONYXKEYS = {
SETTINGS_STATUS_SET_CLEAR_AFTER_FORM_DRAFT: 'settingsStatusSetClearAfterFormDraft',
SETTINGS_STATUS_CLEAR_DATE_FORM: 'settingsStatusClearDateForm',
SETTINGS_STATUS_CLEAR_DATE_FORM_DRAFT: 'settingsStatusClearDateFormDraft',
CHANGE_BILLING_CURRENCY_FORM: 'changeBillingCurrencyForm',
CHANGE_BILLING_CURRENCY_FORM_DRAFT: 'changeBillingCurrencyFormDraft',
CHANGE_BILLING_CURRENCY_FORM: 'billingCurrencyForm',
CHANGE_BILLING_CURRENCY_FORM_DRAFT: 'billingCurrencyFormDraft',
PRIVATE_NOTES_FORM: 'privateNotesForm',
PRIVATE_NOTES_FORM_DRAFT: 'privateNotesFormDraft',
I_KNOW_A_TEACHER_FORM: 'iKnowTeacherForm',
Expand Down
22 changes: 18 additions & 4 deletions src/pages/settings/Subscription/PaymentCard/ChangeBillingCurrency/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useCallback, useMemo} from 'react';
import React, {useCallback, useEffect, useMemo} from 'react';
import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import type {ValueOf} from 'type-fest';
Expand All @@ -7,6 +7,7 @@ import type {FormOnyxValues} from '@components/Form/types';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import useLocalize from '@hooks/useLocalize';
import usePrevious from '@hooks/usePrevious';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@navigation/Navigation';
import * as PaymentMethods from '@userActions/PaymentMethods';
Expand All @@ -19,11 +20,24 @@ function ChangeBillingCurrency() {
const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard), [fundList]);

const changeBillingCurrency = useCallback((currency?: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>, values?: FormOnyxValues<typeof ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM>) => {
if (values?.securityCode) {
PaymentMethods.updateBillingCurrency(currency ?? CONST.PAYMENT_CARD_CURRENCY.USD, values.securityCode);
const [formData] = useOnyx(ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM);
const formDataComplete = formData?.isLoading === false && !formData.errors;
const prevIsLoading = usePrevious(formData?.isLoading);
const prevFormDataComplete = usePrevious(formDataComplete);

useEffect(() => {
Comment thread
blimpich marked this conversation as resolved.
Resolved
if (!formDataComplete || prevFormDataComplete || !prevIsLoading) {
return;
}
Navigation.goBack();
}, [formDataComplete, prevFormDataComplete, prevIsLoading]);

const changeBillingCurrency = useCallback((currency?: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>, values?: FormOnyxValues<typeof ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM>) => {
if (!values?.securityCode) {
Navigation.goBack();
return;
}
PaymentMethods.updateBillingCurrency(currency ?? CONST.PAYMENT_CARD_CURRENCY.USD, values.securityCode);
}, []);

return (
Expand Down