-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Fix company cards page loading #60629
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
Fix company cards page loading #60629
Conversation
@rushatgabhane 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] |
cc @DylanDylann as he was a reviewer of the initial PR. |
Reviewer Checklist
Screenshots/VideosAndroid: NativeScreen.Recording.2025-04-23.at.15.01.13.movAndroid: mWeb ChromeScreen.Recording.2025-04-23.at.14.37.18.moviOS: NativeiOS: mWeb SafariScreen.Recording.2025-04-23.at.14.37.02.movMacOS: Chrome / SafariScreen.Recording.2025-04-23.at.14.43.34.movMacOS: DesktopScreen.Recording.2025-04-23.at.14.43.48.mov |
@@ -58,7 +58,7 @@ const useCardFeeds = (policyID: string | undefined): [CardFeeds | undefined, Res | |||
|
|||
return acc; | |||
}, | |||
{settings: {companyCards, companyCardNicknames, oAuthAccountDetails}}, | |||
{settings: {companyCards, companyCardNicknames, oAuthAccountDetails}, isLoading: !defaultFeed || defaultFeed?.isLoading}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
{settings: {companyCards, companyCardNicknames, oAuthAccountDetails}, isLoading: !defaultFeed || defaultFeed?.isLoading}, | |
{settings: {companyCards, companyCardNicknames, oAuthAccountDetails}, isLoading: isEmptyObject(defaultFeed) || defaultFeed?.isLoading}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@VickyStash I think we should use isEmptyObject check in this case
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@DylanDylann If the user has only domain feeds, the workspace feed (default) will be returned as an empty object.
So, checking for an empty object can break the logic, I believe.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ahh great
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by https://github.com/puneetlath in version: 9.1.32-0 🚀
|
🚀 Deployed to production by https://github.com/thienlnam in version: 9.1.32-8 🚀
|
Explanation of Change
This PR fixes small regression from #60261
Fixed Issues
$ #60533
PROPOSAL: N/A
Tests
Offline tests
N/A
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Same, as in the Tests section.
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
android.mp4
Android: mWeb Chrome
android_web.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
ios_web.mp4
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mp4