-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
Update "Hold expense" modal copy and icons #53354
Conversation
@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] |
@@ -170,9 +207,11 @@ function FeatureTrainingModal({ | |||
User.dismissTrackTrainingModal(); | |||
} | |||
setIsModalVisible(false); | |||
Navigation.goBack(); | |||
if (onboardingIsMediumOrLargerScreenWidth) { | |||
Navigation.goBack(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We only need to call goBack
on large screens because the hold request modal is rendered inside a dedicated page route. On small screens, it's just a modal.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is creating an issue. For Track expense feature training we show the route on all platforms so we need to go back on all of them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I think we no longer need modal for small screens because we stopped using RHP for hold modal.
deleteHoldTitle: 'Eliminar lo que no se pagará', | ||
deleteHoldExplain: 'En el raro caso de que algo se bloquee y no se pague, la persona que solicita el pago debe eliminarlo.', | ||
holdEducationalTitle: 'Esta solicitud está', | ||
holdEducationalText: 'retenida', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
retenida
is only used in hold request modal. Hold
in other places remains bloquear
. Context: #52655 (comment)
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? |
Good catch Jon - I think we use a standard gap of like 8px or something between headlines and the paragraph that immediately follows? |
I'm seeing both |
Same, I think that would be my vote too. |
@gijoe0295 Can you please confirm the margin used and make sure it is 8px as requested here #53354 (comment) #53354 (comment)? |
@shawnborton @dannymcclain I've made the space between title & description consistently ![]() Do these look fine to you? |
That feels good to me. Just noting that because of the background color of the "Hold" badge, the gap between headline and text will feel a bit larger than what we're used to seeing elsewhere. But I can get down with what you have above. |
@shawnborton Just noting that the mobile still have bigger margin. Only desktop and web has 8p gap. Do you agree with this or we should use same? |
Yeah, I would think it's the same everywhere. I would imagine the design team will agree too :) |
Yup! |
@@ -41,32 +32,33 @@ function ProcessMoneyRequestHoldMenu({isVisible, onClose, onConfirm, anchorPosit | |||
return unsub; | |||
}, [navigation, onClose]); | |||
|
|||
const title = useMemo( | |||
() => ( | |||
<View style={[styles.flexRow, styles.alignItemsCenter, onboardingIsMediumOrLargerScreenWidth ? styles.mb1 : styles.mb2]}> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is supposed to be same on all platforms 8px.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We already have a 4px
gap on desktop in FeatureTrainingModal
:
App/src/components/FeatureTrainingModal.tsx
Line 261 in 9be0b9f
<View style={[onboardingIsMediumOrLargerScreenWidth ? [styles.gap1, styles.mb8] : [styles.mb10], contentInnerContainerStyles]}> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I got it.
I too agree with the designers |
@gijoe0295 looks like your checklist is missing the Android native screenshots, can you provide those please? @parasharrajat please make sure all screenshots are updated in the reviewer checklist before we merge. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wow this was a big one, thanks @gijoe0295 and @parasharrajat. The code LGTM! Let's just get the correct screenshots in place and I'll merge it.
Oops sorry that was my bad, I had trouble building Android and forgot to retry later. I'll do it now. |
@MarioExpensify I updated Android video. |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.0.87-0 🚀
|
🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.87-3 🚀
|
Explanation of Change
Fixed Issues
$ #52655
PROPOSAL: #52655 (comment)
Tests
Offline tests
NA
QA Steps
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
Screen.Recording.2025-01-16.at.00.39.47.mov
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
Screen.Recording.2024-12-03.at.02.26.16-recording.mov
MacOS: Chrome / Safari
MacOS: Desktop