Fix bug with Payment option is not selected #49345

ZhenjaHorbach · 2024-09-17T16:39:33Z

Details

Fix bug with Payment option is not selected

Fixed Issues

$ #49331
PROPOSAL: #49331 (comment)

Tests

Precondition:
Workspace has set up bank account.

Go to App.
Go to workspace chat.
Submit an expense.
On the main chat, click on the payment dropdown button.
Select the other payment option.
Click on the payment dropdown button.
Select the other payment option again.
Verify that The payment option will be selected without issue.

Verify that no errors appear in the JS console

Offline tests

Precondition:
Workspace has set up bank account.

Go to App.
Go to workspace chat.
Submit an expense.
On the main chat, click on the payment dropdown button.
Select the other payment option.
Click on the payment dropdown button.
Select the other payment option again.
Verify that The payment option will be selected without issue.

QA Steps

Precondition:
Workspace has set up bank account.

Go to App.
Go to workspace chat.
Submit an expense.
On the main chat, click on the payment dropdown button.
Select the other payment option.
Click on the payment dropdown button.
Select the other payment option again.
Verify that The payment option will be selected without issue.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-web.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-web.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2024-09-17T16:52:46Z

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

dukenv0307 · 2024-09-18T03:22:19Z

I'm reviewing...

dukenv0307 · 2024-09-18T03:46:42Z

@ZhenjaHorbach Should we remove these lines? I see you mentioned it in your proposal.

I notice that the initial lastPaymentMethod is -1 and we didn't put it in useMemo's dependencies so the lastPaymentMethod is not in the front of the array

App/src/components/SettlementButton/index.tsx

Lines 152 to 155 in 266ad46

    
           // Put the preferred payment method to the front of the array, so it's shown as default. We assume their last payment method is their preferred. 
        
           if (lastPaymentMethod) { 
        
               return buttonOptions.sort((method) => (method.value === lastPaymentMethod ? -1 : 0)); 
        
           }

dukenv0307 · 2024-09-18T03:48:18Z

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

Screen.Recording.2024-09-18.at.10.55.30.mov

Android: mWeb Chrome

Screen.Recording.2024-09-18.at.10.53.29.mov

iOS: Native

Screen.Recording.2024-09-18.at.10.56.36.mov

iOS: mWeb Safari

Screen.Recording.2024-09-18.at.10.52.27.mov

MacOS: Chrome / Safari

Screen.Recording.2024-09-18.at.10.49.37.mov

MacOS: Desktop

Screen.Recording.2024-09-18.at.11.00.01.mov

dukenv0307 · 2024-09-18T04:01:19Z

LGTM, just left one minor comment

dukenv0307 · 2024-09-18T04:02:30Z

Besides, there's one ESlint failed, but I don't think we should fix here cc @mountiny

ZhenjaHorbach · 2024-09-18T05:27:29Z

@ZhenjaHorbach Should we remove these lines? I see you mentioned it in your proposal.

I notice that the initial lastPaymentMethod is -1 and we didn't put it in useMemo's dependencies so the lastPaymentMethod is not in the front of the array

App/src/components/SettlementButton/index.tsx

Lines 152 to 155 in 266ad46

// Put the preferred payment method to the front of the array, so it's shown as default. We assume their last payment method is their preferred.

if (lastPaymentMethod) {

return buttonOptions.sort((method) => (method.value === lastPaymentMethod ? -1 : 0));

}

I thought about it
But I think we shouldn't remove this condition
When we chose some method and then paid by this method
It will be selected by default in the future

ZhenjaHorbach · 2024-09-18T06:22:11Z

Besides, there's one ESlint failed, but I don't think we should fix here cc @mountiny

And I agree !
Not the best place for refactoring in a bug fix

dukenv0307 · 2024-09-18T06:54:13Z

Thank you @ZhenjaHorbach, I've tested your PR and it looks good

dukenv0307 · 2024-09-18T07:34:02Z

src/components/SettlementButton/index.tsx

