App
App copied to clipboard
Update "Hold expense" modal copy and icons
Explanation of Change
Fixed Issues
$ https://github.com/Expensify/App/issues/52655 PROPOSAL: https://github.com/Expensify/App/issues/52655#issuecomment-2479856195
Tests
- Login with an account that has not seen hold request modal before (better be a new account)
- Submit 2 expenses to a workspace
- Hold 1 expense
- Verify hold request modal shows
- Press Got it (or press backdrop)
- Verify the modal disappears
- Hold the other expense
- Verify hold request modal does not show again
- Login with an account that has not seen track training modal before
- Go offline
- Press FAB > Track expense
- Verify the track training modal shows with an animation
- Go online
- Verify the track training modal shows with a video
- [x] Verify that no errors appear in the JS console
Offline tests
NA
QA Steps
- Login with an account that has not seen hold request modal before (better be a new account)
- Submit 2 expenses to a workspace
- Hold 1 expense
- Verify hold request modal shows
- Press Got it (or press backdrop)
- Verify the modal disappears
- Hold the other expense
- Verify hold request modal does not show again
- [x] Verify that no errors appear in the JS console
PR Author Checklist
- [x] I linked the correct issue in the
### Fixed Issuessection above - [x] I wrote clear testing steps that cover the changes made in this PR
- [x] I added steps for local testing in the
Testssection - [x] I added steps for the expected offline behavior in the
Offline stepssection - [x] I added steps for Staging and/or Production testing in the
QA stepssection - [x] I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- [x] 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)
- [x] 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).
- [x] I added steps for local testing in the
- [x] I included screenshots or videos for tests on all platforms
- [x] I ran the tests on all platforms & verified they passed on:
- [x] Android: Native
- [x] Android: mWeb Chrome
- [x] iOS: Native
- [x] iOS: mWeb Safari
- [x] MacOS: Chrome / Safari
- [x] MacOS: Desktop
- [x] 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)
- [x] I followed proper code patterns (see Reviewing the code)
- [x] 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.
toggleReportand notonIconClick) - [x] I verified that comments were added to code that is not self explanatory
- [x] 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.
- [x] I verified any copy / text shown in the product is localized by adding it to
src/languages/*files and using the translation method- [x] If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- [x] I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- [x] 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)
- [x] 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.
- [x] I verified the JSDocs style guidelines (in
STYLE.md) were followed
- [x] 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.
- [x] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- [x] I followed the guidelines as stated in the Review Guidelines
- [x] 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 usingAvatarare working as expected) - [x] I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
- [x] I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
- [x] I verified that if a function's arguments changed that all usages have also been updated correctly
- [x] If any new file was added I verified that:
- [x] 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
- [x] If a new CSS style is added I verified that:
- [x] A similar style doesn't already exist
- [x] The style can't be created with an existing StyleUtils function (i.e.
StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
- [x] 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.
- [x] 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
Avataris modified, I verified thatAvataris working as expected in all cases) - [x] 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.
- [x] 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.
- [x] 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:
- [x] I verified that all the inputs inside a form are aligned with each other.
- [x] I added
Designlabel and/or tagged@Expensify/designso the design team can review the changes.
- [x] If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - [x] I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
- [x] If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.
Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
https://github.com/user-attachments/assets/5e464625-9cc9-4aa9-b3a3-db4623ed9da4
MacOS: Chrome / Safari
MacOS: Desktop
@parasharrajat 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]
On mobile, the bottom corners should not be rounded:
For light mode, I wonder if we should make the "hold" text use a lighter color? My gut says yes, but let's see what @Expensify/design thinks too.
I would just opt to use the same color we use for button text.
On mobile, the bottom corners should not be rounded:
Updated this.
@gijoe0295 Thanks for waiting. Can you please resolve the conflicts?
Not done yet. Need to retest after resolving the conflicts.
@gijoe0295 Any update?
I wonder if we should make the "hold" text use a lighter color? I would just opt to use the same color we use for button text.
Yeah I think we should. I think we're planning on doing that for the decline vs hold modal as well.
Nice, let's do it. @gijoe0295 can you please make the "Hold" text use the same color value as our button text? Thanks!
Here's what we got after the border radius and text color updates:
That feels nice to me!
Oh yeah that's much better!
What's the latest on this one @gijoe0295 & @parasharrajat ? Can we get this merged?
Pending @parasharrajat review.
Just trying to build android app.
@parasharrajat How's the build going?
Its working now. I have this one on the list. It should be done in 2 days.
Testing today...
All those Default ID changes are making it harder to identify the real the changes. @gijoe0295 Please merge main so that we can eliminate few of them.
@gijoe0295 Can you please describe the changes briefly?
- What modals are impacted from your change?
- How track training and hold madal working now? Are they URL-controlled on all platforms or some? etc.
@parasharrajat
- These modals are affected (because they use
FeatureTrainingModal):onboarding/welcome-video,onboarding/explanation,onboarding/migrated-user-welcome,track-trainingandhold-expense-educational - All the modals are URL-controlled now (i.e. having their own modal navigator) which follows the same pattern throughout App. Previously because the hold expense educational modal is inside a RHP on large screens and a modal on small ones, we need to use both component-based and URL-based approaches. Now since they are all modals, only URL-based is enough.
Thanks for the through explanation. I will start testing the URL flow. I hope it works fine on mobile web.
What's the latest on this one?
@gijoe0295 I didn't see the Hold Modal when I held an expense. Can you please update your screenshots and add video at least for mweb and android?
BUG: We can navigate back to the Hold-reason-modal via browser forward button.
I didn't see the Hold Modal when I held an expense
@parasharrajat It's probably because you already hid it before. We have the logic not to show the modal again once user dismissed it.
Let me try again and create a vid for you because, I remember I tried with new accounts.
Screenshots
:black_square_button: iOS / native
https://github.com/user-attachments/assets/15954cd9-e210-45ee-b645-94af66c82903
:black_square_button: iOS / Safari
https://github.com/user-attachments/assets/c8461960-70db-4822-b05f-3f150da30f1d
:black_square_button: MacOS / Desktop
https://github.com/user-attachments/assets/8aca1ab4-0ede-450b-8840-bfa47429264d
:black_square_button: MacOS / Chrome
https://github.com/user-attachments/assets/b90772bf-0d67-42a9-8426-887faac8708f
:black_square_button: Android / Chrome
https://github.com/user-attachments/assets/96c7f152-3143-4bf0-a7fa-bd0993233baa
:black_square_button: Android / native
https://github.com/user-attachments/assets/6d008686-890e-4600-b1fe-fb3fd84dff6d
Is there a difference in the space between the headline and description on mobile and desktop? It almost feels like it's bigger on desktop?
Otherwise the modal itself looks good to me 👍
Good catch Jon - I think we use a standard gap of like 8px or something between headlines and the paragraph that immediately follows?