[Travel] [Refactor] Create a new shared component for AddressPage #41970

smelaa · 2024-05-10T10:08:38Z

Details

Fixed Issues

$ #41965

PROPOSAL:

Tests

To be able to perform steps 6-7 you need to be spotnana travel beta or modify canUseSpotnanaTravel function from Permissions.ts to return always true.

Go to Account Settings > Profile and open Address Form by clicking on Address.
Change the address and close the modal
Check whether the changes were saved by reopening the modal.
Now change address by selecting different country and close the modal.
Once again check whether the changes were saved correctly.
Go to Account Settings > Workspaces, choose one of the workspaces you are the admin of and open Address FOrm by clicking on Address.
Repeat steps 2-5.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

android.webm

Android: mWeb Chrome

android_web.webm

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-05-10.at.13.33.43.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-05-10.at.13.35.49.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-05-10.at.13.14.39.mov

MacOS: Desktop

Screen.Recording.2024-05-10.at.13.18.15.mov

src/components/CountrySelector.tsx

src/components/StateSelector.tsx

src/hooks/useGeographicalStateAndCountryFromRoute.ts

blazejkustra · 2024-05-13T10:36:32Z

src/hooks/useGeographicalStateAndCountryFromRoute.ts

 import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
+import CONST from '@src/CONST';

 type CustomParamList = ParamListBase & Record<string, Record<string, string>>;


What do you think to remove CustomParamList and instead use the type from here (or similar)?

I have changed it a bit, what about how it is done now?

src/components/CountrySelector.tsx

jnowakow

👌

src/hooks/useGeographicalStateAndCountryFromRoute.ts

melvin-bot · 2024-05-13T12:39:22Z

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

getusha · 2024-05-14T15:56:30Z

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 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
- 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.js 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.
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

Screen.Recording.2024-05-19.at.2.51.45.in.the.afternoon.mov

Android: mWeb Chrome

Screen.Recording.2024-05-19.at.2.10.15.in.the.afternoon.mov

iOS: Native

Screen.Recording.2024-05-19.at.2.41.31.in.the.afternoon.mov

iOS: mWeb Safari

Screen.Recording.2024-05-19.at.2.15.42.in.the.afternoon.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-15.at.9.53.08.in.the.morning.mov

MacOS: Desktop

Screen.Recording.2024-05-19.at.2.20.22.in.the.afternoon.mov

src/pages/AddressPage.tsx

getusha · 2024-05-19T11:04:15Z

BUG: Workspace company address page flickers when opening

Open a workspace you own
Profile > Company address

Screen.Recording.2024-05-19.at.2.00.36.in.the.afternoon.mov

This is probably out of this PRs scope

getusha · 2024-05-19T11:06:36Z

@smelaa and we've a merge conflict.

smelaa · 2024-05-21T13:05:55Z

@getusha the review is addressed and conflicts are solved but I cannot play the video. Could you please upload it once again?

getusha · 2024-05-21T15:26:48Z

@smelaa

Screen.Recording.2024-05-19.at.2.00.36.in.the.afternoon.mov

smelaa · 2024-05-22T08:55:13Z

@getusha I am not able to reproduce this problem.
Chrome on Android:

android.mp4

Safari on IOS:

ios.mp4

Does it happen on main branch or different devices?

getusha · 2024-05-22T17:19:04Z

Does it happen on main branch or different devices?

I can reproduce it on main, it's probably an issue from the emulator.

mountiny

Changes look good to me, thanks @smelaa!

@getusha I want to make sure, have you tested also deeplinking to the country/state pages and navigating from them? thanks

getusha · 2024-05-24T10:18:58Z

@getusha I want to make sure, have you tested also deeplinking to the country/state pages and navigating from them? thanks

@mountiny i just did and it's working fine

Screen.Recording.2024-05-24.at.1.10.49.in.the.afternoon.mov

mountiny

Thanks!

OSBotify · 2024-05-27T14:24:59Z

🚀 Deployed to staging by https://github.com/chiragsalian in version: 1.4.76-0 🚀

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

OSBotify · 2024-05-29T09:17:37Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.76-7 🚀

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

smelaa added 4 commits May 7, 2024 16:43

Restore spotnana beta visibility

b4d4ad0

Rename AddressPage

bc5a067

Refactor PersonalAddressPage & WorkspaceProfileAddressPage

96833e0

Restore spotnana beta visibility

fe7554a

