Skip to content

fix: refactor modals part 1(TroubleshootPage, CardSection, SecuritySettingsPage, CloseAccountPage)#79556

Merged
roryabraham merged 33 commits intoExpensify:mainfrom
truph01:fix/76693-part-1
Mar 2, 2026
Merged

fix: refactor modals part 1(TroubleshootPage, CardSection, SecuritySettingsPage, CloseAccountPage)#79556
roryabraham merged 33 commits intoExpensify:mainfrom
truph01:fix/76693-part-1

Conversation

@truph01
Copy link
Contributor

@truph01 truph01 commented Jan 14, 2026

Explanation of Change

  • This PR refactor modal in TroubleshootPage, CardSection, SecuritySettingsPage, CloseAccountPage to use useConfirmModal.

Fixed Issues

$ #76693
PROPOSAL:

Tests

Test 1: CloseAccountPage

  1. Open ND app.
  2. Open Account tab > Security > Close account
  3. Enter all inputs in Close account screen
  4. Click "Close account" button
  5. Verify the confirm modal is shown.
  6. Click "Yes, continue"
  7. Verify account is closed sucessfully.

Test 2: TroubleshootPage

  1. Open ND app.
  2. Open Account tab > Troubleshoot > Clear cache and restart
  3. Verify the confirm modal is shown
  4. Choose Reset and refresh
  5. Verify the app is reset and refreshed successfully.

Test 3: SecuritySettingsPage

Requirement: Account has a few delegate accounts

  1. Open ND app.
  2. Open Account tab > Security
  3. Click on the three dot button beside any delegate account > Remove copilot
  4. Verify the confirm modal is shown
  5. Choose "Remove copilot"
  6. Verify the delegate account is removed.

Test 4: CardSection

  1. Go to Subscription page
  2. Click on Request refund button
  3. Verify that modal shown
  4. Next click Downgrade...
  5. Verify that modal got closed and your account is downgraded
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.2026-01-15.at.18.18.02.mov
Android: mWeb Chrome

Uploading Screen Recording 2026-01-15 at 18.14.40.mov…

iOS: Native
Screen.Recording.2026-01-15.at.18.12.58.mov
iOS: mWeb Safari
Screen.Recording.2026-01-15.at.18.09.12.mov
MacOS: Chrome / Safari

TroubleshootPage.tsx

Screen.Recording.2025-12-10.at.01.10.54.mov

CardSection.tsx

Screen.Recording.2025-12-10.at.01.14.05.mov

SecuritySettingsPage.tsx

Screen.Recording.2025-12-10.at.01.15.34.mov

CloseAccountPage.tsx

@codecov
Copy link

codecov bot commented Jan 14, 2026

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/pages/settings/Security/CloseAccountPage.tsx 0.00% <0.00%> (ø)
...c/pages/settings/Troubleshoot/TroubleshootPage.tsx 0.00% <0.00%> (ø)
...c/pages/settings/Security/SecuritySettingsPage.tsx 0.00% <0.00%> (ø)
.../settings/Subscription/CardSection/CardSection.tsx 0.00% <0.00%> (ø)
... and 10 files with indirect coverage changes

@truph01 truph01 marked this pull request as ready for review January 15, 2026 12:23
@truph01 truph01 requested review from a team as code owners January 15, 2026 12:23
@melvin-bot melvin-bot bot requested review from ZhenjaHorbach and joekaufmanexpensify and removed request for a team January 15, 2026 12:23
@melvin-bot
Copy link

melvin-bot bot commented Jan 15, 2026

@ZhenjaHorbach 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 January 15, 2026 12:23
titleStyle={styles.textStrong}
onPress={viewPurchases}
/>
)}
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ PERF-8 (docs)

The async inline function in the onPress handler is being used to handle a user event. This creates unnecessary complexity and should be avoided.

Reasoning: Event handlers should handle events directly. Creating an async inline function makes the code harder to read and adds unnecessary indirection between the user action and the response.

Suggested fix: Extract the async logic into a named async function:

const handleRequestRefund = async () => {
    const result = await showRequestRefundModal();
    if (result.action !== ModalActions.CONFIRM) {
        return;
    }
    requestRefund();
};

// Then in the MenuItem:
<MenuItem
    shouldShowRightIcon
    icon={expensifyIcons.Bill}
    wrapperStyle={styles.sectionMenuItemTopDescription}
    title={translate('subscription.cardSection.requestRefund')}
    titleStyle={styles.textStrong}
    disabled={isOffline}
    onPress={handleRequestRefund}
/>

@joekaufmanexpensify
Copy link
Contributor

No product considerations. Removing my review

@joekaufmanexpensify joekaufmanexpensify removed their request for review January 15, 2026 18:18
@truph01
Copy link
Contributor Author

truph01 commented Jan 22, 2026

@ZhenjaHorbach I addressed all your comments

@ZhenjaHorbach
Copy link
Contributor

@ZhenjaHorbach I addressed all your comments

@truph01
Left comment
https://github.com/Expensify/App/pull/79556/changes#r2715711163
And could you check all your PRs and remove all IIFE functions?

@ZhenjaHorbach
Copy link
Contributor

@truph01
Friendly bump!

@truph01
Copy link
Contributor Author

truph01 commented Feb 17, 2026

@ZhenjaHorbach I just fixed conflicts

@roryabraham
Copy link
Contributor

@truph01 you've got conflicts again here

@ZhenjaHorbach
Copy link
Contributor

@truph01
Friendly bump!

@truph01
Copy link
Contributor Author

truph01 commented Feb 23, 2026

@ZhenjaHorbach All good now!

@roryabraham
Copy link
Contributor

Sorry @truph01 we have conflicts here again

@ZhenjaHorbach
Copy link
Contributor

@truph01
We have conflicts again 🥲

@truph01
Copy link
Contributor Author

truph01 commented Mar 2, 2026

@ZhenjaHorbach All good now!

Copy link
Contributor

@roryabraham roryabraham left a comment

Choose a reason for hiding this comment

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

Going to approve and merge just to avoid conflicts, please create a follow-up PR to remove the lint suppression

});

useEffect(() => {
// eslint-disable-next-line react-hooks/set-state-in-effect
Copy link
Contributor

Choose a reason for hiding this comment

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

Do not suppress this - it's a warning not an error. If you had lint failing that likely means you introduced other warnings somewhere else. It just hides the warning, which isn't a good thing.

@roryabraham roryabraham merged commit b1b6dc0 into Expensify:main Mar 2, 2026
28 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Mar 2, 2026

✋ 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
Copy link
Contributor

github-actions bot commented Mar 2, 2026

🚧 @roryabraham has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Contributor

OSBotify commented Mar 2, 2026

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.3.28-0 🚀

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

@IuliiaHerets
Copy link

Hi @truph01. How can we get the Request refund button for the Test4?

image image

cc @roryabraham

@m-natarajan
Copy link

m-natarajan commented Mar 3, 2026

@truph01 @roryabraham @ZhenjaHorbach How to get Request refund, Is this requires Annual subscription. If so we are not able to test this due to credit card issues. Can this one please be validated internally or is this expected as per this comment. Rest of the steps passed

@ZhenjaHorbach
Copy link
Contributor

@truph01 @roryabraham @ZhenjaHorbach How to get Request refund, Is this requires Annual subscription. If so we are not able to test this due to credit card issues. Can this one please be validated internally. Rest of the steps passed

Unfortunately, I used mocks
But yes
I think we can check it internally

@OSBotify
Copy link
Contributor

OSBotify commented Mar 4, 2026

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.3.30-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Mar 4, 2026

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.30-3 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 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