[Part 1]: Remove usage of `Onyx.connect` for `ONYXKEYS.COUNTRY_CODE` by allgandalf · Pull Request #66745 · Expensify/App

allgandalf · 2025-07-18T20:18:19Z

Explanation of Change

Fixed Issues

$ #66327
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

1. User Profile – Display Name Check

Navigate to the User Profile
Click on the Profile Picture
✅ Verify that the Display Name is shown correctly

2. Contact Method Field

Open the Profile Page
✅ Verify that the Contact Method (email/phone) is displayed correctly in the Contact Method field

3. View Profile Picture

On the Profile Page, click on the Profile Picture
Select “View Photo”
✅ Verify that the Display Name is displayed correctly

4. Add Delegate Flow

Start the flow to Add a Delegate
Proceed until the Confirmation Page
✅ Verify that the Contact Details of the Delegate (name and email) are displayed correctly

5. Delegate Login Info – Security Settings

Go to Settings → Security
Scroll down to the Delegates section
✅ Verify that the Delegate Login Details are shown properly

6. New Task Creation

Click on the Global Create button
Select “New Task”
✅ Verify that the Assignee Details (display name and contact info) are displayed correctly

7. Remove Member from Workspace

Navigate to Workspace → Members
Attempt to Remove a Member
✅ Verify that the Prompt displays the correct User Details

8. Assign Expensify Card

Go to Expensify Cards → Assign Card
✅ Verify that User Display Names are shown correctly in the assignment list

9. Assign Company Card

Go to Company Cards → Assign Card
✅ Verify that User Display Names are shown correctly in the assignment list

10. Workflow Page – Approvers/Members

Navigate to the Workflows Page
✅ Verify that the Display Names of Approvers and Members are displayed correctly

11. User Chat – Hover to View Name

Go to any User Chat
Hover over a user’s name or avatar
✅ Verify that the User Name is displayed correctly in the tooltip or hover card

12. Workspace Members Table

Navigate to Workspace → Members
✅ Verify that the User Names in the Members Table are displayed correctly

13. Chat Mention – Display Name

Go to any Chat
Mention a user (e.g., @username) and send the message
✅ Verify that the Mention Display Name appears correctly in the chat

13. Workspace

Go to any Workspace chat
Submit an expense
✅ Verify that the submitter name is displayed correctly in report preview
Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-07-19.at.2.07.39.AM.mov

MacOS: Desktop

melvin-bot · 2025-07-18T20:18:25Z

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

shubham1206agra · 2025-07-19T05:59:22Z

@allgandalf You can use a different approach. First, fix the formatPhoneNumber in the LocaleContextProvider component, and then use the formatPhoneNumber function using the useLocalize hook. This way you can avoid extra useOnyx initialisation, and use a centralised function.

allgandalf · 2025-07-19T06:02:17Z

SMART!!!!!

allgandalf · 2025-07-19T06:02:20Z

will do now!

…nd revert previous usage of useOnyx

allgandalf · 2025-07-19T06:23:44Z

@shubham1206agra some context for you:

[No QA]: Add new function to take country code as input #66744

Please check the above PR, i added a helper kind of function, there is more to refactor that it meets the eye, so till we migrate all instances we need to keep onyx.connect in that file, once we are done migrating, we can safely remove the usage!

My Next PR would be for util functions

allgandalf · 2025-07-19T06:41:40Z

@shubham1206agra ready for your review!

src/components/LocaleContextProvider.tsx

Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>

shubham1206agra · 2025-07-22T16:08:02Z

NAB: @tgolen I noticed difference in account switcher text and in security settings about the number format

allgandalf · 2025-07-22T16:09:58Z

is it a regression from this PR or already exists on prod?

shubham1206agra · 2025-07-22T16:10:33Z

is it a regression from this PR or already exists on prod?

Prod issue

shubham1206agra · 2025-07-22T16:36:43Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- 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 there are no new alerts related to the canBeMissing param for useOnyx
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
xIf 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: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

danieldoglas · 2025-07-22T19:53:05Z

src/pages/workspace/WorkspaceMembersPage.tsx

            ownerName: getDisplayNameForParticipant({accountID: policy?.ownerAccountID}),
        });
-    }, [selectedEmployees, translate, policy, currentUserAccountID]);
+    }, [selectedEmployees, translate, policy, currentUserAccountID, formatPhoneNumber]);


for my own knowledge here, why are we passing formatPhoneNumber as a part of the memo function here?

danieldoglas

Code LGTM overall, just a small question related to how useMemo works before I can merge it.

OSBotify · 2025-07-22T20:25:56Z

✋ 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-07-23T15:00:14Z

🚀 Deployed to staging by https://github.com/danieldoglas in version: 9.1.85-2 🚀

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

