separate Multi Coins and Monero into distinct account types with startup login choice
- Removed monero from shared networks array; monero is now its own separate account type
- Added accountType state (null/'multi'/'monero') to wallet, stored in memory only
- Added login(type) method: chooses between EVM vault flow and Monero RPC flow
- Added logout() method that resets all per-account state
- On app startup, user picks Multi Coins (ETH/BSC/Polygon) or Monero
- isLocked getter now checks accountType === 'multi' instead of excluding monero by network id
- Moved ETH/BSC/Polygon routes under /multicoin/ base path
- /multicoin, /multicoin/bsc, /multicoin/polygon with updated navTarget routing
- Root / shows welcome/login choice, redirects if already logged in
- Fixed moneroListWallets timing: runs inside login('monero') after RPC manager exists
- Removed cross-tab links between monero and multicoin, only logout remains
This commit is contained in:
@@ -65,21 +65,51 @@
|
||||
})
|
||||
|
||||
function navTarget(id: NetworkId): string {
|
||||
if (id === 'eth') return '/'
|
||||
return `/${id}`
|
||||
if (id === 'eth') return '/multicoin'
|
||||
return `/multicoin/${id}`
|
||||
}
|
||||
|
||||
let initStarted = false
|
||||
$effect(() => {
|
||||
if (!initStarted) {
|
||||
initStarted = true
|
||||
w.init().then(() => w.switchNetwork(networkId))
|
||||
w.init().then(async () => {
|
||||
if (w.accountType === 'multi') {
|
||||
await w.switchNetwork(networkId)
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
{#if !w.ready}
|
||||
{:else if !w.vaultExists}
|
||||
<div class="mx-auto mt-16 max-w-md text-center text-muted-foreground text-sm">Loading...</div>
|
||||
{:else if !w.accountType}
|
||||
<div class="mx-auto mt-24 max-w-sm">
|
||||
<Card>
|
||||
<CardHeader class="text-center">
|
||||
<CardTitle>Welcome</CardTitle>
|
||||
<CardDescription>Choose an account type to get started</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<div class="flex flex-col gap-3">
|
||||
<Button
|
||||
onclick={() => w.login('multi')}
|
||||
class="w-full">
|
||||
Multi Coins (ETH / BSC / Polygon)
|
||||
</Button>
|
||||
<Button
|
||||
onclick={() => navigate('/monero')}
|
||||
variant="outline"
|
||||
class="w-full">
|
||||
Monero
|
||||
</Button>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
{:else if w.accountType === 'multi'}
|
||||
{#if !w.vaultExists}
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>Import Wallet</CardTitle>
|
||||
@@ -152,7 +182,7 @@
|
||||
{:else}
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex gap-1 justify-center" role="group">
|
||||
{#each w.networks as net}
|
||||
{#each w.evmNetworks as net}
|
||||
<button
|
||||
class="cursor-pointer rounded-md px-2.5 py-1 text-xs font-medium transition-colors {w.network ===
|
||||
net.id
|
||||
@@ -162,6 +192,11 @@
|
||||
{net.name}
|
||||
</button>
|
||||
{/each}
|
||||
<button
|
||||
class="cursor-pointer rounded-md px-2.5 py-1 text-xs font-medium transition-colors bg-muted text-muted-foreground hover:bg-muted/80"
|
||||
onclick={() => w.logout()}>
|
||||
Logout
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<Card>
|
||||
@@ -382,3 +417,4 @@
|
||||
</Card>
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
@@ -27,15 +27,16 @@ export const networks = [
|
||||
chainid: '1',
|
||||
explorerUrl: 'https://etherscan.io/tx/',
|
||||
},
|
||||
{
|
||||
] as const
|
||||
|
||||
const moneroNetwork = {
|
||||
id: 'monero',
|
||||
name: 'Monero',
|
||||
rpc: '',
|
||||
symbol: 'XMR',
|
||||
chainid: '',
|
||||
explorerUrl: 'https://moneroblocks.info/tx/',
|
||||
},
|
||||
] as const
|
||||
} as const
|
||||
|
||||
export type NetworkId = (typeof networks)[number]['id']
|
||||
|
||||
@@ -53,7 +54,10 @@ export const atomicToXmr = (atomic: string): string => {
|
||||
return frac ? `${whole}.${frac}` : `${whole}`
|
||||
}
|
||||
|
||||
export type AccountType = 'multi' | 'monero'
|
||||
|
||||
export const Wallet = () => {
|
||||
let accountType = $state<AccountType | null>(null)
|
||||
let seed = $state('')
|
||||
let address = $state('')
|
||||
let balance = $state('0')
|
||||
@@ -94,8 +98,6 @@ export const Wallet = () => {
|
||||
return { salt: s, hash }
|
||||
}
|
||||
|
||||
const isMonero = () => network === 'monero'
|
||||
|
||||
const init = async () => {
|
||||
if (!electrobun.rpc) return
|
||||
const [raw, rawError] = await tryCatch(
|
||||
@@ -122,20 +124,46 @@ export const Wallet = () => {
|
||||
)
|
||||
if (ph) passwordHash = ph
|
||||
|
||||
await checkMoneroStatus()
|
||||
await checkBiometric()
|
||||
ready = true
|
||||
}
|
||||
|
||||
const switchNetwork = async (id: NetworkId) => {
|
||||
network = id
|
||||
if (id === 'monero') {
|
||||
await checkMoneroStatus()
|
||||
const login = async (type: AccountType) => {
|
||||
accountType = type
|
||||
if (type === 'multi') {
|
||||
if (!seed && vaultExists) {
|
||||
await loadSeed()
|
||||
}
|
||||
if (seed) await switchNetwork(network)
|
||||
} else if (type === 'monero') {
|
||||
if (moneroInstalled && !moneroRunning) {
|
||||
await moneroStart()
|
||||
await checkMoneroStatus()
|
||||
}
|
||||
await moneroListWallets()
|
||||
} else if (seed) {
|
||||
}
|
||||
}
|
||||
|
||||
const logout = () => {
|
||||
accountType = null
|
||||
seed = ''
|
||||
address = ''
|
||||
balance = '0'
|
||||
tokenBalances = []
|
||||
transactions = []
|
||||
moneroWalletOpen = false
|
||||
moneroBalAtomic = '0'
|
||||
moneroUnlockedAtomic = '0'
|
||||
moneroAddress = ''
|
||||
moneroTxs = []
|
||||
moneroWalletName = ''
|
||||
moneroAccounts = []
|
||||
}
|
||||
|
||||
const switchNetwork = async (id: NetworkId) => {
|
||||
network = id
|
||||
if (seed) {
|
||||
await refresh()
|
||||
}
|
||||
}
|
||||
@@ -448,8 +476,9 @@ export const Wallet = () => {
|
||||
|
||||
return {
|
||||
get isLocked() {
|
||||
return vaultExists && !seed && network !== 'monero'
|
||||
return accountType === 'multi' && vaultExists && !seed
|
||||
},
|
||||
get accountType() { return accountType },
|
||||
get seed() { return seed },
|
||||
get address() { return address },
|
||||
get balance() { return balance },
|
||||
@@ -464,9 +493,10 @@ export const Wallet = () => {
|
||||
get vaultExists() { return vaultExists },
|
||||
get ready() { return ready },
|
||||
get networks() { return networks },
|
||||
get moneroNetwork() { return moneroNetwork },
|
||||
get evmNetworks() { return networks },
|
||||
get apiKey() { return apiKey },
|
||||
get transactions() { return transactions },
|
||||
isMonero,
|
||||
get moneroRunning() { return moneroRunning },
|
||||
get moneroWalletOpen() { return moneroWalletOpen },
|
||||
get moneroConnected() { return moneroConnected },
|
||||
@@ -487,6 +517,8 @@ export const Wallet = () => {
|
||||
get passwordSet() { return !!passwordHash },
|
||||
refresh,
|
||||
init,
|
||||
login,
|
||||
logout,
|
||||
lock,
|
||||
unlockWithBiometrics,
|
||||
unlockWithPassword,
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
<script lang="ts"></script>
|
||||
|
||||
<h1>About</h1>
|
||||
|
||||
<p>This is another page</p>
|
||||
@@ -1,7 +1,50 @@
|
||||
<script lang="ts">
|
||||
import EvmDashboard from '$lib/components/EvmDashboard.svelte'
|
||||
import { wallet } from '$lib/states/wallet.svelte.js'
|
||||
import { Button } from '$lib/components/ui/button/index.js'
|
||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '$lib/components/ui/card/index.js'
|
||||
import { navigate } from 'sv-router/generated'
|
||||
|
||||
const w = wallet
|
||||
|
||||
let initStarted = false
|
||||
$effect(() => {
|
||||
if (!initStarted) {
|
||||
initStarted = true
|
||||
w.init()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<div class="mx-auto mt-16 max-w-md">
|
||||
<EvmDashboard networkId="eth" />
|
||||
<div class="mx-auto mt-24 max-w-sm">
|
||||
{#if !w.ready}
|
||||
<p class="text-center text-muted-foreground text-sm">Loading...</p>
|
||||
{:else if w.accountType}
|
||||
{#if w.accountType === 'multi'}
|
||||
{navigate('/multicoin')}
|
||||
{:else}
|
||||
{navigate('/monero')}
|
||||
{/if}
|
||||
{:else}
|
||||
<Card>
|
||||
<CardHeader class="text-center">
|
||||
<CardTitle>Welcome</CardTitle>
|
||||
<CardDescription>Choose an account type to get started</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<div class="flex flex-col gap-3">
|
||||
<Button
|
||||
onclick={() => navigate('/multicoin')}
|
||||
class="w-full">
|
||||
Multi Coins (ETH / BSC / Polygon)
|
||||
</Button>
|
||||
<Button
|
||||
onclick={() => navigate('/monero')}
|
||||
variant="outline"
|
||||
class="w-full">
|
||||
Monero
|
||||
</Button>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { wallet, atomicToXmr, type NetworkId } from '$lib/states/wallet.svelte.js'
|
||||
import { wallet, atomicToXmr } from '$lib/states/wallet.svelte.js'
|
||||
import { Button } from '$lib/components/ui/button/index.js'
|
||||
import { Textarea } from '$lib/components/ui/textarea/index.js'
|
||||
import { Input } from '$lib/components/ui/input/index.js'
|
||||
@@ -16,11 +16,6 @@
|
||||
|
||||
const w = wallet
|
||||
|
||||
function navTarget(id: NetworkId): string {
|
||||
if (id === 'eth') return '/'
|
||||
return `/${id}`
|
||||
}
|
||||
|
||||
let moneroWalletName = $state('')
|
||||
let moneroWalletPass = $state('')
|
||||
let moneroMnemonic = $state('')
|
||||
@@ -32,27 +27,53 @@
|
||||
$effect(() => {
|
||||
if (!initStarted) {
|
||||
initStarted = true
|
||||
w.init().then(() => w.switchNetwork('monero'))
|
||||
w.init().then(async () => {
|
||||
if (w.accountType === 'monero') return
|
||||
await w.login('monero')
|
||||
})
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<div class="mx-auto mt-16 max-w-md">
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex gap-1 justify-center" role="group">
|
||||
{#each w.networks as net}
|
||||
{#if !w.ready}
|
||||
<p class="text-center text-muted-foreground text-sm mt-8">Loading...</p>
|
||||
{:else if !w.accountType}
|
||||
<Card>
|
||||
<CardHeader class="text-center">
|
||||
<CardTitle>Welcome</CardTitle>
|
||||
<CardDescription>Choose an account type to get started</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<div class="flex flex-col gap-3">
|
||||
<Button
|
||||
onclick={() => navigate('/multicoin')}
|
||||
variant="outline"
|
||||
class="w-full">
|
||||
Multi Coins (ETH / BSC / Polygon)
|
||||
</Button>
|
||||
<Button
|
||||
onclick={() => w.login('monero')}
|
||||
class="w-full">
|
||||
Monero
|
||||
</Button>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
{:else if w.accountType === 'monero'}
|
||||
<div class="flex items-center justify-center gap-1 flex-wrap" role="group">
|
||||
<button
|
||||
class="cursor-pointer rounded-md px-2.5 py-1 text-xs font-medium transition-colors {w.network ===
|
||||
net.id
|
||||
? 'bg-primary text-primary-foreground'
|
||||
: 'bg-muted text-muted-foreground hover:bg-muted/80'}"
|
||||
onclick={() => navigate(navTarget(net.id))}>
|
||||
{net.name}
|
||||
class="cursor-pointer rounded-md px-2.5 py-1 text-xs font-medium transition-colors bg-primary text-primary-foreground">
|
||||
Monero
|
||||
</button>
|
||||
<button
|
||||
class="cursor-pointer rounded-md px-2.5 py-1 text-xs font-medium transition-colors bg-muted text-muted-foreground hover:bg-muted/80"
|
||||
onclick={() => w.logout()}>
|
||||
Logout
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
<!-- MONERO DASHBOARD -->
|
||||
{#if w.moneroDownloading}
|
||||
<Card>
|
||||
<CardContent>
|
||||
@@ -276,5 +297,6 @@
|
||||
</CardContent>
|
||||
</Card>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
<script lang="ts">
|
||||
import EvmDashboard from '$lib/components/EvmDashboard.svelte'
|
||||
</script>
|
||||
|
||||
<div class="mx-auto mt-16 max-w-md">
|
||||
<EvmDashboard networkId="eth" />
|
||||
</div>
|
||||
@@ -51,7 +51,7 @@
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onclick={() => navigate('/')}
|
||||
onclick={() => navigate('/multicoin')}
|
||||
class="mb-4">
|
||||
← Back
|
||||
</Button>
|
||||
|
||||
Reference in New Issue
Block a user