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

Fix: Wrong currency in request money page after login #25786

Merged
merged 12 commits into from
Sep 25, 2023
+23 −0
Merged

Fix: Wrong currency in request money page after login #25786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8838983
fix: wrong currency in request money pageafter login
tienifr Aug 23, 2023
69e8f1c
Merge branch 'main' of https://github.com/tienifr/App into fix/24393
tienifr Aug 28, 2023
52edc8d
fix loader on already logged in
tienifr Aug 28, 2023
8a8fbcd
Merge branch 'main' into fix/24393
tienifr Aug 31, 2023
6e77f61
Merge branch 'main' into fix/24393
tienifr Sep 8, 2023
d034546
Merge branch 'main' of https://github.com/tienifr/App into fix/24393
tienifr Sep 12, 2023
fdd6e67
Merge branch 'main' of https://github.com/tienifr/App into fix/24393
tienifr Sep 15, 2023
1fa653b
Merge branch 'main' of https://github.com/tienifr/App into fix/24393
tienifr Sep 18, 2023
fc5d5d9
Merge branch 'main' of https://github.com/tienifr/App into fix/24393
tienifr Sep 19, 2023
2445576
Merge branch 'main' of https://github.com/tienifr/App into fix/24393
tienifr Sep 20, 2023
7e7259a
Merge branch 'main' of https://github.com/tienifr/App into fix/24393
tienifr Sep 21, 2023
ecb657b
Merge branch 'main' of https://github.com/tienifr/App into fix/24393
tienifr Sep 22, 2023
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
10 changes: 10 additions & 0 deletions src/libs/actions/IOU.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import * as ErrorUtils from '../ErrorUtils';
import * as UserUtils from '../UserUtils';
import * as Report from './Report';
import * as NumberUtils from '../NumberUtils';
import * as SessionUtils from '../SessionUtils';

let allReports;
Onyx.connect({
Expand Down Expand Up @@ -51,11 +52,20 @@ Onyx.connect({
},
});

let shouldResetIOUAfterLogin = true;
let currentUserPersonalDetails = {};
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
callback: (val) => {
currentUserPersonalDetails = lodashGet(val, userAccountID, {});
if (val && SessionUtils.didUserLogInDuringSession() && shouldResetIOUAfterLogin) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we might want to remove the didInitCurrency outside this condition for this to work as intended.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried removing it but seemed like the merge for didInitCurrency happened too quick (even before resetRequestMoney and thus there would be no loader shown.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So what's the fix for this? With the current implementation, I see an infinitely loading screen.
#25786 (comment)

// eslint-disable-next-line no-use-before-define
resetMoneyRequestInfo();
shouldResetIOUAfterLogin = false;
Onyx.merge(ONYXKEYS.IOU, {
didInitCurrency: true,
});
}
},
});

Expand Down
5 changes: 5 additions & 0 deletions src/pages/iou/steps/NewRequestAmountPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import FullPageNotFoundView from '../../../components/BlockingViews/FullPageNotF
import styles from '../../../styles/styles';
import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
import ScreenWrapper from '../../../components/ScreenWrapper';
import FullScreenLoadingIndicator from '../../../components/FullscreenLoadingIndicator';

const propTypes = {
route: PropTypes.shape({
Expand Down Expand Up @@ -172,6 +173,10 @@ function NewRequestAmountPage({route, iou, report}) {
/>
);

if (!lodashGet(iou, 'didInitCurrency', false)) {
return <FullScreenLoadingIndicator />;
}

// ScreenWrapper is only needed in edit mode because we have a dedicated route for the edit amount page (MoneyRequestEditAmountPage).
// The rest of the cases this component is rendered through <MoneyRequestSelectorPage /> which has it's own ScreenWrapper
if (!isEditing) {
Expand Down