feat(solana): update add account from opt in solana #31387
+216
−43
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
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 |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| import React from 'react'; | ||
|
There was a problem hiding this comment. Doesnt this already exist as There was a problem hiding this comment. Actually this one is using |
||
| import { useSelector } from 'react-redux'; | ||
| import { | ||
| Box, | ||
| Modal, | ||
| ModalOverlay, | ||
| ModalContent, | ||
| ModalHeader, | ||
| } from '../../component-library'; | ||
| import { | ||
| Display, | ||
| FlexDirection, | ||
| } from '../../../helpers/constants/design-system'; | ||
| import { useI18nContext } from '../../../hooks/useI18nContext'; | ||
| import { getMetaMaskKeyrings } from '../../../selectors'; | ||
| import { CreateSnapAccount } from '../create-snap-account'; | ||
| import { SrpList } from '../multi-srp/srp-list'; | ||
| import { WalletClientType } from '../../../hooks/accounts/useMultichainWalletSnapClient'; | ||
| import { MultichainNetworks } from '../../../../shared/constants/multichain/networks'; | ||
|
|
||
| type CreateSolanaAccountModalProps = { | ||
| onClose: () => void; | ||
| }; | ||
|
|
||
| export const CreateSolanaAccountModal = ({ | ||
| onClose, | ||
| }: CreateSolanaAccountModalProps) => { | ||
| const t = useI18nContext(); | ||
| const [primaryKeyring] = useSelector(getMetaMaskKeyrings); | ||
| const [showSrpSelection, setShowSrpSelection] = React.useState(false); | ||
| const [showCreateAccount, setShowCreateAccount] = React.useState(true); | ||
| const [selectedKeyringId, setSelectedKeyringId] = React.useState( | ||
| primaryKeyring.metadata.id, | ||
| ); | ||
|
|
||
| if (showCreateAccount) { | ||
| return ( | ||
| <Modal isOpen onClose={onClose}> | ||
| <ModalOverlay /> | ||
| <ModalContent | ||
| className="create-solana-account-modal" | ||
| data-testid="create-solana-account-modal" | ||
| modalDialogProps={{ | ||
| className: 'create-solana-account-modal__dialog', | ||
| padding: 0, | ||
| display: Display.Flex, | ||
| flexDirection: FlexDirection.Column, | ||
| }} | ||
| > | ||
| <ModalHeader padding={4} onClose={onClose}> | ||
| {t('createSolanaAccount')} | ||
| </ModalHeader> | ||
| <Box paddingLeft={4} paddingRight={4} paddingBottom={4}> | ||
| <CreateSnapAccount | ||
| onActionComplete={async (confirmed: boolean) => { | ||
| if (confirmed) { | ||
| onClose(); | ||
| } else { | ||
| setShowCreateAccount(false); | ||
| } | ||
| }} | ||
| selectedKeyringId={selectedKeyringId} | ||
| onSelectSrp={() => { | ||
| setShowSrpSelection(true); | ||
| setShowCreateAccount(false); | ||
| }} | ||
| clientType={WalletClientType.Solana} | ||
| chainId={MultichainNetworks.SOLANA} | ||
| /> | ||
| </Box> | ||
| </ModalContent> | ||
| </Modal> | ||
| ); | ||
| } | ||
|
|
||
| if (showSrpSelection) { | ||
| return ( | ||
| <Modal isOpen onClose={onClose}> | ||
| <ModalOverlay /> | ||
| <ModalContent | ||
| className="create-solana-account-modal" | ||
| data-testid="create-solana-account-modal" | ||
| modalDialogProps={{ | ||
| className: 'create-solana-account-modal__dialog', | ||
| padding: 0, | ||
| display: Display.Flex, | ||
| flexDirection: FlexDirection.Column, | ||
| }} | ||
| > | ||
| <ModalHeader padding={4} onClose={onClose}> | ||
| {t('selectSRP')} | ||
| </ModalHeader> | ||
| <Box paddingLeft={4} paddingRight={4} paddingBottom={4}> | ||
| <SrpList | ||
| onActionComplete={(keyringId: string) => { | ||
| setSelectedKeyringId(keyringId); | ||
| setShowCreateAccount(true); | ||
| }} | ||
| /> | ||
| </Box> | ||
| </ModalContent> | ||
| </Modal> | ||
| ); | ||
| } | ||
|
|
||
| return null; | ||
| }; | ||
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { CreateSolanaAccountModal } from './create-solana-account-modal'; |
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.
Why is this
null? Do we not want to allow the user to close this via thex?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.
We do, but it's done with:
I changed it to null, because it was also triggered by some other flow, where we didn't want to close it yet.