-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #56231 from cretadn22/use-ValidateCodeActionModal
Update delegate flow to use modal
- Loading branch information
Showing
10 changed files
with
86 additions
and
102 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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
64 changes: 64 additions & 0 deletions
64
src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodeModal.tsx
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import React, {useEffect} from 'react'; | ||
| import {useOnyx} from 'react-native-onyx'; | ||
| import type {ValueOf} from 'type-fest'; | ||
| import ValidateCodeActionModal from '@components/ValidateCodeActionModal'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import {clearDelegateErrorsByField, updateDelegateRole} from '@libs/actions/Delegate'; | ||
| import {requestValidateCodeAction} from '@libs/actions/User'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import type CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import ROUTES from '@src/ROUTES'; | ||
|
|
||
| type UpdateDelegateMagicCodeModalProps = { | ||
| login: string; | ||
| role: ValueOf<typeof CONST.DELEGATE_ROLE>; | ||
| isValidateCodeActionModalVisible: boolean; | ||
| onClose?: () => void; | ||
| }; | ||
| function UpdateDelegateMagicCodeModal({login, role, isValidateCodeActionModalVisible, onClose}: UpdateDelegateMagicCodeModalProps) { | ||
| const {translate} = useLocalize(); | ||
| const [account] = useOnyx(ONYXKEYS.ACCOUNT); | ||
| const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE); | ||
| const currentDelegate = account?.delegatedAccess?.delegates?.find((d) => d.email === login); | ||
| const updateDelegateErrors = account?.delegatedAccess?.errorFields?.updateDelegateRole?.[login]; | ||
|
|
||
| useEffect(() => { | ||
| if (currentDelegate?.role !== role || !!currentDelegate.pendingFields?.role || !!updateDelegateErrors) { | ||
| return; | ||
| } | ||
|
|
||
| // Dismiss modal on successful magic code verification | ||
| Navigation.navigate(ROUTES.SETTINGS_SECURITY); | ||
| }, [login, currentDelegate, role, updateDelegateErrors]); | ||
|
|
||
| const onBackButtonPress = () => { | ||
| onClose?.(); | ||
| }; | ||
|
|
||
| const clearError = () => { | ||
| if (!updateDelegateErrors) { | ||
| return; | ||
| } | ||
| clearDelegateErrorsByField(currentDelegate?.email ?? '', 'updateDelegateRole'); | ||
| }; | ||
|
|
||
| return ( | ||
| <ValidateCodeActionModal | ||
| clearError={clearError} | ||
| onClose={onBackButtonPress} | ||
| isLoading={currentDelegate?.isLoading} | ||
| validateError={updateDelegateErrors} | ||
| isVisible={isValidateCodeActionModalVisible} | ||
| title={translate('delegate.makeSureItIsYou')} | ||
| sendValidateCode={() => requestValidateCodeAction()} | ||
| hasMagicCodeBeenSent={validateCodeAction?.validateCodeSent} | ||
| handleSubmitForm={(validateCode) => updateDelegateRole(login, role, validateCode)} | ||
| descriptionPrimary={translate('delegate.enterMagicCode', {contactMethod: account?.primaryLogin ?? ''})} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| UpdateDelegateMagicCodeModal.displayName = 'UpdateDelegateMagicCodeModal'; | ||
|
|
||
| export default UpdateDelegateMagicCodeModal; |
75 changes: 0 additions & 75 deletions
75
src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx
This file was deleted.
Oops, something went wrong.
This file contains 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