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

feat(suite): update passphrase flow #16937

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
+672 −351
Draft

feat(suite): update passphrase flow #16937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
91 changes: 48 additions & 43 deletions packages/suite/src/components/suite/layouts/SuiteLayout/SuiteLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import { MobileMenu } from './MobileMenu/MobileMenu';
import { Sidebar } from './Sidebar/Sidebar';
import { useAppShortcuts } from './useAppShortcuts';
import { ModalSwitcher } from '../../modals/ModalSwitcher/ModalSwitcher';
import { PassphraseModalProvider } from '../../modals/ReduxModal/DeviceContextModal/PassphraseModalContext';

export const SCROLL_WRAPPER_ID = 'layout-scroll';
export const Wrapper = styled.div`
Expand Down Expand Up @@ -162,49 +163,53 @@ export const SuiteLayout = ({ children }: SuiteLayoutProps) => {
<PageWrapper>
<ResponsiveContextProvider sidebarWidthFromRedux={sidebarWidthFromRedux}>
<NewModal.Provider>
<ModalContextProvider>
<Metadata title={title} />

<ModalSwitcher />

{isMobileLayout && <CoinjoinBars />}

{isMobileLayout && <MobileMenu />}

<DiscoveryProgress />

<LayoutContext.Provider value={setLayoutPayload}>
<Body data-testid="@suite-layout/body">
<Columns>
{!isMobileLayout && (
<ElevationDown>
<Sidebar />
</ElevationDown>
)}
<MainContent>
{!isMobileLayout && <CoinjoinBars />}
<SuiteBanners />
<AppWrapper
data-testid="@app"
ref={scrollRef}
id={SCROLL_WRAPPER_ID}
>
<ElevationUp>
{isMobileLayout && isAccountPage && (
<MobileAccountsMenu />
)}
{layoutHeader}

<ContentWrapper>{children}</ContentWrapper>
</ElevationUp>
</AppWrapper>
</MainContent>
</Columns>
</Body>
</LayoutContext.Provider>

{!isMobileLayout && <GuideButton />}
</ModalContextProvider>
<PassphraseModalProvider>
<ModalContextProvider>
<Metadata title={title} />

<ModalSwitcher />

{isMobileLayout && <CoinjoinBars />}

{isMobileLayout && <MobileMenu />}

<DiscoveryProgress />

<LayoutContext.Provider value={setLayoutPayload}>
<Body data-testid="@suite-layout/body">
<Columns>
{!isMobileLayout && (
<ElevationDown>
<Sidebar />
</ElevationDown>
)}
<MainContent>
{!isMobileLayout && <CoinjoinBars />}
<SuiteBanners />
<AppWrapper
data-testid="@app"
ref={scrollRef}
id={SCROLL_WRAPPER_ID}
>
<ElevationUp>
{isMobileLayout && isAccountPage && (
<MobileAccountsMenu />
)}
{layoutHeader}

<ContentWrapper>
{children}
</ContentWrapper>
</ElevationUp>
</AppWrapper>
</MainContent>
</Columns>
</Body>
</LayoutContext.Provider>

{!isMobileLayout && <GuideButton />}
</ModalContextProvider>
</PassphraseModalProvider>
</NewModal.Provider>
</ResponsiveContextProvider>
</PageWrapper>
Expand Down
65 changes: 65 additions & 0 deletions ...c/components/suite/modals/ReduxModal/DeviceContextModal/ConfirmPassphraseBeforeAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { TrezorDevice } from '@suite-common/suite-types';
import { selectDeviceModel } from '@suite-common/wallet-core';
import { Column, H3, Paragraph } from '@trezor/components';
import TrezorConnect from '@trezor/connect';
import { PassphraseTypeCard } from '@trezor/product-components';
import { spacings } from '@trezor/theme';

import { useSelector } from '../../../../../hooks/suite';
import { CardWithDevice } from '../../../../../views/suite/SwitchDevice/CardWithDevice';
import { SwitchDeviceModal } from '../../../../../views/suite/SwitchDevice/SwitchDeviceModal';
import { OpenGuideFromTooltip } from '../../../../guide';
import { Translation } from '../../../Translation';

type ConfirmPassphraseBeforeActionProps = {
onDeviceOffer: boolean;
onSubmit: (value: string, passphraseOnDevice?: boolean) => void;
device: TrezorDevice;
};

export const ConfirmPassphraseBeforeAction = ({
device,
onSubmit,
onDeviceOffer,
}: ConfirmPassphraseBeforeActionProps) => {
const deviceModel = useSelector(selectDeviceModel);

const onEnterPassphraseDialogCancel = () => {
TrezorConnect.cancel('enter-passphrase-cancel');
};

return (
<SwitchDeviceModal isAnimationEnabled onCancel={onEnterPassphraseDialogCancel}>
<CardWithDevice
onCancel={onEnterPassphraseDialogCancel}
device={device}
isFullHeaderVisible
icon="x"
>
<Column gap={spacings.sm} margin={{ top: spacings.xxs }}>
<H3>
<Translation id="TR_CONFIRM_PASSPHRASE" />
</H3>
<Paragraph>
<Translation id="TR_CONFIRM_PASSPHRASE_WITHOUT_ADVICE_DESCRIPTION" />
</Paragraph>
<PassphraseTypeCard
submitLabel={<Translation id="TR_CONFIRM" />}
type="hidden"
singleColModal
offerPassphraseOnDevice={onDeviceOffer}
onSubmit={onSubmit}
deviceModel={deviceModel ?? undefined}
deviceBackup={device.features?.backup_type}
learnMoreTooltipOnClick={
<OpenGuideFromTooltip
data-testid="@tooltip/guideAnchor"
id="/1_initialize-and-secure-your-trezor/6_passphrase.md"
/>
}
/>
</Column>
</CardWithDevice>
</SwitchDeviceModal>
);
};
91 changes: 91 additions & 0 deletions packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/EnterPassphrase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import { TrezorDevice } from '@suite-common/suite-types/libDev/src';
import { selectDeviceModel } from '@suite-common/wallet-core';
import { Column, H3, Icon, List } from '@trezor/components';
import TrezorConnect from '@trezor/connect';
import { PassphraseTypeCard } from '@trezor/product-components';
import { spacings } from '@trezor/theme';
import { HELP_CENTER_PASSPHRASE_URL } from '@trezor/urls';

import { useSelector } from '../../../../../hooks/suite';
import { CardWithDevice } from '../../../../../views/suite/SwitchDevice/CardWithDevice';
import { SwitchDeviceModal } from '../../../../../views/suite/SwitchDevice/SwitchDeviceModal';
import { OpenGuideFromTooltip } from '../../../../guide';
import { Translation } from '../../../Translation';
import { TrezorLink } from '../../../TrezorLink';

type EnterPassphraseProps = {
onDeviceOffer: boolean;
onSubmit: (value: string, passphraseOnDevice?: boolean) => void;
device: TrezorDevice;
};

export const EnterPassphrase = ({ device, onDeviceOffer, onSubmit }: EnterPassphraseProps) => {
const deviceModel = useSelector(selectDeviceModel);

const onEnterPassphraseDialogCancel = () => {
TrezorConnect.cancel('enter-passphrase-cancel');
};

const onEnterPassphraseDialogBack = () => {
TrezorConnect.cancel('enter-passphrase-back');
};

return (
<SwitchDeviceModal isAnimationEnabled onCancel={onEnterPassphraseDialogCancel}>
<CardWithDevice
onCancel={onEnterPassphraseDialogCancel}
device={device}
onBackButtonClick={onEnterPassphraseDialogBack}
isFullHeaderVisible
>
<Column gap={spacings.sm} margin={{ top: spacings.xxs }}>
<H3>
<Translation id="TR_PASSPHRASE_HIDDEN_WALLET" />
</H3>
<List gap={spacings.sm} bulletGap={spacings.md} typographyStyle="hint">
<List.Item bulletComponent={<Icon name="info" size={16} />}>
<Translation
id="TR_PASSPHRASE_DESCRIPTION_ITEM1"
values={{
a: chunks => (
<TrezorLink
target="_blank"
variant="underline"
typographyStyle="hint"
href={HELP_CENTER_PASSPHRASE_URL}
>
{chunks}
</TrezorLink>
),
}}
/>
</List.Item>
<List.Item bulletComponent={<Icon name="asterisk" size={16} />}>
<Translation id="TR_PASSPHRASE_DESCRIPTION_ITEM2" />
</List.Item>
<List.Item bulletComponent={<Icon name="warningTriangle" size={16} />}>
<Translation id="TR_PASSPHRASE_DESCRIPTION_ITEM3" />
</List.Item>
</List>
<PassphraseTypeCard
submitLabel={<Translation id="TR_ACCESS_HIDDEN_WALLET" />}
type="hidden"
singleColModal
offerPassphraseOnDevice={onDeviceOffer}
onSubmit={(value: string, passphraseOnDevice?: boolean) =>
onSubmit(value, passphraseOnDevice)
}
deviceModel={deviceModel ?? undefined}
deviceBackup={device.features?.backup_type}
learnMoreTooltipOnClick={
<OpenGuideFromTooltip
data-testid="@tooltip/guideAnchor"
id="/1_initialize-and-secure-your-trezor/6_passphrase.md"
/>
}
/>
</Column>
</CardWithDevice>
</SwitchDeviceModal>
);
};
Loading
Loading