Skip to content

fix: change the condition to render Expensify card page content correctly #56331

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
merged 3 commits into from
Feb 6, 2025
Merged

fix: change the condition to render Expensify card page content correctly #56331

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2152bc7
fix: change the condition to render expensify card page content corre…
koko57 Feb 4, 2025
96a69ad
fix: eslint
koko57 Feb 4, 2025
4f05bb9
fix: remove fallback number
koko57 Feb 4, 2025
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
18 changes: 9 additions & 9 deletions src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
import * as PolicyUtils from '@libs/PolicyUtils';
import {getWorkspaceAccountID} from '@libs/PolicyUtils';
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
import * as Policy from '@userActions/Policy/Policy';
import {openPolicyExpensifyCardsPage} from '@userActions/Policy/Policy';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';
Expand All @@ -19,39 +19,39 @@ import WorkspaceExpensifyCardPageEmptyState from './WorkspaceExpensifyCardPageEm
type WorkspaceExpensifyCardPageProps = PlatformStackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD>;

function WorkspaceExpensifyCardPage({route}: WorkspaceExpensifyCardPageProps) {
const policyID = route.params.policyID ?? '-1';
const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
const policyID = route.params.policyID ?? CONST.DEFAULT_NUMBER_ID;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@koko57 policyID is a string , i am not sure about assigning it an integer value 😕

const workspaceAccountID = getWorkspaceAccountID(policyID);

const styles = useThemeStyles();
const theme = useTheme();
const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);

const fetchExpensifyCards = useCallback(() => {
Policy.openPolicyExpensifyCardsPage(policyID, workspaceAccountID);
openPolicyExpensifyCardsPage(policyID, workspaceAccountID);
}, [policyID, workspaceAccountID]);

const {isOffline} = useNetwork({onReconnect: fetchExpensifyCards});

useFocusEffect(fetchExpensifyCards);

const paymentBankAccountID = cardSettings?.paymentBankAccountID ?? 0;
const isLoading = !isOffline && (!cardSettings || (cardSettings.isLoading && !cardsList));
const paymentBankAccountID = cardSettings?.paymentBankAccountID ?? CONST.DEFAULT_NUMBER_ID;
const isLoading = !isOffline && (!cardSettings || cardSettings.isLoading);

return (
<AccessOrNotFoundWrapper
accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
policyID={route.params.policyID}
featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
>
{!!isLoading && (
{!!isLoading && !paymentBankAccountID && (
<ActivityIndicator
size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
style={styles.flex1}
color={theme.spinner}
/>
)}
{!!paymentBankAccountID && !isLoading && (
{!!paymentBankAccountID && (
<WorkspaceExpensifyCardListPage
cardsList={cardsList}
route={route}
Expand Down
Loading