Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(Wallet): add empty state and redesign wallet page #26406

Merged
merged 2 commits into from
Oct 13, 2023
Merged

feat(Wallet): add empty state and redesign wallet page #26406

merged 2 commits into from
Oct 13, 2023

Conversation

pac-guerreiro
Copy link
Contributor

@pac-guerreiro pac-guerreiro commented Aug 31, 2023 •
edited
Loading

Details

This PR adds a new empty state to the wallet, when user has no bank account, assigned card or wallet, and redesigns the wallet page.

Docs: https://docs.google.com/document/d/1rFxJ78vz5On6zSWzYa51B9v-tyLdC5pUsBeLOLig0t4/edit#bookmark=id.659z4lc0lx22

Related issue: #22871

Tests

  1. Update the getComponent for SCREENS.SETTINGS.WALLET, in SettingsModalStackNavigator to import the component from ../../../pages/settings/Wallet/WalletPage/WalletPage
  2. If you don't have any bank accounts or a positive wallet balance, you'll see the empty state screen
  3. If you add a payment method, you'll be shown the wallet page with that payment method in the bank accounts section
  4. If you have a wallet and it's balance is positive, you'll be shown the wallet page with the wallet section, where you can check your current balance and transfer funds.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android / native
    • Android / Chrome
    • iOS / native
    • iOS / Safari
    • MacOS / Chrome / Safari
    • MacOS / Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
  1. Empty state
    https://github.com/Expensify/App/assets/48553277/f401da4a-2ae8-4e6d-812c-bf043cba2a19
Mobile Web - Chrome

Wallet Page - Empty State

Screenshot 2023-10-03 at 16 49 34

Wallet Page, with bank accounts and expensify wallet section

Screenshot 2023-10-03 at 16 51 27

Wallet Page, with bank accounts section (user has no expensify wallet)

Screenshot 2023-10-03 at 16 50 06

Mobile Web - Safari

Wallet Page - Empty State

Simulator Screenshot - iPhone 15 Plus - 2023-10-04 at 15 35 18

Wallet Page, with bank accounts and expensify wallet section

Simulator Screenshot - iPhone 15 Plus - 2023-10-04 at 15 34 12

Wallet Page, with bank accounts section (user has no expensify wallet)

Simulator Screenshot - iPhone 15 Plus - 2023-10-04 at 15 35 39

Desktop

Wallet Page - Screen Recording

8mb.video-Ahi-I6bvGCa8.mp4

Wallet Page - Empty State

Screenshot 2023-10-03 at 16 41 10 ### Wallet Page, with bank accounts and expensify wallet section Screenshot 2023-10-03 at 16 40 26 ### Wallet Page, with bank accounts section (user has no expensify wallet) Screenshot 2023-10-03 at 16 40 45
iOS
Android

Wallet Page - Screen Recording

8mb.video-whm-7nEq5Zcc.mp4

Wallet Page - Empty State

Screenshot 2023-10-03 at 16 12 38

Wallet Page, with bank accounts and expensify wallet section

Screenshot 2023-10-03 at 16 13 23

Wallet Page, with bank accounts section (user has no expensify wallet)

Screenshot 2023-10-03 at 16 13 50

@github-actions
Copy link
Contributor

github-actions bot commented Aug 31, 2023 •
edited
Loading

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@pac-guerreiro
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

gedu
gedu reviewed Sep 4, 2023
View reviewed changes
src/languages/es.js Outdated Show resolved Hide resolved
gedu
gedu reviewed Sep 4, 2023
View reviewed changes
src/languages/es.js Outdated Show resolved Hide resolved
BeeMargarida
BeeMargarida reviewed Sep 4, 2023
View reviewed changes
src/components/Section.js Outdated Show resolved Hide resolved
src/pages/settings/Wallet/PaymentMethodList.js Outdated Show resolved Hide resolved
src/pages/settings/Wallet/PaymentMethodList.js Outdated Show resolved Hide resolved
src/pages/settings/Wallet/WalletEmptyState.js Outdated Show resolved Hide resolved
src/pages/settings/Wallet/WalletEmptyState.js Outdated Show resolved Hide resolved
rezkiy37
rezkiy37 reviewed Sep 4, 2023
View reviewed changes
src/components/Section.js Outdated Show resolved Hide resolved
rezkiy37
rezkiy37 reviewed Sep 4, 2023
View reviewed changes
Copy link
Contributor

@rezkiy37 rezkiy37 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left comments

