fix: refactor modals part 3 (VacationDelegatePage, ContactMethodDetailsPage, WalletPage, VisibilityPage) #79553
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,15 @@ | ||
| import {useRoute} from '@react-navigation/native'; | ||
| import React, {useMemo} from 'react'; | ||
| import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; | ||
| import HeaderWithBackButton from '@components/HeaderWithBackButton'; | ||
| import {ModalActions} from '@components/Modal/Global/ModalContext'; | ||
| import ScreenWrapper from '@components/ScreenWrapper'; | ||
| import SelectionList from '@components/SelectionList'; | ||
| import RadioListItem from '@components/SelectionList/ListItem/RadioListItem'; | ||
| import useConfirmModal from '@hooks/useConfirmModal'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useReportIsArchived from '@hooks/useReportIsArchived'; | ||
| import setNavigationActionToMicrotaskQueue from '@libs/Navigation/helpers/setNavigationActionToMicrotaskQueue'; | ||
| import type {PlatformStackRouteProp, PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; | ||
| import type {ReportSettingsNavigatorParamList} from '@libs/Navigation/types'; | ||
| import {goBackToDetailsPage, isArchivedNonExpenseReport} from '@libs/ReportUtils'; | ||
|
|
@@ -22,12 +24,12 @@ type VisibilityProps = WithReportOrNotFoundProps & PlatformStackScreenProps<Repo | |
|
|
||
| function VisibilityPage({report}: VisibilityProps) { | ||
| const route = useRoute<PlatformStackRouteProp<ReportSettingsNavigatorParamList, typeof SCREENS.REPORT_SETTINGS.VISIBILITY>>(); | ||
| const isReportArchived = useReportIsArchived(report?.reportID); | ||
| const shouldDisableVisibility = isArchivedNonExpenseReport(report, isReportArchived); | ||
| const {translate} = useLocalize(); | ||
|
|
||
| const {showConfirmModal} = useConfirmModal(); | ||
|
|
||
| const visibilityOptions = useMemo( | ||
| () => | ||
| Object.values(CONST.REPORT.VISIBILITY) | ||
|
|
@@ -42,28 +44,32 @@ function VisibilityPage({report}: VisibilityProps) { | |
| [translate, report?.visibility], | ||
| ); | ||
|
|
||
| const goBack = () => { | ||
| goBackToDetailsPage(report, route.params.backTo); | ||
| }; | ||
|
|
||
| const changeVisibility = (newVisibility: RoomVisibility) => { | ||
| if (!report) { | ||
| return; | ||
| } | ||
| updateRoomVisibility(report.reportID, report.visibility, newVisibility); | ||
| setNavigationActionToMicrotaskQueue(goBack); | ||
| }; | ||
|
|
||
| const showPublicVisibilityModal = async () => { | ||
|
Contributor
There was a problem hiding this comment. ❌ CONSISTENCY-1 (docs)The Looking at the old code, Suggested fix: const changeVisibility = useCallback(
(newVisibility: RoomVisibility) => {
if (!report) {
return;
}
updateRoomVisibility(report.reportID, report.visibility, newVisibility);
goBack();
},
[report, goBack],
); |
||
| const result = await showConfirmModal({ | ||
| title: translate('common.areYouSure'), | ||
| prompt: translate('newRoomPage.publicDescription'), | ||
| confirmText: translate('common.yes'), | ||
| cancelText: translate('common.no'), | ||
| shouldShowCancelButton: true, | ||
| danger: true, | ||
| }); | ||
| if (result.action !== ModalActions.CONFIRM) { | ||
| return; | ||
| } | ||
| changeVisibility(CONST.REPORT.VISIBILITY.PUBLIC); | ||
| }; | ||
|
|
||
| return ( | ||
| <ScreenWrapper | ||
|
|
@@ -80,7 +86,7 @@ function VisibilityPage({report}: VisibilityProps) { | |
| data={visibilityOptions} | ||
| onSelectRow={(option) => { | ||
| if (option.value === CONST.REPORT.VISIBILITY.PUBLIC) { | ||
| showPublicVisibilityModal(); | ||
| return; | ||
| } | ||
| changeVisibility(option.value); | ||
|
|
@@ -89,26 +95,6 @@ function VisibilityPage({report}: VisibilityProps) { | |
| initiallyFocusedItemKey={visibilityOptions.find((visibility) => visibility.isSelected)?.keyForList} | ||
| ListItem={RadioListItem} | ||
| /> | ||
|
truph01 marked this conversation as resolved.
|
||
| </FullPageNotFoundView> | ||
| </ScreenWrapper> | ||
| ); | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NAB this component compiles with React Compiler, so
useCallbackisn't needed