Skip to content

Fix : Assign new cards - Assign new cards tab with infinite spinner #85717

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.

Sign up for GitHub

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

Merged
carlosmiceli merged 2 commits into from
Mar 19, 2026
+13 −7
Merged

Fix : Assign new cards - Assign new cards tab with infinite spinner #85717

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc3ff60
Refactor useBankConnection to replace refreshSuccessHandled ref with …
fedirjh Mar 18, 2026
2dc15c0
Merge branch 'Expensify:main' into fix-spinner-assign-card
fedirjh Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/pages/workspace/companyCards/BankConnection/useBankConnection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {useCallback, useEffect, useMemo, useRef} from 'react';
import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
import useCardFeeds from '@hooks/useCardFeeds';
import useImportPlaidAccounts from '@hooks/useImportPlaidAccounts';
import useIsBlockedToAddFeed from '@hooks/useIsBlockedToAddFeed';
Expand Down Expand Up @@ -51,7 +51,7 @@ export default function useBankConnection({
const {isBlockedToAddNewFeeds, isAllFeedsResultLoading} = useIsBlockedToAddFeed(policyID);
const {isFeedConnectionBroken} = useUpdateFeedBrokenConnection({policyID, feed});
const shouldBlockWindowOpen = useRef(false);
const refreshSuccessHandled = useRef(false);
const [refreshSuccessHandled, setRefreshSuccessHandled] = useState(false);

const addNewCardData = addNewCard?.data;
const bankName = feed ? getBankName(getCompanyCardFeed(feed)) : (bankNameFromRoute ?? addNewCardData?.plaidConnectedFeed ?? addNewCardData?.selectedBank);
Expand All @@ -73,8 +73,8 @@ export default function useBankConnection({
if (!isRefreshConnectionFlow || !feed || !hasConnectionSource || shouldWaitForData) {
return false;
}
return !!prevIsFeedExpired && !isFeedExpired && !isFeedConnectionBroken;
}, [isRefreshConnectionFlow, feed, hasConnectionSource, shouldWaitForData, prevIsFeedExpired, isFeedExpired, isFeedConnectionBroken]);
return !isFeedExpired && !isFeedConnectionBroken && (!!prevIsFeedExpired || refreshSuccessHandled);
}, [isRefreshConnectionFlow, feed, hasConnectionSource, shouldWaitForData, prevIsFeedExpired, isFeedExpired, isFeedConnectionBroken, refreshSuccessHandled]);

const fallbackNavigation = useCallback(() => {
Navigation.goBack(policyID ? ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID) : undefined);
Expand Down Expand Up @@ -114,12 +114,12 @@ export default function useBankConnection({
}, [shouldOpenWindow, onBackButtonPress]);

useEffect(() => {
if (!isRefreshComplete || refreshSuccessHandled.current) {
if (!isRefreshComplete || refreshSuccessHandled) {
return;
}
refreshSuccessHandled.current = true;
setRefreshSuccessHandled(true);
onSuccess?.();
}, [isRefreshComplete, onSuccess]);
}, [isRefreshComplete, onSuccess, refreshSuccessHandled]);

useEffect(() => {
if (!policyID || !isBlockedToAddNewFeeds || feed) {
Expand Down Expand Up @@ -147,6 +147,11 @@ export default function useBankConnection({
}
if (!isRefreshConnectionFlow) {
handleSuccess();
return;
}

if (!refreshSuccessHandled) {
setRefreshSuccessHandled(true);
}
return;
}
Expand Down Expand Up @@ -191,6 +196,7 @@ export default function useBankConnection({
handleFailure,
shouldOpenWindow,
isRefreshConnectionFlow,
refreshSuccessHandled,
]);

return {
Expand Down
Loading