[Update Account Settings] Restyle Wallet Page by SzymczakJ · Pull Request #35806 · Expensify/App

SzymczakJ · 2024-02-05T11:02:02Z

Details

This PR radjusts Wallet Page to current designs.

Fixed Issues

$ #35722
$ #35604
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console
Go to Wallet Page and verify that everything matches desings.
- [x] Have few cards that are Exepensify cards
- [x] Have few cards that are not from expensify
- [x] Have few bank accounts linked

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

androidweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

iosweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

kosmydel · 2024-02-12T09:17:33Z

+        walletSectionTitle: {
+            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
+            fontWeight: FontUtils.fontWeight.bold,
+        },


We already have the same style called accountSettingsSectionTitle.

kosmydel · 2024-02-12T09:17:53Z

                                        subtitle={translate(`walletPage.${hasActivatedWallet ? 'sendAndReceiveMoney' : 'enableWalletToSendAndReceiveMoney'}`)}
                                        title={translate('walletPage.expensifyWallet')}
                                        isCentralPane
+                                        titleStyles={styles.walletSectionTitle}


Suggested change

titleStyles={styles.walletSectionTitle}

titleStyles={styles.accountSettingsSectionTitle}

kosmydel · 2024-02-12T09:18:00Z

                                        subtitle={translate('walletPage.assignedCardsDescription')}
                                        title={translate('walletPage.assignedCards')}
                                        isCentralPane
+                                        titleStyles={styles.walletSectionTitle}


Suggested change

titleStyles={styles.walletSectionTitle}

titleStyles={styles.accountSettingsSectionTitle}

kosmydel · 2024-02-12T09:18:10Z

                                    subtitle={translate('walletPage.addBankAccountToSendAndReceive')}
                                    title={translate('walletPage.bankAccounts')}
                                    isCentralPane
+                                    titleStyles={styles.walletSectionTitle}


Suggested change

titleStyles={styles.walletSectionTitle}

titleStyles={styles.accountSettingsSectionTitle}

melvin-bot · 2024-02-12T10:13:37Z

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

AndrewGable

Looks good to me, @mountiny or @francoisl might have more context, so I will let them review too.

francoisl

LGTM based on what was discussed with the design team

SzymczakJ · 2024-02-13T11:20:31Z

@mountiny is this ready to merge or do I need some more approves 😀

situchan · 2024-02-13T11:21:24Z

Seems like reviewer checklist is missing here

mountiny

Looking good to me thanks! @akinwale will do a reviewer checklist

akinwale · 2024-02-13T11:55:52Z

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 approved by marketing by adding the Waiting for Copy label 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
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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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

35806-android-native.mp4

Android: mWeb Chrome

35806-android-chrome.mp4

iOS: Native

35806-ios-native.mp4

iOS: mWeb Safari

35806-ios-safari.mp4

MacOS: Chrome / Safari

35806-web.mp4

MacOS: Desktop

35806-desktop.mp4

kosmydel · 2024-02-13T12:09:49Z

Please hold on with the merge.

I will add here a small fix: empty workspace list state is missing the background.

kosmydel · 2024-02-13T12:14:14Z

I fixed here the background color in WS list empty state.

akinwale · 2024-02-13T12:21:10Z

@SzymczakJ @kosmydel Just one small thing. The popover menu is cut off at the bottom of the window when the bottom account is not the default account resulting in two menu items. I'm guessing this should not be happening as the popover menu should open in the other direction if the space at the bottom is not enough to display it completely.

35806-web.mp4

mountiny · 2024-02-13T12:32:11Z

@akinwale @kosmydel @SzymczakJ I dont think we have to block on this, but we should fix this in a follow up at least

kosmydel · 2024-02-13T12:33:29Z

I've also noticed that the top margin is wrong (should be 12px)
cc @SzymczakJ

akinwale

LGTM.

melvin-bot · 2024-02-13T12:38:59Z

🎯 @akinwale, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #36408.

SzymczakJ · 2024-02-13T12:42:37Z

I've also noticed that the top margin is wrong (should be 12px) cc @SzymczakJ

fixed

mountiny

Thanks everyone!

OSBotify · 2024-02-13T13:41: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.