@pac-guerreiro pac-guerreiro force-pushed the feature/empty-state-view-and-add-bank-accounts-plus-wallet-tile branch from b4562a5 to 5e42bb2 Compare September 4, 2023 19:36
@pac-guerreiro pac-guerreiro marked this pull request as ready for review September 6, 2023 10:49
@pac-guerreiro pac-guerreiro requested a review from a team as a code owner September 6, 2023 10:49
@melvin-bot melvin-bot bot requested review from dangrous and removed request for a team September 6, 2023 10:49
@melvin-bot
Copy link

melvin-bot bot commented Sep 6, 2023

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

@pac-guerreiro
Copy link
Contributor Author

cc @grgia

@grgia grgia self-requested a review September 6, 2023 10:51
@pac-guerreiro pac-guerreiro mentioned this pull request Sep 6, 2023
Merged
59 tasks
@pac-guerreiro pac-guerreiro changed the title feat(Wallet): add empty state and redesign wallet page [HOLD] feat(Wallet): add empty state and redesign wallet page Sep 6, 2023
@pac-guerreiro pac-guerreiro force-pushed the feature/empty-state-view-and-add-bank-accounts-plus-wallet-tile branch from 087829e to 92e470f Compare September 6, 2023 11:58
grgia
grgia requested changes Sep 6, 2023
View reviewed changes
Copy link
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good so far! Let's reuse patterns from WorkspaceListPage

src/pages/settings/Wallet/WalletEmptyState.js Outdated Show resolved Hide resolved
src/styles/variables.ts Show resolved Hide resolved
src/languages/es.ts Outdated Show resolved Hide resolved
@pac-guerreiro pac-guerreiro requested a review from grgia September 8, 2023 12:22
@pac-guerreiro
Copy link
Contributor Author

@narefyev91 fix was applied successfully!

@pac-guerreiro pac-guerreiro force-pushed the feature/empty-state-view-and-add-bank-accounts-plus-wallet-tile branch from 0e47428 to 5a4a230 Compare October 11, 2023 18:08
@pac-guerreiro
feat(Wallet): add empty state and redesign wallet page
83fd154 
# Conflicts:
#	src/components/LottieAnimations.js
#	src/pages/settings/Wallet/WalletPage/BaseWalletPage.js

fix(wallet): item styles not matching designs

fix(wallet): PropTypes console errors

fix(wallet): popover menu positioning issues

fix(wallet): flags used to determine if the empty state should be shown

refactor(wallet): code style

# Conflicts:
#	src/pages/settings/Wallet/PaymentMethodList.js

fix(wallet): accessing wrong onyx key to look for assigned cards

fix(wallet): spanish translations

refactor(wallet): apply code style guidelines

refactor(wallet): differentiate old wallet from new version using URL

# Conflicts:
#	src/ROUTES.ts
#	src/libs/Navigation/AppNavigator/ModalStackNavigators.js
#	src/libs/Navigation/linkingConfig.js

add padding top prop to IlustratedHeaderPageLayout

# Conflicts:
#	src/components/IllustratedHeaderPageLayout.js

remove header top padding

replace hardcoded values with references to SCREENS

# Conflicts:
#	src/SCREENS.ts

add scroll to WalletPage, disable scroll in PaymentMethodList

lint code

# Conflicts:
#	src/pages/settings/Wallet/PaymentMethodList.js

chore: reduce FastMoney animation filesize

chore: add wallet backgriound color to light theme

refactor: wallet route

refactor: remove unused prop

refactor(wallet): remove unnecessary wrapper component

fix(wallet): linter issue

refactor(wallet): remove underscore dependency

chore(wallet): use old wallet instead of new one

# Conflicts:
#	src/libs/Navigation/AppNavigator/ModalStackNavigators.js

chore: apply prettier

# Conflicts:
#	src/SCREENS.ts

chore(wallet): remove card item left padding

fix(section): missing subtitle

refactor(wallet): use constant screen name for wallet domain cards

# Conflicts:
#	src/libs/Navigation/linkingConfig.js

refactor(wallet): use constant screen name for wallet

fix(wallet): screen wrapper adding unnecessary vertical padding

# Conflicts:
#	src/pages/settings/Wallet/WalletPage/WalletPage.js

fix(wallet): wrong display name type

fix(wallet): missing testID for screen wrapper and unnecessary fragment

fix(wallet): unused import

fix(wallet): status bar background color

fix(wallet): revert scrollview removal

fix(wallet): wrong section border radius

fix(wallet): wrong payment item height

fix(wallet): console error with nested Flatlist inside a ScrollView

# Conflicts:
#	src/pages/settings/Wallet/PaymentMethodList.js

