diff --git a/screenshots/desktop/showVerificationCode.png b/screenshots/desktop/showVerificationCode.png index 4a69a84b1d..c095906672 100644 Binary files a/screenshots/desktop/showVerificationCode.png and b/screenshots/desktop/showVerificationCode.png differ diff --git a/screenshots/mobile/showVerificationCode.png b/screenshots/mobile/showVerificationCode.png index 0c8e834c5c..930b7b659c 100644 Binary files a/screenshots/mobile/showVerificationCode.png and b/screenshots/mobile/showVerificationCode.png differ diff --git a/src/frontend/src/components/anchorInput.ts b/src/frontend/src/components/anchorInput.ts index b7ce2f28ce..6a8880ad51 100644 --- a/src/frontend/src/components/anchorInput.ts +++ b/src/frontend/src/components/anchorInput.ts @@ -1,6 +1,7 @@ import { html, TemplateResult } from "lit-html"; import { withRef } from "../utils/utils"; import { createRef, ref, Ref } from "lit-html/directives/ref.js"; +import { ifDefined } from "lit-html/directives/if-defined.js"; import { DirectiveResult } from "lit-html/directive.js"; import { parseUserNumber } from "../utils/userNumber"; @@ -106,7 +107,7 @@ export const mkAnchorInput = ({ id="${inputId}" class="c-input c-input--vip" placeholder="Enter anchor" - value="${userNumber}" + value="${ifDefined(userNumber?.toString())}" @input=${inputFilter(isDigits, onBadInput)} @keydown=${inputFilter(isDigits, onBadInput)} @keyup=${inputFilter(isDigits, onBadInput)} diff --git a/src/frontend/src/components/warnBox.ts b/src/frontend/src/components/warnBox.ts index 884dc00932..c7a54268de 100644 --- a/src/frontend/src/components/warnBox.ts +++ b/src/frontend/src/components/warnBox.ts @@ -20,7 +20,7 @@ export const warnBox = ({ htmlElement = "aside", }: warnBoxProps): TemplateResult => { const contents: TemplateResult = html` - ${warningIcon} +

${title}

diff --git a/src/frontend/src/flows/addDevice/welcomeView/showVerificationCode.ts b/src/frontend/src/flows/addDevice/welcomeView/showVerificationCode.ts index 98880e8054..55b891ba94 100644 --- a/src/frontend/src/flows/addDevice/welcomeView/showVerificationCode.ts +++ b/src/frontend/src/flows/addDevice/welcomeView/showVerificationCode.ts @@ -18,7 +18,7 @@ const pageContent = ( tentativeRegistrationInfo: TentativeRegistrationInfo ) => html`
-
+

Device Verification Required

This device was added tentatively to the Identity Anchor @@ -28,18 +28,19 @@ const pageContent = (

Alias

- ${alias} -

Device Verification Code - ${alias} +

Device Verification Code

+ ${tentativeRegistrationInfo.verification_code}

Time remaining:

- +
diff --git a/src/frontend/src/flows/authenticate/index.ts b/src/frontend/src/flows/authenticate/index.ts index ca5b90e9ff..d8ce585b6c 100644 --- a/src/frontend/src/flows/authenticate/index.ts +++ b/src/frontend/src/flows/authenticate/index.ts @@ -89,8 +89,7 @@ const pageContent = (

${derivationOrigin !== undefined ? html` -

- shared identity shared identity ${caretDownIcon}

diff --git a/src/frontend/src/flows/manage/index.ts b/src/frontend/src/flows/manage/index.ts index 159e61eebe..55dde75030 100644 --- a/src/frontend/src/flows/manage/index.ts +++ b/src/frontend/src/flows/manage/index.ts @@ -100,7 +100,7 @@ const devicesSection = ( Remove a device before you can add a new one. - + + Add new device @@ -125,7 +125,7 @@ const recoverySection = ( class="t-title__complication t-title__complication--end" id="addRecovery" > - + + Add recovery mechanism diff --git a/src/frontend/src/flows/recovery/chooseRecoveryMechanism.ts b/src/frontend/src/flows/recovery/chooseRecoveryMechanism.ts index 7844bd481a..e80ac9b8d4 100644 --- a/src/frontend/src/flows/recovery/chooseRecoveryMechanism.ts +++ b/src/frontend/src/flows/recovery/chooseRecoveryMechanism.ts @@ -18,7 +18,7 @@ const pageContent = (devices: DeviceData[]) => html` class="c-button c-button--secondary" id="seedPhrase" > - ${seedPhraseIcon} +
Seed Phrase
Use your own storage
@@ -27,7 +27,7 @@ const pageContent = (devices: DeviceData[]) => html` class="c-button c-button--secondary" id="securityKey" > - ${securityKeyIcon} +
Security Key
Use an extra security key
diff --git a/src/frontend/src/flows/recovery/pickRecoveryDevice.ts b/src/frontend/src/flows/recovery/pickRecoveryDevice.ts index f683aef150..37564920dd 100644 --- a/src/frontend/src/flows/recovery/pickRecoveryDevice.ts +++ b/src/frontend/src/flows/recovery/pickRecoveryDevice.ts @@ -5,7 +5,7 @@ const pageContent = () => html`

Choose a device

-

Recovery devices

+

Recovery devices

    diff --git a/src/frontend/src/flows/recovery/recoverWith/phrase.ts b/src/frontend/src/flows/recovery/recoverWith/phrase.ts index 5a8aa6a021..5f1a7ef74a 100644 --- a/src/frontend/src/flows/recovery/recoverWith/phrase.ts +++ b/src/frontend/src/flows/recovery/recoverWith/phrase.ts @@ -26,8 +26,8 @@ const pageContent = (userNumber: bigint, message?: string) => html` background-color: unset; } 50% { - background-color: #ED1E79; - border-color: #ED1E79; + background-color: #ed1e79; + border-color: #ed1e79; } 100% { background-color: unset; @@ -42,19 +42,28 @@ const pageContent = (userNumber: bigint, message?: string) => html`

    Your seed phrase

    -

    ${ - message !== undefined ? message : "Please provide your seed phrase" - }

    +

    + ${message !== undefined ? message : "Please provide your seed phrase"} +

    - -
    diff --git a/src/frontend/src/styleguide.ts b/src/frontend/src/styleguide.ts index 32e1a6f848..0442d2dbaf 100644 --- a/src/frontend/src/styleguide.ts +++ b/src/frontend/src/styleguide.ts @@ -152,7 +152,7 @@ export const styleguide = html`

    - Or +

    @@ -183,7 +183,7 @@ export const styleguide = html`

    - ${warningIcon} +

    Warning Card with Icon