Skip to content

refactor preventFutureActivity split phrase to use react-native-render-html #63543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

PiyushChandra17
Copy link
Contributor

@PiyushChandra17 PiyushChandra17 commented Jun 5, 2025

Explanation of Change

Fixed Issues

$ #62808
PROPOSAL: #62808 (comment)

Tests

  1. Click on the account tab
  2. Click on Subscription
  3. Click on Request Early Cancellation
  4. Click on Submit button
  5. Verify the Request early cancellation page > Verify "If you'd like to prevent future activity and charges..." > verify the text is displayed correctly and we are able to click on the link and being redirected
  • Verify that no errors appear in the JS console

Offline 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
Android: mWeb Chrome

android-mWeb-rec

iOS: Native
iOS: mWeb Safari

ios-mWeb-rec

MacOS: Chrome / Safari macos-chrome-rec
MacOS: Desktop desktop-rec

@PiyushChandra17 PiyushChandra17 requested a review from a team as a code owner June 5, 2025 09:46
@melvin-bot melvin-bot bot requested review from allgandalf and removed request for a team June 5, 2025 09:46
Copy link

melvin-bot bot commented Jun 5, 2025

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

@allgandalf
Copy link
Contributor

@PiyushChandra17 please fix failing tests

@allgandalf
Copy link
Contributor

@roryabraham can you trigger workflows here please

@allgandalf
Copy link
Contributor

@PiyushChandra17 fix reassure test and typechecks tests

@PiyushChandra17
Copy link
Contributor Author

@allgandalf Can we start the workflow as early as possible. Thanks

@PiyushChandra17
Copy link
Contributor Author

@allgandalf Can we run the workflow as early as possible

@allgandalf
Copy link
Contributor

I've asked to get the worflows running, @PiyushChandra17 please Don't merge main again unless i review it since we need to run the workflows manually everytime

@roryabraham roryabraham self-requested a review June 13, 2025 20:29
@PiyushChandra17 PiyushChandra17 force-pushed the PiyushChandra17/refactor/splitphrase/preventFutureActivity branch from 831ec74 to 8c1d2f3 Compare June 14, 2025 17:47
@allgandalf
Copy link
Contributor

@PiyushChandra17 lets fix type errors, we now require translations in all languages , please update all the related files

@PiyushChandra17 PiyushChandra17 force-pushed the PiyushChandra17/refactor/splitphrase/preventFutureActivity branch from d4e741a to 1cda72c Compare June 18, 2025 12:05
@PiyushChandra17
Copy link
Contributor Author

@allgandalf I need to check this out

@PiyushChandra17
Copy link
Contributor Author

@allgandalf Yes there's an extra space after the link, will fix it

@PiyushChandra17
Copy link
Contributor Author

@allgandalf Yes i matched with the staging, here's the updated one
updated-space

@PiyushChandra17
Copy link
Contributor Author

PiyushChandra17 commented Jun 26, 2025

@allgandalf I think i have resolved extra space after the link in all languages, also verified the size matches with staging/production

@allgandalf
Copy link
Contributor

allgandalf commented Jun 26, 2025

@PiyushChandra17 please update screenshots on native platforms, checklist is incomplete

@trjExpensify
Copy link
Contributor

We have conflicts now here, @PiyushChandra17. Can you fix those and finish the checklist?

@PiyushChandra17
Copy link
Contributor Author

@trjExpensify Sure, i'am at it

@PiyushChandra17
Copy link
Contributor Author

@allgandalf I think with the latest changes in (prefer-lodash-fast-equals), need to rebuilt the app, android native > will update the screenshot and complete the checklist

@PiyushChandra17
Copy link
Contributor Author

PiyushChandra17 commented Jul 1, 2025

@allgandalf Also don't you think we can't make changes to subscription in the the mobile app like we cannot tap on the annual subscription part and hence we cannot navigate to preventFutureActivity part

subscription

@allgandalf
Copy link
Contributor

hmmm, yeah good point, let me take a look once

@PiyushChandra17
Copy link
Contributor Author

@allgandalf Thanks

@PiyushChandra17
Copy link
Contributor Author

@allgandalf 👀

@allgandalf
Copy link
Contributor

@PiyushChandra17 please fix conflicts

@roryabraham roryabraham merged commit c693f87 into Expensify:main Jul 11, 2025
17 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.

Copy link
Contributor

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

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

Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.1.81-7 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 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.

5 participants