Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
1a479a5
update dark mode for unexisting state
Stasn13 May 28, 2025
23297cf
implement onboarding index template
Stasn13 May 28, 2025
7af109f
implement onboarding import template
Stasn13 May 28, 2025
ad51ef1
connect theme and update layout
Stasn13 May 28, 2025
49b9048
update typography
Stasn13 May 28, 2025
16b86da
implement back button
Stasn13 May 28, 2025
35f9b62
adjust height for container
Stasn13 May 28, 2025
af21735
update textarea styles to keep design consistency
Stasn13 May 28, 2025
a818cb7
add redirect to portfolio
Stasn13 May 29, 2025
20f9669
add validations
Stasn13 May 29, 2025
a90dc36
update layout(popup) according to deisgn
Stasn13 May 29, 2025
e5697fa
uodate sidepanel
Stasn13 May 30, 2025
a14df05
add header component
Stasn13 May 30, 2025
8304b9d
add dynamic progress svg
Stasn13 Jun 4, 2025
1add852
add Input wrapper for wallet purposes
Stasn13 Jun 4, 2025
c705585
add mock passwordStrength feature
Stasn13 Jun 4, 2025
d7e7a7d
enhance UI for password and recovery flows
Stasn13 Jun 4, 2025
a325aee
Merge branch 'main' of https://github.com/status-im/status-web into f…
Stasn13 Jun 4, 2025
a5d82af
add todo
Stasn13 Jun 5, 2025
dd40535
basic implementation of textarea
Stasn13 Jun 5, 2025
b69c095
move data customisation
Stasn13 Jun 5, 2025
a32d4ec
add textarea control wrapper
Stasn13 Jun 5, 2025
cba6b4e
adjust types
Stasn13 Jun 5, 2025
01e056f
fix types
Stasn13 Jun 5, 2025
0d9309a
Merge branch 'main' of https://github.com/status-im/status-web into f…
Stasn13 Jun 13, 2025
9d1c9a7
update tou and privacy links
Stasn13 Jun 13, 2025
a4dd3fc
update description
Stasn13 Jun 13, 2025
d75ab2a
remove size styles
Stasn13 Jun 13, 2025
d9adb2d
update textarea story
Stasn13 Jun 13, 2025
ef8b58e
set correct alphabet order
Stasn13 Jun 13, 2025
e76e73a
add bip39 package and resolve unsued wordlists
Stasn13 Jun 13, 2025
23835fe
add undefined Buffer for web environment
Stasn13 Jun 13, 2025
bd8f096
enhance mnemonic validation
Stasn13 Jun 13, 2025
e15b343
refactor ui elements
Stasn13 Jun 16, 2025
4dfcb8c
update packages
Stasn13 Jun 16, 2025
7d07aa2
encapsulate onboarding forms
Stasn13 Jun 16, 2025
7819826
enhance input ui
Stasn13 Jun 16, 2025
f3e32dc
update wrapper
Stasn13 Jun 16, 2025
f11e402
update route components
Stasn13 Jun 16, 2025
156dcb4
addd onboarding asset
Stasn13 Jun 16, 2025
1ce3196
chore: combine changes from merge
Stasn13 Jun 20, 2025
b5c14a7
Merge branch 'main' of https://github.com/status-im/status-web into f…
Stasn13 Jun 20, 2025
d4aba6d
add Buffer to establish correct bip32 lib work
Stasn13 Jun 20, 2025
ca4620d
fixes - naming, UI
jkbktl Jun 22, 2025
41e1070
use `@scure/bip39`
felicio Jun 24, 2025
16f6b7d
config eslint
felicio Jun 24, 2025
7a183d3
remove polyfill from page context
felicio Jun 24, 2025
0e6daf7
infer `darkMode`
felicio Jun 24, 2025
6753e25
remove explicit prop type exports
felicio Jun 24, 2025
ec4f4e4
add changeset
felicio Jun 24, 2025
5a5ca13
increase timeout
felicio Jun 24, 2025
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
2 changes: 1 addition & 1 deletion apps/wallet/src/entrypoints/popup/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<meta name="manifest.type" content="browser_action" />
<!-- <meta name="manifest.browser_style" content="true|false" /> -->
</head>
<body>
<body data-customisation="blue">
<div id="root"></div>
<script type="module" src="../../main.tsx"></script>
</body>
Expand Down
6 changes: 5 additions & 1 deletion apps/wallet/src/routes/onboarding/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@ export const Route = createFileRoute('/onboarding')({
})

function RouteComponent() {
return <Outlet />
return (
<div className="h-full p-5">
<Outlet />
</div>
)
}
54 changes: 37 additions & 17 deletions apps/wallet/src/routes/onboarding/import.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useState } from 'react'

