[Merge Account] Remove the initial route from state after successful merge#60751
[Merge Account] Remove the initial route from state after successful merge#60751arosiclair merged 12 commits intoExpensify:mainfrom
Conversation
|
@parasharrajat Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
|
I will complete the checklist in morning. |
This comment was marked as outdated.
This comment was marked as outdated.
|
Also, notice this weird navigation history. Steps:
29.04.2025_21.39.14_REC.mp4 |
@parasharrajat This is to be tested on the success page. On error page, the back button should work as usual. |
Not sure if this is a bug. It's taking you back to the pages that you visited. |
Definitely looks like a bug. Why are we pushing so many copies of the email page onto the stack? Let's try to fix that so there's only one. |
Done. |
|
This does not look solved. I can still see email page history. |
|
The page crashed after adding validation code. 30.04.2025_14.19.25_REC.mp4 |
Screen recording please? |
|
Seems to work well for me. Screen.Recording.2025-04-30.at.5.41.00.PM.mov |
Not able to reproduce. Are you sure that you're on the latest code? |
|
@parasharrajat What's the latest here? |
|
I will retest and give you vid in 30 minutes. I was facing issues with iOS builds till yesterday. |
|
Please do so. Let's try to finish this today. |
I think this behavior is fine since nothing is broken after navigating like this.
Agree this should animate in from the right. Is that something we can fix @allroundexperts?
Are you also seeing this @allroundexperts? |
Not able to reproduce.
Will look into this today. |
Okay. I managed to check this and it happens because of I think this is not a blocker. |
|
Alright can you conclude your review @parasharrajat? |
|
@allroundexperts Looks like this issue is coming with autofocus https://expensify.slack.com/archives/C01GTK53T8Q/p1746616229243239?thread_ts=1745963906.062429&cid=C01GTK53T8Q. Can you please try that change? So we don't have autofocus here. Hmm, let me mention that on slack. |
|
@parasharrajat I have already mentioned that. This is clearly a bug of navigation that SWM should solve. Let's not block this PR because of that. |
|
@allroundexperts This code snippet should solve the animation problem diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index bd13b29b1dd..f8c0b519c99 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -2,6 +2,7 @@ import type {ParamListBase} from '@react-navigation/routers';
import React from 'react';
import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
import Animations from '@libs/Navigation/PlatformStackNavigation/navigationOptions/animation';
+import type {PlatformStackNavigationOptions} from '@libs/Navigation/PlatformStackNavigation/types';
import type {
AddPersonalBankAccountNavigatorParamList,
AddUnreportedExpensesParamList,
@@ -47,6 +48,12 @@ import useModalStackScreenOptions from './useModalStackScreenOptions';
type Screens = Partial<Record<Screen, () => React.ComponentType>>;
+const OPTIONS_PER_SCREEN: Partial<Record<Screen, PlatformStackNavigationOptions>> = {
+ [SCREENS.SETTINGS.MERGE_ACCOUNTS.MERGE_RESULT]: {
+ animationTypeForReplace: 'push',
+ },
+};
+
/**
* Create a modal stack navigator with an array of sub-screens.
*
@@ -66,6 +73,7 @@ function createModalStackNavigator<ParamList extends ParamListBase>(screens: Scr
key={name}
name={name}
getComponent={(screens as Required<Screens>)[name as Screen]}
+ options={OPTIONS_PER_SCREEN[name as Screen]}
/>
))}
</ModalStackNavigator.Navigator>
~
~
~
~
~
~
~
~
~
~
|
|
@allroundexperts Can you please try that? |
|
@parasharrajat I applied the suggestion and it fixed the issue. Screen.Recording.2025-05-10.at.1.56.13.AM.mov |
|
Bump here @parasharrajat |
Screenshots🔲 iOS / native13.05.2025_14.52.35_REC.mp4🔲 iOS / Safari04.05.2025_03.34.10_REC.mp4🔲 MacOS / Desktop13.05.2025_14.59.38_REC.mp4🔲 MacOS / Chrome13.05.2025_14.50.08_REC.mp4🔲 Android / Chrome04.05.2025_02.41.00_REC.mp4🔲 Android / native13.05.2025_14.46.08_REC.mp4 |
|
Android: This is related to double click issue. After entering a wrong code, it takes 2 clicks to submit next code. First click on Merge accounts button hide the keyboard. 13.05.2025_00.39.40_REC.mp4 |
This is not related to the bugs we're solving in this PR. Let's not block it because of this. |
Agree with this. Let's see if QA reproduces and fix it in a follow up issue. |
parasharrajat
left a comment
parasharrajat
left a comment
There was a problem hiding this comment.
Reviewer Checklist
- I have verified the author checklist is complete (all boxes are checked off).
- I verified the correct issue is linked in the
### Fixed Issuessection above - I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I verified the steps for local testing are in the
- I checked that screenshots or videos are included for tests on all platforms
- I included screenshots or videos for tests on all platforms
- I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
- If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
- I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
toggleReportand notonIconClick). - I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g.
myBool && <MyComponent />. - I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to
src/languages/*files and using the translation method - I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the
Waiting for Copylabel for a copy review on the original GH to get the correct copy. - I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in
STYLE.md) were followed
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
- If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- I verified that this PR follows the guidelines as stated in the Review Guidelines
- I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like
Avatar, I verified the components usingAvatarhave been tested & I retested again) - I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
- I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
- If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a
/** comment above it */ - The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
- If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
- If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e.
StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
- If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
- If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like
Avataris modified, I verified thatAvataris working as expected in all cases) - If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
- If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
- If the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added
Designlabel so the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
🎀 👀 🎀 C+ reviewed
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/arosiclair in version: 9.1.45-0 🚀
|
|
🚀 Deployed to staging by https://github.com/arosiclair in version: 9.1.45-0 🚀
|
|
🚀 Deployed to production by https://github.com/francoisl in version: 9.1.45-21 🚀
|
5 participants
Explanation of Change
Remove the initial route from state after successful merge
fixes #59764
fixes #60757
Fixed Issues
$ #59764
$ #60757
PROPOSAL: N/A
Tests
Test 1
Verify that you don't end up on the Merge account details page
** Test 2**
Verify that the error message shown reads: "Incorrect or invalid magic code. Please try again or request a new code."
Offline tests
N/A
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as above
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Screen.Recording.2025-04-24.at.2.41.54.AM.mov
Android: mWeb Chrome
Screen.Recording.2025-04-24.at.2.36.24.AM.mov
iOS: Native
Screen.Recording.2025-04-24.at.2.48.30.AM.mov
iOS: mWeb Safari
Screen.Recording.2025-04-24.at.2.23.11.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2025-04-24.at.2.20.42.AM.mov
MacOS: Desktop
N/A