fix: Subscription - Clicking Outside the Modal Doesn't Close It, Causing Inconsistency. #47950

Krishna2323 · 2024-08-23T22:25:11Z

Details

Fixed Issues

$ #47559
PROPOSAL: #47559 (comment)

Tests

Go to Account Settings > Subscription.
Add Payment Card > Click on the three-dot menu > Change Payment Currency.
Select a currency > Click outside the modal. Notice the modal doesn't close.
Verify the RHP closes

Verify that no errors appear in the JS console

Offline tests

Go to Account Settings > Subscription.
Add Payment Card > Click on the three-dot menu > Change Payment Currency.
Select a currency > Click outside the modal. Notice the modal doesn't close.
Verify the RHP closes

QA Steps

Go to Account Settings > Subscription.
Add Payment Card > Click on the three-dot menu > Change Payment Currency.
Select a currency > Click outside the modal. Notice the modal doesn't close.
Verify the RHP closes

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

…ing Inconsistency. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot · 2024-08-23T22:25:16Z

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

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2024-08-23T22:37:15Z

@shubham1206agra, the code change is complete in my opinion, but there is an issue. We need to use a timeout because there is a minor glitch when the modal is closed. For a very brief moment, we can see two modals. This issue is resolved by using a timeout, but I want your opinion since using timeouts isn't generally encouraged. However, I believe this is an edge case where it can be safely used. I've verified that it's working well on both the desktop app and the web.

Without Timeout

without_timeout.mp4

With Timeout

with_timeout.mp4

shubham1206agra · 2024-08-25T16:28:45Z

@Krishna2323 Can you tell me how did you added card here?

Krishna2323 · 2024-08-26T15:05:17Z

@shubham1206agra, Update the defaultCard below.

App/src/pages/settings/Subscription/CardSection/CardSection.tsx

Line 53 in 1a6d5e4

    
           const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard), [fundList]);

TO:

const defaultCard = {accountData: {addressName: 'Max', cardYear: 2029, cardMonth: 9, currency: 'USD', cardNumber: '1234567887654321', additionalData: {isBillingCard: true}}};

shubham1206agra · 2024-08-26T16:09:36Z

src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx

+            onBackdropPress={() => {
+                Navigation.dismissModal();
+                setTimeout(() => {
+                    onClose?.();
+                }, 50);
+            }}


I don't think setting a timeout is a good idea here. Please do it without timeout.

shubham1206agra · 2024-08-27T04:07:11Z

@Krishna2323 Merge main please

shubham1206agra · 2024-08-27T04:26:26Z

src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx

+            onBackdropPress={() => {
+                Navigation.dismissModal();
+                setTimeout(() => {
+                    onClose?.();
+                }, 50);
+            }}


Suggested change

onBackdropPress={() => {

Navigation.dismissModal();

setTimeout(() => {

onClose?.();

}, 50);

}}

onBackdropPress={Navigation.dismissModal}

@shubham1206agra, we also need to call onClose, otherwise the close animation won't work.

There are many places we don't call onClose. It is okay for me if the animation does not trigger here.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2024-08-27T23:20:43Z

@shubham1206agra, timeout is removed, all recordings have been added except for android native. I'm not able to build for android native and not sure when I will be able to fix the issue so I completed the checklist. Please test that for me🙏🏻

shubham1206agra · 2024-08-29T09:41:25Z

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 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 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

NA

Android: mWeb Chrome

NA

iOS: Native

NA

iOS: mWeb Safari

NA

MacOS: Chrome / Safari

Screen.Recording.2024-08-29.at.3.02.49.PM.mov

MacOS: Desktop

Screen.Recording.2024-08-29.at.3.06.58.PM.mov

OSBotify · 2024-08-29T21:04:12Z

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

OSBotify · 2024-08-30T18:49:33Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.0.27-0 🚀

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

OSBotify · 2024-09-02T23:27:15Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.27-1 🚀

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

fix: Subscription - Clicking Outside the Modal Doesn't Close It, Caus…

f04644f

…ing Inconsistency. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 requested a review from a team as a code owner August 23, 2024 22:25

melvin-bot bot requested review from shubham1206agra and removed request for a team August 23, 2024 22:25

minor fix.

d959527

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

shubham1206agra reviewed Aug 26, 2024

View reviewed changes

shubham1206agra reviewed Aug 27, 2024

View reviewed changes

Krishna2323 added 2 commits August 27, 2024 15:33

Merge branch 'Expensify:main' into krishna2323/issue/47559

29ea19a

remove setTimeout.

55929c2

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

shubham1206agra approved these changes Aug 29, 2024

View reviewed changes

melvin-bot bot requested a review from puneetlath August 29, 2024 09:42

puneetlath approved these changes Aug 29, 2024

View reviewed changes

puneetlath merged commit 8c0386a into Expensify:main Aug 29, 2024
16 of 17 checks passed

github-actions bot mentioned this pull request Aug 30, 2024

Deploy Checklist: New Expensify 2024-08-30 #48360

Closed

45 tasks

mkzie2 mentioned this pull request Nov 18, 2024

fix: ValidateCodeActionModal is not dismissed on backdrop press #52232

Merged

49 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Subscription - Clicking Outside the Modal Doesn't Close It, Causing Inconsistency. #47950

fix: Subscription - Clicking Outside the Modal Doesn't Close It, Causing Inconsistency. #47950

Krishna2323 commented Aug 23, 2024 •

edited

Loading

melvin-bot bot commented Aug 23, 2024

Krishna2323 commented Aug 23, 2024

shubham1206agra commented Aug 25, 2024

Krishna2323 commented Aug 26, 2024

shubham1206agra Aug 26, 2024

shubham1206agra commented Aug 27, 2024

shubham1206agra Aug 27, 2024

Krishna2323 Aug 27, 2024

shubham1206agra Aug 27, 2024

Krishna2323 commented Aug 27, 2024

shubham1206agra commented Aug 29, 2024

OSBotify commented Aug 29, 2024

OSBotify commented Aug 30, 2024

OSBotify commented Sep 2, 2024

fix: Subscription - Clicking Outside the Modal Doesn't Close It, Causing Inconsistency. #47950

fix: Subscription - Clicking Outside the Modal Doesn't Close It, Causing Inconsistency. #47950

Conversation

Krishna2323 commented Aug 23, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 23, 2024

Krishna2323 commented Aug 23, 2024

Without Timeout

With Timeout

shubham1206agra commented Aug 25, 2024

Krishna2323 commented Aug 26, 2024

shubham1206agra Aug 26, 2024

Choose a reason for hiding this comment

shubham1206agra commented Aug 27, 2024

shubham1206agra Aug 27, 2024

Choose a reason for hiding this comment

Krishna2323 Aug 27, 2024

Choose a reason for hiding this comment

shubham1206agra Aug 27, 2024

Choose a reason for hiding this comment

Krishna2323 commented Aug 27, 2024

shubham1206agra commented Aug 29, 2024

Reviewer Checklist

Screenshots/Videos

OSBotify commented Aug 29, 2024

OSBotify commented Aug 30, 2024

OSBotify commented Sep 2, 2024

Krishna2323 commented Aug 23, 2024 •

edited

Loading