Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/hooks/useAssignCard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '@libs/CardUtils';
import Navigation from '@libs/Navigation/Navigation';
import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
import {getDomainNameForPolicy, isDeletedPolicyEmployee} from '@libs/PolicyUtils';
import {getDomainNameForPolicy, getMemberAccountIDsForWorkspace, isDeletedPolicyEmployee} from '@libs/PolicyUtils';
import {clearAddNewCardFlow, clearAssignCardStepAndData, openPolicyCompanyCardsPage, setAddNewCompanyCardStepAndData, setAssignCardStepAndData} from '@userActions/CompanyCards';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
Expand Down Expand Up @@ -55,7 +55,8 @@ function useAssignCard({feedName, policyID, setShouldShowOfflineModal}: UseAssig
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, selectedFeedData);

const fetchCompanyCards = () => {
openPolicyCompanyCardsPage(policyID, domainOrWorkspaceAccountID, translate);
const emailList = Object.keys(getMemberAccountIDsForWorkspace(policy?.employeeList));
openPolicyCompanyCardsPage(policyID, domainOrWorkspaceAccountID, emailList, translate);
};

const {isOffline} = useNetwork({onReconnect: fetchCompanyCards});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
type OpenPolicyExpensifyCardsPageParams = {
policyID: string;
emailList?: string;
};

export default OpenPolicyExpensifyCardsPageParams;
3 changes: 2 additions & 1 deletion src/libs/actions/CompanyCards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ function clearCompanyCardErrorField(domainOrWorkspaceAccountID: number, cardID:
});
}

function openPolicyCompanyCardsPage(policyID: string, domainOrWorkspaceAccountID: number, translate: LocaleContextProps['translate']) {
function openPolicyCompanyCardsPage(policyID: string, domainOrWorkspaceAccountID: number, emailList: string[], translate: LocaleContextProps['translate']) {
const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER>> = [
{
onyxMethod: Onyx.METHOD.MERGE,
Expand Down Expand Up @@ -851,6 +851,7 @@ function openPolicyCompanyCardsPage(policyID: string, domainOrWorkspaceAccountID

const params: OpenPolicyExpensifyCardsPageParams = {
policyID,
emailList: JSON.stringify(emailList),
};

API.read(READ_COMMANDS.OPEN_POLICY_COMPANY_CARDS_PAGE, params, {optimisticData, successData, failureData});
Expand Down
12 changes: 5 additions & 7 deletions src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import usePolicy from '@hooks/usePolicy';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import {openWorkspaceMembersPage} from '@libs/actions/Policy/Member';
import {getDomainOrWorkspaceAccountID} from '@libs/CardUtils';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
Expand Down Expand Up @@ -50,8 +49,9 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
return;
}

openPolicyCompanyCardsPage(policyID, domainOrWorkspaceAccountID, translate);
}, [domainOrWorkspaceAccountID, policyID, translate]);
const emailList = Object.keys(getMemberAccountIDsForWorkspace(policy?.employeeList));
openPolicyCompanyCardsPage(policyID, domainOrWorkspaceAccountID, emailList, translate);
}, [domainOrWorkspaceAccountID, policyID, policy?.employeeList, translate]);

const {isOffline} = useNetwork({
onReconnect: loadPolicyCompanyCardsPage,
Expand All @@ -65,17 +65,15 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
}

loadPolicyCompanyCardsPage();
}, [policyID, domainOrWorkspaceAccountID, loadPolicyCompanyCardsPage, isOffline]);
}, [loadPolicyCompanyCardsPage, isOffline]);

const loadPolicyCompanyCardsFeed = useCallback(() => {
if (isLoading || !bankName || isFeedPending) {
return;
}

const clientMemberEmails = Object.keys(getMemberAccountIDsForWorkspace(policy?.employeeList));
openWorkspaceMembersPage(policyID, clientMemberEmails);
openPolicyCompanyCardsFeed(domainOrWorkspaceAccountID, policyID, bankName, translate);
Comment thread
fedirjh marked this conversation as resolved.
Resolved
}, [bankName, domainOrWorkspaceAccountID, isFeedPending, isLoading, policy?.employeeList, policyID, translate]);
}, [bankName, domainOrWorkspaceAccountID, isFeedPending, isLoading, policyID, translate]);

useEffect(() => {
loadPolicyCompanyCardsFeed();
Expand Down
Loading