Add space between destination and subrate by mkzie2 · Pull Request #54984 · Expensify/App

mkzie2 · 2025-01-09T05:12:53Z

Explanation of Change

Add space between destination and subrate

Fixed Issues

$ #53928
PROPOSAL: #53928 (comment)

Tests

Precondition: Per Diem is enabled and the destination is a long text

Go to the Per Diem page
Verify that we have a space between destination and subrate

Verify that no errors appear in the JS console

Offline tests

Same

QA Steps

Precondition: Per Diem is enabled and the destination is a long text

Go to the Per Diem page
Verify that we have a space between destination and subrate

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 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 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:
- 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 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.ts 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 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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-01-09T05:23:53Z

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

dominictb · 2025-01-09T10:49:04Z

@Expensify/design Do the screenshots look good to y'all?

shawnborton · 2025-01-09T10:59:32Z

I think they look pretty good. I don't love the column width distribution on desktop but my guess is that we're just doing even fills across all columns. One thing we could consider though is giving the amount column on desktop a fixed width so we have less of an awkward gap?

dannymcclain · 2025-01-09T13:52:14Z

Yeah I agree with Shawn. They're fine as is, but it feels a little weird to be truncating the destination where there's so much available space in the table. Taking Shawn's idea for a spin, here's the table where the amount column has a fixed width of 80px (obviously we could adjust that value if there was a more appropriate width to use):

shawnborton · 2025-01-09T13:59:56Z

I like that a lot Danny!

dubielzyk-expensify · 2025-01-10T02:36:35Z

Dig it. Think this'll scale to mobile better too

mkzie2 · 2025-01-14T04:56:39Z

@dannymcclain Instead of adding a fixed width for the amount column, I think we can divide the column in the ratio 2:2:1. What do you think?

Ratio 1:1:1

Ratio 2:2:1

Ratio 3:2:1

Ratio 3:3:1

dubielzyk-expensify · 2025-01-14T05:12:42Z

Can you add mobile screenshot to these suggestions too? The 3:2:1 or 3:3:1 looks the most right to me and perhaps you're right that's it's better to avoid fixed (though I'm not against it).

mkzie2 · 2025-01-14T05:29:04Z

@dubielzyk-expensify Here is the mobile screen

Ratio 3:2:1

Ratio 3:3:1

shawnborton · 2025-01-14T06:45:02Z

Nice, the extra mocks are super helpful. I think 3:2:1 gets my vote, though I don't feel too strongly.

dannymcclain · 2025-01-14T14:21:39Z

Yes thank you for sharing all those! 3:2:1 definitely gets my vote.

mkzie2 · 2025-01-14T16:39:27Z

@dominictb I updated.

dubielzyk-expensify · 2025-01-15T03:27:27Z

Yes thank you for sharing all those! 3:2:1 definitely gets my vote.

I'm up for that too 👍

dominictb · 2025-01-15T17:05:05Z

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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

dominictb · 2025-01-15T17:14:08Z

@mkzie2 Please update all the screenshots to the latest expectations so QA can easily follow. And remove this comment here from QA Steps:

mkzie2 · 2025-01-16T05:45:55Z

@mkzie2 Please update all the screenshots to the latest expectations so QA can easily follow. And remove this comment here from QA Steps:

@dominictb I updated.

dominictb

🎀👀🎀

MarioExpensify

Nice!! LGTM!

OSBotify · 2025-01-16T12:23:50Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-01-17T13:55:02Z

🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.0.87-0 🚀

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

github-actions · 2025-01-21T08:08:06Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.87-3 🚀

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

s77rt · 2025-02-15T12:49:27Z

src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx

+            <View style={styles.flex3}>
                <Text style={[styles.searchInputStyle, styles.alignSelfStart]}>{translate('common.destination')}</Text>
            </View>
-            <View style={styles.flex1}>
-                <Text style={[styles.searchInputStyle, styles.alignItemsStart]}>{translate('common.subrate')}</Text>
+            <View style={styles.flex2}>
+                <Text style={[styles.searchInputStyle, styles.alignItemsStart, styles.pl2]}>{translate('common.subrate')}</Text>
            </View>
            <View style={styles.flex1}>


This gave the amount column too little space that in mobile the amount is rendered in two lines #55945.

We have changed the ratio to 3:2:2

mkzie2 added 2 commits January 9, 2025 11:50

Add space between destination and subrate

fe4bda8

remove unchange code

3c39972

mkzie2 force-pushed the mkzie2-issue/53928 branch from 83d24d6 to 3c39972 Compare January 9, 2025 05:23

mkzie2 marked this pull request as ready for review January 9, 2025 05:23

mkzie2 requested a review from a team as a code owner January 9, 2025 05:23

melvin-bot bot requested review from dominictb and removed request for a team January 9, 2025 05:23

mkzie2 mentioned this pull request Jan 9, 2025

[HOLD for payment 2025-01-28] [$125] Per diem - Ellipsis from Destination is too close to Subrate #53928

Closed

8 tasks

Merge branch 'main' into mkzie2-issue/53928

7b54f74

mkzie2 added 3 commits January 14, 2025 12:01

update perdiem column ratio

155818e

remove unchange

118449d

fix eslint error

6c9c0e4

mkzie2 added 2 commits January 14, 2025 23:38

update ratio to 3:2:1

809bbcd

Merge branch 'main' into mkzie2-issue/53928

be2e5fe

fix lint error

95c0a8c

Merge branch 'main' into mkzie2-issue/53928

d550cbe

dominictb approved these changes Jan 16, 2025

View reviewed changes

melvin-bot bot requested a review from MarioExpensify January 16, 2025 07:31

MarioExpensify approved these changes Jan 16, 2025

View reviewed changes

MarioExpensify merged commit 1ee7261 into Expensify:main Jan 16, 2025

github-actions bot mentioned this pull request Jan 17, 2025

Deploy Checklist: New Expensify 2025-01-17 #55396

Closed

60 tasks

s77rt reviewed Feb 15, 2025

View reviewed changes

s77rt mentioned this pull request Feb 15, 2025

[Due for payment 2025-02-18] [$250] Per diem-Amount is misaligned and displayed in 2 rows #55945

Closed

8 tasks

Conversation

mkzie2 commented Jan 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jan 9, 2025

Uh oh!

dominictb commented Jan 9, 2025

Uh oh!

shawnborton commented Jan 9, 2025

Uh oh!

dannymcclain commented Jan 9, 2025

Uh oh!

shawnborton commented Jan 9, 2025

Uh oh!

dubielzyk-expensify commented Jan 10, 2025

Uh oh!

mkzie2 commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dubielzyk-expensify commented Jan 14, 2025

Uh oh!

mkzie2 commented Jan 14, 2025

Uh oh!

shawnborton commented Jan 14, 2025

Uh oh!

dannymcclain commented Jan 14, 2025

Uh oh!

mkzie2 commented Jan 14, 2025

Uh oh!

dubielzyk-expensify commented Jan 15, 2025

Uh oh!

dominictb commented Jan 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dominictb commented Jan 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mkzie2 commented Jan 16, 2025

Uh oh!

dominictb left a comment

Choose a reason for hiding this comment

Uh oh!

MarioExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jan 16, 2025

Uh oh!

github-actions bot commented Jan 17, 2025

Uh oh!

github-actions bot commented Jan 21, 2025

Uh oh!

s77rt Feb 15, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

mkzie2 commented Jan 9, 2025 •

edited

Loading

mkzie2 commented Jan 14, 2025 •

edited

Loading

dominictb commented Jan 15, 2025 •

edited

Loading

dominictb commented Jan 15, 2025 •

edited

Loading