@@ -62,12 +62,14 @@ function SettlementButton({
    const {isOffline} = useNetwork();
    // The app would crash due to subscribing to the entire report collection if chatReportID is an empty string. So we should have a fallback ID here.
    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID || -1}`);
-    const [lastPaymentMethod = '-1'] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD, {selector: (paymentMethod) => paymentMethod?.[policyID]});
+    const [nvpLastPaymentMethod] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD);
+    const nvpLastPaymentMethodIsInitialized = nvpLastPaymentMethod !== undefined;


Can you explain this change?

The purpose of these changes was to make sure that we only update the Options list by PaymentMethod when we have a PaymentMethod initialized (when it changes from undefined to object )
Other times we don't do this

I think we should use a build in feature of useOnyx to handle this if we want https://github.com/Expensify/App/blob/b7c0055c531f668c683cc048cb01f6f6afc33f97/src/pages/home/ReportScreen.tsx#L135C5-L135C66

Yes
It works the same as comparing with undefined
But looks cleaner !
Thanks

ZhenjaHorbach · 2024-09-18T13:59:04Z

@mountiny
I suppose if @dukenv0307 does't have any questions
We can move on !

@dukenv0307
Sorry if i'm wrong 😅

mountiny

Changes look good to me but if you are available, I would prefer to change this so we can use the built in onyx feature

mountiny · 2024-09-18T14:44:37Z

src/components/SettlementButton/index.tsx

@@ -62,12 +62,14 @@ function SettlementButton({
    const {isOffline} = useNetwork();
    // The app would crash due to subscribing to the entire report collection if chatReportID is an empty string. So we should have a fallback ID here.
    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID || -1}`);
-    const [lastPaymentMethod = '-1'] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD, {selector: (paymentMethod) => paymentMethod?.[policyID]});
+    const [nvpLastPaymentMethod] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD);
+    const nvpLastPaymentMethodIsInitialized = nvpLastPaymentMethod !== undefined;


I think we should use a build in feature of useOnyx to handle this if we want https://github.com/Expensify/App/blob/b7c0055c531f668c683cc048cb01f6f6afc33f97/src/pages/home/ReportScreen.tsx#L135C5-L135C66

mountiny

Thank you!

mountiny · 2024-09-18T20:11:43Z

Not going to do the migration in this PR

melvin-bot · 2024-09-18T20:11:51Z

@mountiny looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

mountiny · 2024-09-18T20:14:02Z

We opted not to migrate these files to useOnyx as they are quite complex components and we are trying to fix urgent bug related to expense report payment functionality. This would increase the scope of testing by a lot and it would mean we will most likely not be able to fix this bug in timely manner

OSBotify · 2024-09-18T20:22:22Z

✋ 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-09-18T22:53:52Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.38-0 🚀

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

OSBotify · 2024-09-19T23:35:12Z

🚀 Deployed to production by https://github.com/grgia in version: 9.0.38-4 🚀

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

ZhenjaHorbach added 2 commits September 17, 2024 18:38

Fix bug with Payment option is not selected

2f95fd9

Update comment

60d0752

ZhenjaHorbach mentioned this pull request Sep 17, 2024

[AWAITING PAYMENT] [$250] Expense - Payment option is not selected from the dropdown unless it is reselected #49331

Closed

6 tasks

ZhenjaHorbach marked this pull request as ready for review September 17, 2024 16:52

ZhenjaHorbach requested a review from a team as a code owner September 17, 2024 16:52

melvin-bot bot requested review from dukenv0307 and removed request for a team September 17, 2024 16:52

mountiny assigned ZhenjaHorbach Sep 17, 2024

mountiny self-requested a review September 17, 2024 17:43

ZhenjaHorbach added 2 commits September 17, 2024 19:50

Update comment

5a90681

Revert come shanges

a56d546

Update dependencies for useMemo

c965330

ZhenjaHorbach added 3 commits September 18, 2024 08:23

Remove redundant code

f567e7f