fix(wallet): section card item styles

refactor(wallet): replace direct import from colors with themeColors

fix(wallet): popover menu positioning

fix(wallet): transfer balance button styles

refactor(wallet): remove paypal references

fix(wallet): adjust spacings inside wallet section

fix(wallet): bank accounts section spacing

chore(wallet): fix linter issues

refactor: remove unused paypal route

# Conflicts:
#	src/ROUTES.ts

chore(wallet): remove old wallet page

# Conflicts:
#	src/pages/settings/Wallet/WalletPage/BaseWalletPage.js

chore: rebase with main branch

fix(wallet): wrong lineHeight type
@pac-guerreiro pac-guerreiro force-pushed the feature/empty-state-view-and-add-bank-accounts-plus-wallet-tile branch from 5a4a230 to 83fd154 Compare October 12, 2023 11:07
@narefyev91
Copy link
Contributor

@pac-guerreiro Hey - maybe something is mixed up - but on your latest branch i see this
Simulator Screen Shot - iPhone 14 Pro - 2023-10-12 at 15 13 44
And on lates main:
Simulator Screen Shot - iPhone 14 Pro - 2023-10-12 at 15 11 38
For some reasons lottie animation is broken on setting screens

@pac-guerreiro
Copy link
Contributor Author

@narefyev91 let me check!

@pac-guerreiro
Copy link
Contributor Author

@narefyev91 can you retest it again?

@narefyev91
Copy link
Contributor

@pac-guerreiro i still see the same issue
If i take code from main branch from Expensify repo for this component src/components/IllustratedHeaderPageLayout.js - and add it in your branch - animation will start working again.

@pac-guerreiro pac-guerreiro force-pushed the feature/empty-state-view-and-add-bank-accounts-plus-wallet-tile branch from 6e68af9 to 7b09007 Compare October 12, 2023 15:42
@pac-guerreiro
Copy link
Contributor Author

@narefyev91 thank you! I just applied your suggestion and confirmed that it works!

narefyev91
narefyev91 approved these changes Oct 13, 2023
View reviewed changes
Copy link
Contributor

@narefyev91 narefyev91 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All outstanding items were fixed.
LGTM!
🎀 👀 🎀 C+ reviewed

@melvin-bot melvin-bot bot mentioned this pull request Oct 13, 2023
Closed
@melvin-bot
Copy link

melvin-bot bot commented Oct 13, 2023

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

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

grgia
grgia approved these changes Oct 13, 2023
View reviewed changes
Copy link
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for all your hard work on this one!

@grgia grgia merged commit 6af0d66 into Expensify:main Oct 13, 2023
13 checks passed
@OSBotify
Copy link
Contributor

✋ 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 OSBotify mentioned this pull request Oct 13, 2023
Closed
97 tasks
@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 1.3.84-0 🚀

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

@kbecciv kbecciv mentioned this pull request Oct 16, 2023
Closed
6 tasks
mountiny
mountiny reviewed Oct 16, 2023
View reviewed changes
src/styles/styles.js
@@ -3077,13 +3077,26 @@ const styles = (theme) => ({
},

cardMenuItem: {
paddingLeft: 8,
paddingLeft: 0,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pac-guerreiro any idea why we chnaged this to 0? it is causing design issues in other files

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed 1:1, this should have stayed 8px, fixed

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.84-10 🚀

platform result
🤖 android 🤖 skipped 🚫
🖥 desktop 🖥 skipped 🚫
🍎 iOS 🍎 skipped 🚫
🕸 web 🕸 skipped 🚫

@OSBotify OSBotify mentioned this pull request Oct 16, 2023
Closed
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.84-10 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 1.3.85-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.85-4 🚀

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

This was referenced Oct 30, 2023
Merged
Merged
@DylanDylann DylanDylann mentioned this pull request Jun 4, 2024
Merged
61 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rezkiy37 rezkiy37 rezkiy37 left review comments

@JKobrynski JKobrynski JKobrynski left review comments

@mountiny mountiny mountiny left review comments

@marcaaron marcaaron marcaaron left review comments

@thiagobrez thiagobrez thiagobrez left review comments

@BeeMargarida BeeMargarida BeeMargarida left review comments

@shawnborton shawnborton shawnborton left review comments

@gedu gedu gedu left review comments

@grgia grgia grgia approved these changes

@narefyev91 narefyev91 narefyev91 approved these changes

@roryabraham roryabraham Awaiting requested review from roryabraham

Assignees

@pac-guerreiro pac-guerreiro

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.