Move visible state to parent component by cretadn22 · Pull Request #51350 · Expensify/App

cretadn22 · 2024-10-23T17:05:10Z

Details

Fixed Issues

$ #51273
PROPOSAL: #51273 (comment)

Tests

QA Steps

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to Account settings > Security.
Click Add copilot.
Select a user > Next.
Select an access level > Next.
Click Add copilot.
Click RHP back button.
Click Add copilot.
Navigate to Validation modal

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-10-24.at.00.25.13.mov

Android: mWeb Chrome

Screen.Recording.2024-10-24.at.00.01.35.mov

iOS: Native

Screen.Recording.2024-10-24.at.00.23.28.mov

iOS: mWeb Safari

Screen.Recording.2024-10-24.at.00.01.11.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-23.at.23.57.20.mov

MacOS: Desktop

Screen.Recording.2024-10-23.at.23.59.22.mov

melvin-bot · 2024-10-23T17:05:16Z

@jayeshmangwani 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]

jayeshmangwani · 2024-10-24T09:37:55Z

 };

-function DelegateMagicCodeModal({login, role, onClose}: DelegateMagicCodeModalProps) {
+function DelegateMagicCodeModal({login, role, onClose, isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible}: DelegateMagicCodeModalProps) {


Can we use a single onClose prop here, and not pass the setIsValidateCodeActionModalVisible ? By pressing onClose, we can handle the setIsValidateCodeActionModalVisible on the ConfirmDelegatePage

@cretadn22 ⬆️

jayeshmangwani · 2024-10-25T07:43:49Z

@cretadn22 please check this comment

cretadn22 · 2024-10-27T05:26:24Z

@jayeshmangwani This suggestion has a small issue, please give me some time to thoroughly test it. I'll provide an update shortly.

jayeshmangwani · 2024-10-28T09:41:37Z

@cretadn22 Could you please elaborate on the specific issue? If we get more details, we can work on figuring it out together.

jayeshmangwani · 2024-10-29T04:16:23Z

bump @cretadn22

cretadn22 · 2024-10-29T11:18:29Z

+                    if (!showValidateActionModal) {
+                        return;
+                    }
+                    Navigation.navigate(ROUTES.SETTINGS_SECURITY);


@jayeshmangwani I'm not clear on why this code is necessary. Which use case is it addressing?

cc @getusha

@cretadn22 It seems this case was added to handle navigation depending on the source page. If we arrive from the SecuritySettingsPage and close the DelegateMagicCodeModal, we need to navigate back to the SecuritySettingsPage on close. However, if we come from the Add Copilot flow, we should simply hide the modal without further navigation.

After reviewing the git blame and testing the flow, I believe a bit of refactoring is needed here. For example, we can remove the entire usage of showValidateActionModal and use DelegateMagicCodeModal directly on the SecuritySettingsPage

@getusha Could you help us understand why we navigate to the DelegateConfirmPage from the SecuritySettingsPage? Wouldn’t it be easier to handle if we used the DelegateMagicCodeModal directly on the SecuritySettingsPage instead? Or am I missing some underlying logic here?

App/src/pages/settings/Security/SecuritySettingsPage.tsx

Line 157 in 6cd5c64

Navigation.navigate(ROUTES.SETTINGS_DELEGATE_CONFIRM.getRoute(email, role, true));

@cretadn22, I've pinged Getabalew on Slack to see why the above was added and what it does. Let's see if they can help us understand.

cc: @carlosmiceli

If so, I believe the current code is both safer and simpler.

Can we proceed by adding setIsValidateCodeActionModalVisible in the onClose function?

Oh, sorry, I missed your commit. Have you tested all the platforms again after this change?

One question: can we add setIsValidateCodeActionModalVisible(false); inside the if (!showValidateActionModal) { block? Since, if showValidateActionModal is true, we’re already calling the navigation.navigate, so when we return to this page, isValidateCodeActionModalVisible will be set to true.

@jayeshmangwani I made updates and tests, it is fine

jayeshmangwani · 2024-10-31T07:35:47Z

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 Issues section 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 Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- 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 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. toggleReport and not onIconClick).
- 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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
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 using Avatar have 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 this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- 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 Avatar is modified, I verified that Avatar is 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android.mp4

Android: mWeb Chrome

mweb-chrome.mp4

iOS: Native

ios.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

jayeshmangwani

LGTM 🚀

OSBotify · 2024-10-31T11:28:29Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2024-11-04T14:38:40Z

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.0.57-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2024-11-06T00:02:13Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.57-10 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	skipped 🚫
🍎🔄 iOS HybridApp 🍎🔄	skipped 🚫

remove state on modal

dd3d66f

cretadn22 requested a review from a team as a code owner October 23, 2024 17:05

melvin-bot Bot requested review from jayeshmangwani and removed request for a team October 23, 2024 17:05

updatenew main

43235de

cretadn22 commented Oct 23, 2024

View reviewed changes

Comment thread src/libs/Permissions.ts Resolved

minor update

baa476f

cretadn22 force-pushed the move-state-to-parent-component branch from 2f66068 to baa476f Compare October 23, 2024 17:20

jayeshmangwani reviewed Oct 24, 2024

View reviewed changes

adjust

d37bdb2

cretadn22 commented Oct 29, 2024

View reviewed changes

fix comment

a067700

jayeshmangwani approved these changes Oct 31, 2024

View reviewed changes

melvin-bot Bot requested a review from carlosmiceli October 31, 2024 07:36

carlosmiceli approved these changes Oct 31, 2024

View reviewed changes

carlosmiceli merged commit e7532e9 into Expensify:main Oct 31, 2024

github-actions Bot mentioned this pull request Nov 4, 2024

Deploy Checklist: New Expensify 2024-11-04 #51953

Closed

63 tasks done

melvin-bot Bot mentioned this pull request Nov 6, 2024

[HOLD for payment 2024-11-13] [$250] Copilot - Nothing happens when clicking Add copilot after returning from magic code page #51273

Closed

5 of 8 tasks

Conversation

cretadn22 commented Oct 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Oct 23, 2024

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jayeshmangwani commented Oct 25, 2024

Uh oh!

cretadn22 commented Oct 27, 2024

Uh oh!

jayeshmangwani commented Oct 28, 2024

Uh oh!

jayeshmangwani commented Oct 29, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jayeshmangwani commented Oct 31, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

jayeshmangwani left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Oct 31, 2024

Uh oh!

github-actions Bot commented Nov 4, 2024

Uh oh!

github-actions Bot commented Nov 6, 2024

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

cretadn22 commented Oct 23, 2024 •

edited

Loading