Improve feed removal flow offline by VickyStash · Pull Request #54425 · Expensify/App

VickyStash · 2024-12-20T16:44:10Z

Explanation of Change

Improve feed removal flow offline

Fixed Issues

$ #54379
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console

Open the workspace with the Company Cards feature on.
Set up at least two feeds (direct and custom ones).
In one of the feeds, assign 1-2 cards.
Turn on Force offline mode or just go offline. Remove the feed with assigned cards.
The removed feed should be shown with a strikethrough in the feed selector.
The cards of the removed feed should be shown with a strikethrough on the member details page and in the wallet.
Remove another feed. Make sure no feeds are displayed.

Offline tests

Same, as in the Tests section.

QA Steps

Verify that no errors appear in the JS console

Same, as in the Tests section.

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

ios1.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

web1.mp4

MacOS: Desktop

desktop1.mp4

…ed-offline

…omCompanyCards

melvin-bot · 2024-12-23T16:27:50Z

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

DylanDylann · 2024-12-24T04:26:09Z

src/libs/CardUtils.ts

-    return Object.fromEntries(Object.entries(companyCards).filter(([key]) => key !== CONST.EXPENSIFY_CARD.BANK));
+function getCompanyFeeds(cardFeeds: OnyxEntry<CardFeeds>, shouldFilterOutRemovedFeeds = false): CompanyFeeds {
+    return Object.fromEntries(
+        Object.entries(cardFeeds?.settings?.companyCards ?? {}).filter(([key, value]) => {


@VickyStash Why do we remove cardFeeds?.settings?.oAuthAccountDetails here? As I understand, direct feeds will be saved in oAuthAccountDetails

Right now, both custom and direct feed settings are stored under the companyCards field. oAuthAccountDetails stores only data for direct feed card assignment.
See the data:

[ { "key": "sharedNVP_private_domain_member_18461622", "onyxMethod": "set", "value": { "settings": { "companyCardNicknames": { "oauth.americanexpressfdx.com 1001": "American Express cards1", "vcf": "Visa cards1" }, "companyCards": { "cdf": { "pending": true }, "oauth.americanexpressfdx.com 1001": { "asrEnabled": false, "forceReimbursable": "force_no", "liabilityType": "personal", "preferredPolicy": "D6A2FBEF5E601C15", "reportTitleFormat": "", "shouldApplyCashbackToBill": true, "statementPeriodEndDay": 1, "uploadLayoutSettings": [] } }, "oAuthAccountDetails": { "oauth.americanexpressfdx.com 1001": { "accountList": [ "Business Green Rewards Card - 1001" ], "credentials": "Fv6DIZqi836JYuSLyfsvzwiIQyQSIcfwBu7Mb50pxJsDjEdP2vKee64s6fjokcVu3JYgsQEL2K7qb3ItXY+kOgzyy/syGrQoMHikkvBAqhNUnzfHX1CdFoRXxXtaISS8PliI/tMXy6rnXe8CDYrbHh74lDqLHq9Xy9x4xyZ0tdUfKxC/T8yj1oVzJDQkFzVsQ5oM8cuZWdTPni9EoSKlF7q8xgwydXJIVbb3ISdHFQ27wlq3b0kT9huLe0WW17HGv8soxgTT3iJ8Bb7q5PTzLwxy7ZsLKZtPvctimAZ0Kf1tgLEwMiXeF1rzaeghzhbk5tYGSP8hmkpfNmosFtWTNvLZzFreS8ze1pUUUO6pG7ZfBDiSLkHN3nfR6LVpV3egWHofK60a7OkId9e0Ijk8wuU9p7PEpBXQI8DXeZ9WiutPuJA=", "expiration": 1734970968 } } } } }, ]

Please, see related discussion in slack.

src/libs/actions/CompanyCards.ts

VickyStash · 2024-12-24T10:11:18Z

I'm going to be OOO Dec 25 - Dec 29 🎄

DylanDylann · 2024-12-24T10:14:43Z

I will try to complete my review today

DylanDylann · 2024-12-24T11:20:10Z

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-12-24.at.23.11.50.mov

Android: mWeb Chrome

Screen.Recording.2024-12-24.at.23.13.13.mov

iOS: Native

Screen.Recording.2024-12-24.at.23.09.54.mov

iOS: mWeb Safari

Screen.Recording.2024-12-24.at.23.14.24.mov

MacOS: Chrome / Safari

Screen.Recording.2024-12-24.at.23.08.38.mov

MacOS: Desktop

Screen.Recording.2024-12-24.at.23.10.43.mov

mountiny

Thanks! Only one NAB you can address later

mountiny · 2024-12-26T22:23:10Z

src/libs/actions/CompanyCards.ts

+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`,
+        value: feedToOpen ?? null,
+    });


NAB: no need to push this right? we can just add it to the array above

OSBotify · 2024-12-26T22:47:49Z

✋ 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 · 2024-12-31T22:18:01Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.80-1 🚀

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

github-actions · 2025-01-06T18:17:34Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.80-6 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

joekaufmanexpensify · 2025-01-06T19:52:31Z

Tested this with both a direct and custom feed and confirmed both worked as expected!

aimane-chnaif · 2025-12-03T17:41:37Z

src/libs/actions/CompanyCards.ts

+    const successFeedUpdates = {[bankName]: null};
+    const failureFeedUpdates = {[bankName]: {pendingAction: null, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')}};
+    const optimisticCardUpdates = Object.fromEntries(cardIDs.map((cardID) => [cardID, {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}]));
+    const successAndFailureCardUpdates = Object.fromEntries(cardIDs.map((cardID) => [cardID, {pendingAction: null}]));


We should set null instead of {pendingAction: null} for optimistic success data.
More details: #74301 (comment)

Improve feed removal offline

daf0d1b

VickyStash mentioned this pull request Dec 20, 2024

[HOLD for payment 2025-01-13] Deleting a custom card feed while offline behaves unexpectedly #54379

Closed

8 tasks

VickyStash added 8 commits December 23, 2024 10:33

Merge branch 'refs/heads/main' into VickyStash/bugfix/54379-delete-fe…

2f4ece3

…ed-offline

Fix lint errors

c3accb3

Fix tests

7d7324f

Code improvement

470b835

Fix lint

b75a4cf

Improve getCompanyFeeds function and get rid of removeExpensifyCardFr…

785eccd

…omCompanyCards

Lint fixes

75299dc

Buf fix

d11c081

VickyStash changed the title ~~[WIP] Improve feed removal flow offline~~ Improve feed removal flow offline Dec 23, 2024

VickyStash marked this pull request as ready for review December 23, 2024 16:26

VickyStash requested a review from a team as a code owner December 23, 2024 16:26

melvin-bot bot requested review from DylanDylann and removed request for a team December 23, 2024 16:27

DylanDylann reviewed Dec 24, 2024

View reviewed changes

DylanDylann approved these changes Dec 24, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny December 24, 2024 16:16

mountiny assigned VickyStash Dec 26, 2024

mountiny added the InternalQA This pull request required internal QA label Dec 26, 2024

mountiny approved these changes Dec 26, 2024

View reviewed changes

mountiny merged commit cdefab1 into Expensify:main Dec 26, 2024

github-actions bot mentioned this pull request Dec 31, 2024

Deploy Checklist: New Expensify 2024-12-31 #54686

Closed

68 tasks

aimane-chnaif reviewed Dec 3, 2025

View reviewed changes

Conversation

VickyStash commented Dec 20, 2024 • 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

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Dec 23, 2024

Uh oh!

DylanDylann Dec 24, 2024

Choose a reason for hiding this comment

Uh oh!

VickyStash Dec 24, 2024

Choose a reason for hiding this comment

Uh oh!

DylanDylann Dec 24, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

VickyStash commented Dec 24, 2024

Uh oh!

DylanDylann commented Dec 24, 2024

Uh oh!

DylanDylann commented Dec 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Dec 26, 2024

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Dec 26, 2024

Uh oh!

github-actions bot commented Dec 31, 2024

Uh oh!

github-actions bot commented Jan 6, 2025

Uh oh!

joekaufmanexpensify commented Jan 6, 2025

Uh oh!

aimane-chnaif Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

VickyStash commented Dec 20, 2024 •

edited

Loading

DylanDylann commented Dec 24, 2024 •

edited

Loading