import { Button, Input } from '@status-im/components'
import { Button, Input, Text } from '@status-im/components'
import { ArrowLeftIcon } from '@status-im/icons/20'
import { createFileRoute } from '@tanstack/react-router'
import { useForm } from 'react-hook-form'

Expand All @@ -27,7 +28,7 @@ function RouteComponent() {
})

return (
<div>
<div className="h-full">
{onboardingState.type === 'import-wallet' && (
<ImportWallet
onNext={mnemonic =>
Expand Down Expand Up @@ -58,20 +59,39 @@ function ImportWallet({ onNext }: { onNext: (mnemonic: string) => void }) {
})

return (
<div className="flex flex-col gap-4">
<textarea
className="h-32 rounded-12 border border-neutral-80 bg-neutral-90 p-2 text-white-100 placeholder:text-neutral-40 dark:border-neutral-60 dark:bg-neutral-100"
placeholder="Enter your recovery phrase"
{...register('mnemonic', {
required: 'Recovery phrase is required',
})}
/>
{errors.mnemonic && (
<p className="text-13 text-danger-50">{errors.mnemonic.message}</p>
)}
<Button variant="danger" onClick={onSubmit}>
Continue
</Button>
<div className="flex h-full flex-col justify-between">
<div className="flex flex-col gap-1">
<div className="pb-4">
<Button
href="/onboarding"
variant="grey"
icon={<ArrowLeftIcon color="$neutral-100" />}
aria-label="Back"
size="32"
/>
</div>
<Text size={27} weight="semibold">
Import via recovery phrase
</Text>
<Text size={15} color="$neutral-50">
Type or paste your 12-, 18-, or 24-word Ethereum recovery phrase
</Text>
<textarea
className="mt-4 h-32 resize-none rounded-12 border border-neutral-20 bg-white-100 px-4 py-2 text-neutral-100 placeholder:text-neutral-40 invalid:border-danger-50/40 focus:border-neutral-40 dark:border-neutral-60 dark:bg-neutral-100"
placeholder="Recovery phrase"
{...register('mnemonic', {
required: 'Recovery phrase is required',
})}
/>
</div>
<div className="flex flex-col gap-6">
{errors.mnemonic && (
<p className="text-13 text-danger-50">{errors.mnemonic.message}</p>
)}
<Button variant="primary" onClick={onSubmit}>
Continue
</Button>
</div>
</div>
)
}
Expand Down Expand Up @@ -130,7 +150,7 @@ function CreatePassword({ mnemonic }: { mnemonic: string }) {
{errors.confirmPassword.message}
</p>
)}
<Button variant="danger" onClick={onSubmit}>
<Button variant="primary" onClick={onSubmit}>
Import Wallet
</Button>
</div>
Expand Down
45 changes: 32 additions & 13 deletions apps/wallet/src/routes/onboarding/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Button, Text } from '@status-im/components'
import { createFileRoute, Link } from '@tanstack/react-router'

export const Route = createFileRoute('/onboarding/')({
Expand All @@ -13,19 +14,37 @@ export const Route = createFileRoute('/onboarding/')({

function RouteComponent() {
return (
<div className="grid gap-2">
<Link
to="/onboarding/new"
className="flex h-10 items-center rounded-12 bg-neutral-50 px-3 text-15 font-medium transition-colors active:bg-neutral-50 hover:bg-neutral-90"
>
Create a wallet
</Link>
<Link
to="/onboarding/import"
className="flex h-10 items-center rounded-12 bg-neutral-50 px-3 text-15 font-medium transition-colors active:bg-neutral-50 hover:bg-neutral-90"
>
I already have a wallet
</Link>
<div className="flex flex-col items-center gap-6 py-3 text-center">
<div className="size-52 rounded-full bg-neutral-5" />
<div className="flex flex-col gap-4">
<Text size={40} weight="bold">
Your Wallet.
<br />
Your crypto.
</Text>
<Text size={15} color="$neutral-50">
Some awesome sub copy
</Text>
</div>
<div className="flex w-full flex-col gap-3">
<Button href="/onboarding/new" className="w-full">
New wallet
</Button>
<Button href="/onboarding/import" className="w-full" variant="grey">
Import wallet
</Button>
</div>
<Text size={13} color="$neutral-50">
By continuing you agree with Status
<br />
<Link to="/onboarding" color="$neutral-100">
Terms of use
</Link>{' '}
and{' '}
<Link to="/onboarding" color="$neutral-100">
Privacy policy
</Link>
</Text>
</div>
)
}
2 changes: 1 addition & 1 deletion apps/wallet/tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default {
// todo: extend @status-im/components too
presets: [config],

darkMode: 'media',
darkMode: ['selector', '[data-theme="dark"]'],

future: {
hoverOnlyWhenSupported: true,
Expand Down