Skip to content

Warning Modal About Switching Tags Shows Up When Re-uploading Multi Level Tags#69676

Merged
grgia merged 8 commits intoExpensify:mainfrom
nkdengineer:fix/68783
Sep 24, 2025
Merged

Warning Modal About Switching Tags Shows Up When Re-uploading Multi Level Tags#69676
grgia merged 8 commits intoExpensify:mainfrom
nkdengineer:fix/68783

Conversation

@nkdengineer
Copy link
Contributor

@nkdengineer nkdengineer commented Sep 2, 2025

Explanation of Change

Fixed Issues

$ #68783
PROPOSAL: #68783 (comment)

Tests

  1. Go to Workspace page
  2. Go to Tags page (Enable it in more feature if needed)
  3. Import multi-level tags
  4. Verify that no warning modal is shown
  5. Complete the import flow
  6. Import multi-level tags again
  7. Verify that the following warning is shonw

Import tags
Are you sure? The existing tags will be overridden, but you can [download a backup] first.

[Import tags]
[Cancel]

  1. Click confirm button
  2. Verify that the previous data is not cleared
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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
Screen.Recording.2025-09-03.at.00.30.19.mov
Android: mWeb Chrome
Screen.Recording.2025-09-03.at.00.29.20.mov
iOS: Native
iOS: mWeb Safari
Screen.Recording.2025-09-03.at.00.28.48.mov
MacOS: Chrome / Safari
Screen.Recording.2025-09-03.at.00.26.25.mp4
MacOS: Desktop
Screen.Recording.2025-09-03.at.00.30.56.mp4

@nkdengineer nkdengineer marked this pull request as ready for review September 2, 2025 17:41
@nkdengineer nkdengineer requested review from a team as code owners September 2, 2025 17:41
@melvin-bot melvin-bot bot requested a review from alitoshmatov September 2, 2025 17:42
@melvin-bot
Copy link

melvin-bot bot commented Sep 2, 2025

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

@melvin-bot melvin-bot bot removed the request for review from a team September 2, 2025 17:42
@nkdengineer
Copy link
Contributor Author

Will add the iOS video soon

Copy link
Contributor

@trjExpensify trjExpensify left a comment

Choose a reason for hiding this comment

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

Import tag levels
Importing a new spreadsheet will overwrite your current tags. We suggest you first download a backup by exporting your tags. Learn more about tag levels.

I know @NickTooker looked at this copy, but can we revisit? I don't think we need to insert a persona into this (who's "we?"), it would be better as a simple matter of fact system message. CC: @jamesdeanexpensify for input on this suggested edit:

Import tags
Are you sure you want to overwrite the current tags? Download a backup, or learn more about managing tags.
[Import tags]
[Cancel]

@jamesdeanexpensify
Copy link
Contributor

What about a mix? Also, I'm not sure if we really need the Learn more. at the end - what do you think?

Import tags
Are you sure you want to import tags? You'll overwrite the existing tags, but you can [download a backup] first. [Learn more.]

[Import tags]
[Cancel]

@trjExpensify
Copy link
Contributor

trjExpensify commented Sep 3, 2025

There's a lot of "import tags" repeated and "you's" which I'm not the biggest fan of personally. Down to kill learn more as well. How about..

Import tags
Are you sure? The existing tags will be overridden, but you can [download a backup] first.

[Import tags]
[Cancel]

@jamesdeanexpensify
Copy link
Contributor

Sounds great!

@nkdengineer
Copy link
Contributor Author

nkdengineer commented Sep 4, 2025

@trjExpensify @jamesdeanexpensify Thank you for your feedback. I updated the PR, here's the result:

Screenshot 2025-09-04 at 14 39 11

@trjExpensify
Copy link
Contributor

Thanks!

@danielrvidal
Copy link
Contributor

@nkdengineer is this ready for review now?

@nkdengineer
Copy link
Contributor Author

@danielrvidal Yes, it's ready for review cc @alitoshmatov

@danielrvidal
Copy link
Contributor

@alitoshmatov mind reviewing this one?

@nkdengineer
Copy link
Contributor Author

@alitoshmatov kindly bump

@alitoshmatov
Copy link
Contributor

alitoshmatov commented Sep 18, 2025

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
  • 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: HybridApp
tag-android.mov
Android: mWeb Chrome
tag-mweb.mov
iOS: HybridApp
tag-ios.mp4
iOS: mWeb Safari
tag-safari.mp4
MacOS: Chrome / Safari
tag-web.mov
MacOS: Desktop
tag-desktop.mov

Copy link
Contributor

@alitoshmatov alitoshmatov left a comment

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 grgia September 18, 2025 21:06
Comment on lines +4897 to +4903
overrideMultiTagWarning: {
title: '',
prompt1: '',
prompt2: '',
prompt3: '',
prompt4: '',
},
Copy link
Contributor

Choose a reason for hiding this comment

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

why are these empty?

Copy link
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

Im assuming languages should not be empty, but I don't know the process for these yet

@nkdengineer
Copy link
Contributor Author

@grgia When everything is fine, I'll run the script to update the translation

@nkdengineer
Copy link
Contributor Author

Updated @grgia @alitoshmatov

grgia
grgia previously approved these changes Sep 23, 2025
@grgia
Copy link
Contributor

grgia commented Sep 23, 2025

@nkdengineer tests

@nkdengineer
Copy link
Contributor Author

@grgia All good now. Thank you

@grgia grgia merged commit 54f42d2 into Expensify:main Sep 24, 2025
21 checks passed
@OSBotify
Copy link
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
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 9.2.18-0 🚀

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

@mitarachim
Copy link

Hello @nkdengineer , this is the correct warning modal, right?
It seems different from the steps in the PR.

@nkdengineer
Copy link
Contributor Author

@mitarachim You're right, we decided to change the content inside modal during PR phase. Anyway, I updated the steps to reflect the correct content.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.2.18-7 🚀

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

Comment on lines +133 to +143
onPress={() => {
if (hasIndependentTags && isMultiLevelTags) {
downloadMultiLevelIndependentTagsCSV(policyID, () => {
setIsDownloadFailureModalVisible(true);
});
} else {
downloadTagsCSV(policyID, () => {
setIsDownloadFailureModalVisible(true);
});
}
}}
Copy link
Contributor

@hungvu193 hungvu193 Dec 4, 2025

Choose a reason for hiding this comment

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

When the user canceled the file picker on IOS, the failed callback in this block of code triggered which made another modal displays while the current modal is still visible. This caused a frozen bug on ios and we fixed it here:
#75374

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.

9 participants