Skip to content

fix: Not here page appears briefly after deleting the list value #48045

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
mountiny merged 4 commits into from
Sep 10, 2024
Merged

fix: Not here page appears briefly after deleting the list value #48045

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bc06a1
fix: Not here page appears briefly after deleting the list value
nkdengineer Aug 27, 2024
4147864
Merge branch 'main' into fix/44815
nkdengineer Sep 5, 2024
7bde267
fix: add fallback title
nkdengineer Sep 5, 2024
fdc745f
fix: add fallback to header
nkdengineer Sep 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
10 changes: 5 additions & 5 deletions src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
import Switch from '@components/Switch';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import usePrevious from '@hooks/usePrevious';
import useThemeStyles from '@hooks/useThemeStyles';
import * as ReportField from '@libs/actions/Policy/ReportField';
import Navigation from '@libs/Navigation/Navigation';
Expand Down Expand Up @@ -58,18 +59,17 @@ function ReportFieldsValueSettingsPage({
}, [formDraft?.disabledListValues, formDraft?.listValues, policy?.fieldList, reportFieldID, valueIndex]);

const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
const oldValueName = usePrevious(currentValueName);
Comment thread
nkdengineer marked this conversation as resolved.

if (!currentValueName || hasAccountingConnections) {
if ((!currentValueName && !oldValueName) || hasAccountingConnections) {
return <NotFoundPage />;
}

const deleteListValueAndHideModal = () => {
if (reportFieldID) {
ReportField.removeReportFieldListValue(policyID, reportFieldID, [valueIndex]);
} else {
ReportField.deleteReportFieldsListValue([valueIndex]);
}

setIsDeleteTagModalOpen(false);
Navigation.goBack();
};
Expand Down Expand Up @@ -99,7 +99,7 @@ function ReportFieldsValueSettingsPage({
testID={ReportFieldsValueSettingsPage.displayName}
>
<HeaderWithBackButton
title={currentValueName}
title={currentValueName ?? oldValueName}
shouldSetModalVisibility={false}
/>
<ConfirmModal
Expand All @@ -125,7 +125,7 @@ function ReportFieldsValueSettingsPage({
</View>
</View>
<MenuItemWithTopDescription
title={currentValueName}
title={currentValueName ?? oldValueName}
description={translate('common.value')}
shouldShowRightIcon={!reportFieldID}
interactive={!reportFieldID}
Expand Down