Update comment

c07cd00

Update comment x2

2e8005d

dukenv0307 approved these changes Sep 18, 2024

View reviewed changes

Update code to prevent potencial issues

8b1fd4f

dukenv0307 reviewed Sep 18, 2024

View reviewed changes

mountiny previously approved these changes Sep 18, 2024

View reviewed changes

Update code to use isLoadingOnyxValue

3c8ad57

ZhenjaHorbach dismissed mountiny’s stale review via 3c8ad57 September 18, 2024 15:01

mountiny approved these changes Sep 18, 2024

View reviewed changes

mountiny merged commit 69c0358 into Expensify:main Sep 18, 2024
18 of 19 checks passed

melvin-bot bot added the Emergency label Sep 18, 2024

mountiny removed the Emergency label Sep 18, 2024

github-actions bot mentioned this pull request Sep 18, 2024

Deploy Checklist: New Expensify 2024-09-18 #49427

Closed

43 tasks

roryabraham mentioned this pull request Sep 28, 2024

[Payment due 08-23]Emphasize completed payments with animation #48036

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix bug with Payment option is not selected #49345

Fix bug with Payment option is not selected #49345

ZhenjaHorbach commented Sep 17, 2024 •

edited

Loading

melvin-bot bot commented Sep 17, 2024

dukenv0307 commented Sep 18, 2024

dukenv0307 commented Sep 18, 2024

dukenv0307 commented Sep 18, 2024 •

edited

Loading

dukenv0307 commented Sep 18, 2024

dukenv0307 commented Sep 18, 2024

ZhenjaHorbach commented Sep 18, 2024 •

edited

Loading

ZhenjaHorbach commented Sep 18, 2024

dukenv0307 commented Sep 18, 2024

dukenv0307 Sep 18, 2024

ZhenjaHorbach Sep 18, 2024 •

edited

Loading

mountiny Sep 18, 2024

ZhenjaHorbach Sep 18, 2024

ZhenjaHorbach commented Sep 18, 2024

mountiny left a comment

mountiny Sep 18, 2024

mountiny left a comment

mountiny commented Sep 18, 2024

melvin-bot bot commented Sep 18, 2024

mountiny commented Sep 18, 2024

OSBotify commented Sep 18, 2024

OSBotify commented Sep 18, 2024

OSBotify commented Sep 19, 2024

Fix bug with Payment option is not selected #49345

Fix bug with Payment option is not selected #49345

Conversation

ZhenjaHorbach commented Sep 17, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 17, 2024

dukenv0307 commented Sep 18, 2024

dukenv0307 commented Sep 18, 2024

dukenv0307 commented Sep 18, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

dukenv0307 commented Sep 18, 2024

dukenv0307 commented Sep 18, 2024

ZhenjaHorbach commented Sep 18, 2024 • edited Loading

ZhenjaHorbach commented Sep 18, 2024

dukenv0307 commented Sep 18, 2024

dukenv0307 Sep 18, 2024

Choose a reason for hiding this comment

ZhenjaHorbach Sep 18, 2024 • edited Loading

Choose a reason for hiding this comment

mountiny Sep 18, 2024

Choose a reason for hiding this comment

ZhenjaHorbach Sep 18, 2024

Choose a reason for hiding this comment

ZhenjaHorbach commented Sep 18, 2024

mountiny left a comment

Choose a reason for hiding this comment

mountiny Sep 18, 2024

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny commented Sep 18, 2024

melvin-bot bot commented Sep 18, 2024

mountiny commented Sep 18, 2024

OSBotify commented Sep 18, 2024

OSBotify commented Sep 18, 2024

OSBotify commented Sep 19, 2024

ZhenjaHorbach commented Sep 17, 2024 •

edited

Loading

dukenv0307 commented Sep 18, 2024 •

edited

Loading

ZhenjaHorbach commented Sep 18, 2024 •

edited

Loading

ZhenjaHorbach Sep 18, 2024 •

edited

Loading