Skip to content

feat: policy distance rate page - #37717

Merged
luacmartins merged 17 commits into
Expensify:mainfrom
MrMuzyk:feat/policy-distance-rates-page
Mar 8, 2024
Merged

luacmartins merged 17 commits into
Expensify:mainfrom
MrMuzyk:feat/policy-distance-rates-page

Conversation

@MrMuzyk

@MrMuzyk MrMuzyk commented Mar 5, 2024 •

Copy link
Copy Markdown
Contributor

Details

Created new page to display Distance Rates

Fixed Issues

$ #37510
PROPOSAL:

Tests

Same as QA steps

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  • have workspace which you're admin of
  • go to workspace settings
  • press on Distance rates from menu on the left side
  • 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 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 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.

Screenshots/Videos

Android: Native
android-native.mp4
Android: mWeb Chrome
android-chrome.mp4
iOS: Native
ios-native.mp4
iOS: mWeb Safari
ios-safari.mp4
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mp4

@luacmartins
luacmartins self-requested a review March 5, 2024 12:43
Comment thread src/libs/actions/Policy.ts
Comment thread src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx Outdated
Comment thread src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx Outdated
Comment thread src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx Outdated
};

const editRate = () => {
// Navigation.navigate(ROUTES.WORKSPACE_EDIT_DISTANCE_RATE.getRoute(route.params.policyID, rateID));

@MrMuzyk MrMuzyk Mar 6, 2024 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, this page is mostly accessible by devs and QAs. This comment and other ones are indicators of what's to come in next PRs

Comment thread src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@MrMuzyk
MrMuzyk marked this pull request as ready for review March 6, 2024 16:01
@MrMuzyk
MrMuzyk requested a review from a team as a code owner March 6, 2024 16:01
@melvin-bot
melvin-bot Bot requested review from getusha and removed request for a team March 6, 2024 16:01
@melvin-bot

melvin-bot Bot commented Mar 6, 2024

Copy link
Copy Markdown

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

Comment thread src/languages/es.ts
Comment thread src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx Outdated
Comment thread src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx Outdated
Comment thread src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx Outdated
Comment thread src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx Outdated
Comment thread src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx Outdated
Comment thread src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@MrMuzyk
MrMuzyk requested a review from getusha March 7, 2024 19:41
isVisible={isWarningModalVisible}
onClose={() => setIsWarningModalVisible(false)}
>
<View style={[styles.notSoFastPopoverWrapper]}>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is there such a specific style here? notSoFastPopoverWrapper seems like it's ultra specific, even though this modal is a pretty generic looking component.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We can reuse existing ConfirmModal,this is what it'll look like. wdyt?

Screenshot 2024-03-08 at 12 23 34 at night

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

That would be ideal, yup. Maybe we can change the copy slightly so we don't get an orphan either, cc @trjExpensify

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Swapped to ConfrimModal component and removed extra styles Ive added

@getusha

getusha commented Mar 7, 2024

Copy link
Copy Markdown
Contributor

The modal's design is off. It also shows up even though several other rates are enabled.

Same question, the modal looks fine from my side. i assumed it's going to be handled later alongside the core functionalities.

<ButtonWithDropdownMenu<WorkspaceDistanceRatesBulkActionType>
shouldAlwaysShowDropdownMenu
pressOnEnter
customText={`${selectedDistanceRates.length} ${translate('workspace.distanceRates.selected')}`}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

NAB: we can do something like this

selected: ({selectedNumber}) => `${selectedNumber} selected`,
, it'd also be great if we can reuse it.

isVisible={isWarningModalVisible}
onClose={() => setIsWarningModalVisible(false)}
>
<View style={[styles.notSoFastPopoverWrapper]}>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We can reuse existing ConfirmModal,this is what it'll look like. wdyt?

Screenshot 2024-03-08 at 12 23 34 at night

@getusha getusha left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM & Works well other than the requests above.

@luacmartins

Copy link
Copy Markdown
Contributor

Cool, @MrMuzyk let's get the comments above addressed and resolve conflicts. This is close!

@MrMuzyk

MrMuzyk commented Mar 8, 2024 •

Copy link
Copy Markdown
Contributor Author

I think I've fixed all that had to be fixed now. You can have a look again :)

@MrMuzyk
MrMuzyk requested review from getusha and luacmartins March 8, 2024 09:33
@luacmartins

Copy link
Copy Markdown
Contributor

@getusha are you available to continue your review here?

@luacmartins luacmartins left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM and tests well!

@getusha

getusha commented Mar 8, 2024

Copy link
Copy Markdown
Contributor

It also shows up even though several other rates are enabled.

@luacmartins @MrMuzyk i think this is not fixed yet, is this going to be handled in the other PR?

@luacmartins

Copy link
Copy Markdown
Contributor

I think that's fine for now given that those actions don't actually work yet. Let's leave that for a follow up of when we actually implement that functionality!

@getusha getusha left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@melvin-bot
melvin-bot Bot requested a review from luacmartins March 8, 2024 19:39
@luacmartins
luacmartins merged commit 838e3fd into Expensify:main Mar 8, 2024
@melvin-bot

melvin-bot Bot commented Mar 8, 2024

Copy link
Copy Markdown

@luacmartins looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@melvin-bot melvin-bot Bot added the Emergency label Mar 8, 2024
@luacmartins

Copy link
Copy Markdown
Contributor

there's a known issue with these tests https://expensify.slack.com/archives/C01GTK53T8Q/p1709911998098289

@luacmartins

Copy link
Copy Markdown
Contributor

@MrMuzyk let's address this issue in the next PR:

the Oops modal shows up even though several other rates are enabled.

@OSBotify

OSBotify commented Mar 8, 2024

Copy link
Copy Markdown
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

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.50-5 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants