Skip to content

Commit 8dac743

Browse files
authored
Revert "fix: show ECard link when login"
1 parent fdf8f5e commit 8dac743

3 files changed

Lines changed: 6 additions & 35 deletions

File tree

src/libs/ReportActionsUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2857,7 +2857,7 @@ function getCardIssuedMessage({
28572857
const assignee = shouldRenderHTML ? `<mention-user accountID="${assigneeAccountID}"/>` : Parser.htmlToText(`<mention-user accountID="${assigneeAccountID}"/>`);
28582858
const navigateRoute = isPolicyAdmin ? ROUTES.EXPENSIFY_CARD_DETAILS.getRoute(policyID, String(cardID)) : ROUTES.SETTINGS_DOMAIN_CARD_DETAIL.getRoute(String(cardID));
28592859
const expensifyCardLink =
2860-
shouldRenderHTML && !!cardID ? `<a href='${environmentURL}/${navigateRoute}'>${translateLocal('cardPage.expensifyCard')}</a>` : translateLocal('cardPage.expensifyCard');
2860+
shouldRenderHTML && !!card ? `<a href='${environmentURL}/${navigateRoute}'>${translateLocal('cardPage.expensifyCard')}</a>` : translateLocal('cardPage.expensifyCard');
28612861
const isAssigneeCurrentUser = currentUserAccountID === assigneeAccountID;
28622862
const companyCardLink =
28632863
shouldRenderHTML && isAssigneeCurrentUser

src/libs/actions/Card.ts

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -832,43 +832,19 @@ function issueExpensifyCard(domainAccountID: number, policyID: string | undefine
832832
);
833833
}
834834

835-
function openCardDetailsPage(cardID: number, fundID: number) {
835+
function openCardDetailsPage(cardID: number) {
836836
const authToken = NetworkStore.getAuthToken();
837837

838838
if (!authToken) {
839839
return;
840840
}
841841

842-
const optimisticData: OnyxUpdate[] = [
843-
{
844-
onyxMethod: Onyx.METHOD.MERGE,
845-
key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${fundID}_${CONST.EXPENSIFY_CARD.BANK}`,
846-
value: {
847-
[cardID]: {
848-
isLoading: true,
849-
},
850-
},
851-
},
852-
];
853-
854-
const finallyData: OnyxUpdate[] = [
855-
{
856-
onyxMethod: Onyx.METHOD.MERGE,
857-
key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${fundID}_${CONST.EXPENSIFY_CARD.BANK}`,
858-
value: {
859-
[cardID]: {
860-
isLoading: false,
861-
},
862-
},
863-
},
864-
];
865-
866842
const parameters: OpenCardDetailsPageParams = {
867843
authToken,
868844
cardID,
869845
};
870846

871-
API.read(READ_COMMANDS.OPEN_CARD_DETAILS_PAGE, parameters, {optimisticData, finallyData});
847+
API.read(READ_COMMANDS.OPEN_CARD_DETAILS_PAGE, parameters);
872848
}
873849

874850
function toggleContinuousReconciliation(workspaceAccountID: number, shouldUseContinuousReconciliation: boolean, connectionName: ConnectionName, oldConnectionName?: ConnectionName) {

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import ExpensifyCardImage from '@assets/images/expensify-card.svg';
44
import Badge from '@components/Badge';
55
import ConfirmModal from '@components/ConfirmModal';
66
import DecisionModal from '@components/DecisionModal';
7-
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
87
import HeaderWithBackButton from '@components/HeaderWithBackButton';
98
import {FallbackAvatar} from '@components/Icon/Expensicons';
109
import * as Expensicons from '@components/Icon/Expensicons';
@@ -71,8 +70,8 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
7170
const translationForLimitType = getTranslationKeyForLimitType(card?.nameValuePairs?.limitType);
7271

7372
const fetchCardDetails = useCallback(() => {
74-
openCardDetailsPage(Number(cardID), defaultFundID);
75-
}, [cardID, defaultFundID]);
73+
openCardDetailsPage(Number(cardID));
74+
}, [cardID]);
7675

7776
useEffect(() => {
7877
if (!isDeleted) {
@@ -95,11 +94,7 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
9594
});
9695
};
9796

98-
if (card?.isLoading && !card?.cardID) {
99-
return <FullScreenLoadingIndicator />;
100-
}
101-
102-
if (!card?.cardID && !isLoadingOnyxValue(cardsListResult)) {
97+
if (!card && !isLoadingOnyxValue(cardsListResult)) {
10398
return <NotFoundPage />;
10499
}
105100

0 commit comments

Comments
 (0)