smelaa changed the title ~~[Travel] [Refactor] Create a new shared component for AddressPage~~ [HOLD][Travel] [Refactor] Create a new shared component for AddressPage May 10, 2024

smelaa mentioned this pull request May 10, 2024

[VIP-travel][Fix] Workspace - Unable to select country in Company address #41757

Merged

48 tasks

Fix WorkspaceProfileAddressPage

73ba528

mountiny assigned smelaa May 10, 2024

Merge branch 'main' into travel/address-page-refactor

43d192e

smelaa changed the title ~~[HOLD][Travel] [Refactor] Create a new shared component for AddressPage~~ [Travel] [Refactor] Create a new shared component for AddressPage May 10, 2024

Refactor types

2edab23

dubielzyk-expensify mentioned this pull request May 12, 2024

[HOLD for payment 2024-07-22] [HOLD for payment 2024-07-17] [Travel] [Refactor] Create a new shared component for AddressPage #41965

Closed

jnowakow reviewed May 13, 2024

View reviewed changes

src/components/CountrySelector.tsx Outdated Show resolved Hide resolved

src/components/CountrySelector.tsx Outdated Show resolved Hide resolved

Refactor countryFromUrl

d3e350b

smelaa requested review from blazejkustra and jnowakow May 13, 2024 09:27

blazejkustra suggested changes May 13, 2024

View reviewed changes

Address review comments

198db31

jnowakow approved these changes May 13, 2024

View reviewed changes

blazejkustra approved these changes May 13, 2024

View reviewed changes

src/hooks/useGeographicalStateAndCountryFromRoute.ts Outdated Show resolved Hide resolved

Update JSDoc

4243779

smelaa marked this pull request as ready for review May 13, 2024 12:39

smelaa requested a review from a team as a code owner May 13, 2024 12:39

melvin-bot bot requested review from getusha and removed request for a team May 13, 2024 12:39

getusha reviewed May 19, 2024

View reviewed changes

src/pages/AddressPage.tsx Outdated Show resolved Hide resolved

src/pages/AddressPage.tsx Outdated Show resolved Hide resolved

smelaa added 2 commits May 21, 2024 14:50

Merge branch 'main' into travel/address-page-refactor

817011b

Address review

527114f

eslint

9672ec5

eslint

d6fc3f1

getusha approved these changes May 22, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny May 22, 2024 17:19

getusha approved these changes May 22, 2024

View reviewed changes

mountiny previously approved these changes May 23, 2024

View reviewed changes

Merge branch 'main' into travel/address-page-refactor

d145283

smelaa dismissed mountiny’s stale review via d145283 May 24, 2024 14:37

mountiny approved these changes May 24, 2024

View reviewed changes

chiragsalian merged commit d1694d6 into Expensify:main May 24, 2024

github-actions bot mentioned this pull request May 27, 2024

Deploy Checklist: New Expensify 2024-05-27 #42636

Closed

69 tasks

m-natarajan mentioned this pull request May 27, 2024

[HOLD for payment 2024-07-22] [HOLD for payment 2024-07-17] [$250] Profile - Unable to select a different country when there is existing address #42638

Closed

6 tasks

mountiny mentioned this pull request May 28, 2024

[CP Staging] Revert "[Travel] [Refactor] Create a new shared component for AddressPage" #42697

Merged

getusha mentioned this pull request Jun 12, 2024

[Travel] Bring back refactored AddressPage #43348

Merged

48 tasks

[Travel] [Refactor] Create a new shared component for AddressPage #41970

[Travel] [Refactor] Create a new shared component for AddressPage #41970

Uh oh!

Conversation

smelaa commented May 10, 2024 • edited by mountiny Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

blazejkustra May 13, 2024

Choose a reason for hiding this comment

Uh oh!

smelaa May 13, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jnowakow left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot bot commented May 13, 2024

Uh oh!

getusha commented May 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

getusha commented May 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

getusha commented May 19, 2024

Uh oh!

smelaa commented May 21, 2024

Uh oh!

getusha commented May 21, 2024

Uh oh!

smelaa commented May 22, 2024

Uh oh!

getusha commented May 22, 2024

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

getusha commented May 24, 2024

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented May 27, 2024

Uh oh!

OSBotify commented May 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

smelaa commented May 10, 2024 •

edited by mountiny

Loading

getusha commented May 14, 2024 •

edited

Loading

getusha commented May 19, 2024 •

edited

Loading