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

fix: Import - Blank RHP opens when pressing ESC key after importing spreadsheet. #57502

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+8 −10
Open

fix: Import - Blank RHP opens when pressing ESC key after importing spreadsheet. #57502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d29e20f
fix: Import - Blank RHP opens when pressing ESC key after importing s…
Krishna2323 Feb 26, 2025
65b6673
fix ESlint.
Krishna2323 Feb 26, 2025
542f97d
Merge branch 'Expensify:main' into krishna2323/issue/56936
Krishna2323 Feb 27, 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
7 changes: 3 additions & 4 deletions src/pages/workspace/categories/ImportedCategoriesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import {findDuplicate, generateColumnNames} from '@libs/importSpreadsheetUtils';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
import {isControlPolicy} from '@libs/PolicyUtils';
import * as PolicyUtils from '@libs/PolicyUtils';
import {hasAccountingConnections as hasAccountingConnectionsPolicyUtils, isControlPolicy} from '@libs/PolicyUtils';
import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
Expand Down Expand Up @@ -116,7 +115,7 @@ function ImportedCategoriesPage({route}: ImportedCategoriesPageProps) {
}
}, [validate, spreadsheet, containsHeader, policyID, policyCategories]);

const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
const hasAccountingConnections = hasAccountingConnectionsPolicyUtils(policy);
if (hasAccountingConnections) {
return <NotFoundPage />;
}
Expand All @@ -129,7 +128,7 @@ function ImportedCategoriesPage({route}: ImportedCategoriesPageProps) {
const closeImportPageAndModal = () => {
setIsImportingCategories(false);
closeImportPage();
Navigation.navigate(isQuickSettingsFlow ? ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(policyID, backTo) : ROUTES.WORKSPACE_CATEGORIES.getRoute(policyID));
Navigation.goBack(isQuickSettingsFlow ? ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(policyID, backTo) : ROUTES.WORKSPACE_CATEGORIES.getRoute(policyID));
};

return (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/members/ImportedMembersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function ImportedMembersPage({route}: ImportedMembersPageProps) {
const closeImportPageAndModal = () => {
setIsImporting(false);
closeImportPage();
Navigation.navigate(ROUTES.WORKSPACE_MEMBERS.getRoute(policyID));
Navigation.goBack(ROUTES.WORKSPACE_MEMBERS.getRoute(policyID));
};

return (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/perDiem/ImportedPerDiemPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ function ImportedPerDiemPage({route}: ImportedPerDiemPageProps) {
const closeImportPageAndModal = () => {
setIsImportingPerDiemRates(false);
closeImportPage();
Navigation.navigate(ROUTES.WORKSPACE_PER_DIEM.getRoute(policyID));
Navigation.goBack(ROUTES.WORKSPACE_PER_DIEM.getRoute(policyID));
};

return (
Expand Down
7 changes: 3 additions & 4 deletions src/pages/workspace/tags/ImportedTagsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import {findDuplicate, generateColumnNames} from '@libs/importSpreadsheetUtils';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
import * as PolicyUtils from '@libs/PolicyUtils';
import {isControlPolicy} from '@libs/PolicyUtils';
import {getTagLists, isControlPolicy} from '@libs/PolicyUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
Expand All @@ -32,7 +31,7 @@ function ImportedTagsPage({route}: ImportedTagsPageProps) {
const policyID = route.params.policyID;
const backTo = route.params.backTo;
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);
const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
const policyTagLists = useMemo(() => getTagLists(policyTags), [policyTags]);
const policy = usePolicy(policyID);
const columnNames = generateColumnNames(spreadsheet?.data?.length ?? 0);
const isQuickSettingsFlow = !!backTo;
Expand Down Expand Up @@ -118,7 +117,7 @@ function ImportedTagsPage({route}: ImportedTagsPageProps) {
const closeImportPageAndModal = () => {
setIsImportingTags(false);
closeImportPage();
Navigation.navigate(isQuickSettingsFlow ? ROUTES.SETTINGS_TAGS_ROOT.getRoute(policyID, backTo) : ROUTES.WORKSPACE_TAGS.getRoute(policyID));
Navigation.goBack(isQuickSettingsFlow ? ROUTES.SETTINGS_TAGS_ROOT.getRoute(policyID, backTo) : ROUTES.WORKSPACE_TAGS.getRoute(policyID));
};

return (
Expand Down
Loading