Skip to content
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

Jump to bottom

fix: incorrect message displayed when deleting workspace #51444

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: incorrect message displayed when deleting workspace #51444

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
791649a
fix: incorrect message displayed when deleting workspace
truph01 Oct 24, 2024
fca04a6
merge main
truph01 Nov 5, 2024
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
6 changes: 5 additions & 1 deletion src/pages/workspace/WorkspacesListPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,11 @@
const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyIDToDelete ?? '-1');
const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
const hasCardFeedOrExpensifyCard = !isEmptyObject(cardFeeds) || !isEmptyObject(cardsList);
const hasCardFeedOrExpensifyCard =
!isEmptyObject(cardFeeds) ||
!isEmptyObject(cardsList) ||
((PolicyUtils.getPolicy(policyIDToDelete)?.areExpensifyCardsEnabled || PolicyUtils.getPolicy(policyIDToDelete)?.areCompanyCardsEnabled) &&

Check failure on line 130 in src/pages/workspace/WorkspacesListPage.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Prefer using nullish coalescing operator (`??`) instead of a logical or (`||`), as it is a safer operator

Check failure on line 130 in src/pages/workspace/WorkspacesListPage.tsx

View workflow job for this annotation

GitHub Actions / ESLint check 

Prefer using nullish coalescing operator (`??`) instead of a logical or (`||`), as it is a safer operator
PolicyUtils.getPolicy(policyIDToDelete)?.workspaceAccountID);

const confirmDeleteAndHideModal = () => {
if (!policyIDToDelete || !policyNameToDelete) {
Expand Down
Loading