kavimuru · 2024-02-13T19:27:12Z

@mountiny @akinwale could you share the new design screenshots?

Go to Wallet Page and verify that everything matches desings.

mountiny · 2024-02-13T19:48:17Z

@kavimuru added

OSBotify · 2024-02-15T05:24:19Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.41-12 🚀

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

SzymczakJ and others added 8 commits February 5, 2024 09:46

fix wallet section title styles

6d1ed21

cherry pick headerWithBackButton component change

4b2cbd8

change designs for wallet page

a6c8652

clean up code for PR

c0c362b

Merge branch 'main' into @szymczak/restyle-wallet-page

7b3cc18

fix deletebank account popover positioned incorrectly

ce4c600

Merge branch 'main' into @szymczak/restyle-wallet-page

ca7426d

fix errors after merge

99107e5

kosmydel suggested changes Feb 12, 2024

View reviewed changes

fix PR comments

2e479d7

kosmydel approved these changes Feb 12, 2024

View reviewed changes

Merge branch 'main' into @szymczak/restyle-wallet-page

2c5a8c7

SzymczakJ marked this pull request as ready for review February 12, 2024 10:13

SzymczakJ requested a review from a team as a code owner February 12, 2024 10:13

melvin-bot Bot requested review from AndrewGable and removed request for a team February 12, 2024 10:13

AndrewGable reviewed Feb 12, 2024

View reviewed changes

AndrewGable previously approved these changes Feb 12, 2024

View reviewed changes

francoisl previously approved these changes Feb 13, 2024

View reviewed changes

mountiny previously approved these changes Feb 13, 2024

View reviewed changes

kosmydel added 2 commits February 13, 2024 13:11

Merge branch 'Expensify:main' into @szymczak/restyle-wallet-page

2d78adf

fix background color in workspace list empty state

c6c48ec

kosmydel dismissed stale reviews from mountiny, AndrewGable, and francoisl via c6c48ec February 13, 2024 12:14

mountiny assigned SzymczakJ Feb 13, 2024

akinwale approved these changes Feb 13, 2024

View reviewed changes

melvin-bot Bot mentioned this pull request Feb 13, 2024

[DUE] Payment issue for E/App PR#35806 #36408

Closed

fix pr comments

29451db

mountiny approved these changes Feb 13, 2024

View reviewed changes

mountiny merged commit 769d823 into Expensify:main Feb 13, 2024

github-actions Bot mentioned this pull request Feb 13, 2024

Deploy Checklist: New Expensify 2024-02-13 #36429

Closed

SzymczakJ deleted the @szymczak/restyle-wallet-page branch April 8, 2025 09:10

	titleStyles={styles.walletSectionTitle}
	titleStyles={styles.accountSettingsSectionTitle}

Conversation

SzymczakJ commented Feb 5, 2024 • edited by mountiny 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!

kosmydel Feb 12, 2024

Choose a reason for hiding this comment

Uh oh!

kosmydel Feb 12, 2024

Choose a reason for hiding this comment

Uh oh!

kosmydel Feb 12, 2024

Choose a reason for hiding this comment

Uh oh!

kosmydel Feb 12, 2024

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Feb 12, 2024

Uh oh!

AndrewGable left a comment

Choose a reason for hiding this comment

Uh oh!

francoisl left a comment

Choose a reason for hiding this comment

Uh oh!

SzymczakJ commented Feb 13, 2024

Uh oh!

situchan commented Feb 13, 2024

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

akinwale commented Feb 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

kosmydel commented Feb 13, 2024

Uh oh!

kosmydel commented Feb 13, 2024

Uh oh!

akinwale commented Feb 13, 2024

Uh oh!

mountiny commented Feb 13, 2024

Uh oh!

kosmydel commented Feb 13, 2024

Uh oh!

akinwale left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Feb 13, 2024

Uh oh!

SzymczakJ commented Feb 13, 2024

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Feb 13, 2024

Uh oh!

kavimuru commented Feb 13, 2024

Uh oh!

mountiny commented Feb 13, 2024

Uh oh!

OSBotify commented Feb 15, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

SzymczakJ commented Feb 5, 2024 •

edited by mountiny

Loading

akinwale commented Feb 13, 2024 •

edited

Loading