github-actions · 2025-07-25T07:17:55Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.1.85-5 🚀

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

allgandalf added 11 commits July 19, 2025 01:39

update WorkspaceWorkflowsPayerPage to move away from onyx.connect

854f4d9

Update Expensify card page to pass countryCodeByIP

65db443

Update Comapny card page to pass countryCodeByIP

7f6d9e4

update members page to use countryCodeByIP

bb9dcae

update new task page to use countryCodeByIP

0e64758

update security settings page to use countryCodeByIP

1ecf911

update security settings page to use countryCodeByIP

0b58194

update delegate confirmation page to use countryCodeByIP

13362c8

update profile page to use countryCodeByIP

a3ddf11

fix profile avatar to use countryCodeByIP

191670b

fix profile avatar modal content to use countryCodeByIP

2dd48be

allgandalf requested a review from a team as a code owner July 18, 2025 20:18

melvin-bot bot requested review from shubham1206agra and removed request for a team July 18, 2025 20:18

allgandalf added 2 commits July 19, 2025 01:52

fix prettier

0f8a595

fix failing esLint

4f7ec32

optimise: make use of formatPhoneNumber from useLocalize() function a…

190bfe4

…nd revert previous usage of useOnyx

allgandalf added 3 commits July 19, 2025 11:57

extract formatPhoneNumber from useLocalize

79afefe

add dependency to useMemo

5779a18

fix formatPhoneNumber for report actions

ee6090d

allgandalf added 2 commits July 19, 2025 13:03

export countryCodeByIP to use in hook

47c6255

Merge branch 'Expensify:main' into issue66327-part1

c7b2f82

allgandalf changed the title ~~Make use of useOnyx for countryCodeByIP~~ Part 1: Remove usage of Onyx.connect for ONYXKEYS.COUNTRY_CODE Jul 19, 2025

allgandalf changed the title ~~Part 1: Remove usage of Onyx.connect for ONYXKEYS.COUNTRY_CODE~~ [Part 1]: Remove usage of Onyx.connect for ONYXKEYS.COUNTRY_CODE Jul 19, 2025

allgandalf added 2 commits July 22, 2025 12:22

Merge branch 'Expensify:main' into issue66327-part1

0a8dce2

Merge branch 'main' into issue66327-part1

e21d201

shubham1206agra reviewed Jul 22, 2025

View reviewed changes

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

Update src/components/LocaleContextProvider.tsx

7bf4f62

Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>

shubham1206agra approved these changes Jul 22, 2025

View reviewed changes

melvin-bot bot requested a review from danieldoglas July 22, 2025 16:37

danieldoglas reviewed Jul 22, 2025

View reviewed changes

danieldoglas approved these changes Jul 22, 2025

View reviewed changes

danieldoglas merged commit e8c3b3e into Expensify:main Jul 22, 2025
20 checks passed

github-actions bot mentioned this pull request Jul 23, 2025

Deploy Checklist: New Expensify 2025-07-23 #66960

Closed

74 tasks

danieldoglas assigned allgandalf Jul 23, 2025

melvin-bot bot mentioned this pull request Jul 25, 2025

[$250] Remove Onyx.connect() for the key: ONYXKEYS.COUNTRY_CODE in src/libs/LocalePhoneNumber.ts #66327

Open

Conversation

allgandalf commented Jul 18, 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

1. User Profile – Display Name Check

2. Contact Method Field

3. View Profile Picture

4. Add Delegate Flow

5. Delegate Login Info – Security Settings

6. New Task Creation

7. Remove Member from Workspace

8. Assign Expensify Card

9. Assign Company Card

10. Workflow Page – Approvers/Members

11. User Chat – Hover to View Name

12. Workspace Members Table

13. Chat Mention – Display Name

13. Workspace

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jul 18, 2025

Uh oh!

shubham1206agra commented Jul 19, 2025

Uh oh!

allgandalf commented Jul 19, 2025

Uh oh!

allgandalf commented Jul 19, 2025

Uh oh!

allgandalf commented Jul 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

allgandalf commented Jul 19, 2025

Uh oh!

Uh oh!

shubham1206agra commented Jul 22, 2025

Uh oh!

allgandalf commented Jul 22, 2025

Uh oh!

shubham1206agra commented Jul 22, 2025

Uh oh!

shubham1206agra commented Jul 22, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

danieldoglas Jul 22, 2025

Choose a reason for hiding this comment

Uh oh!

danieldoglas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jul 22, 2025

Uh oh!

github-actions bot commented Jul 23, 2025

Uh oh!

github-actions bot commented Jul 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

allgandalf commented Jul 18, 2025 •

edited

Loading

allgandalf commented Jul 19, 2025 •

edited

Loading