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.

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: add implicit account creation wizard and router #7877

Merged
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e7fb493
feat: add account to routes
evavirseda Dec 22, 2023
f59e885
feat: add to analytics featureflag
evavirseda Dec 22, 2023
d8318ab
feat: add account view and multistep
evavirseda Dec 26, 2023
ba6be6b
style: refinements
evavirseda Dec 26, 2023
9de9319
feat: rename files and add locale
evavirseda Dec 26, 2023
0705215
fix: update naming
evavirseda Jan 4, 2024
30a4b81
Merge branch 'feat/add-implicit-account-router' into feat/add-implici…
evavirseda Jan 4, 2024
af504e3
feat: update naming and improve code
evavirseda Jan 4, 2024
3390dc2
fix import
evavirseda Jan 4, 2024
ab1919a
Merge branch 'feat/add-implicit-account-router' into feat/add-implici…
evavirseda Jan 4, 2024
bf15770
fix: remove accountImplicit route and add to wallet tab
evavirseda Jan 10, 2024
2d7273d
fix: improve naming
evavirseda Jan 10, 2024
45a5ce6
Merge branch 'feat/add-implicit-account-router' into feat/add-implici…
evavirseda Jan 10, 2024
784014c
Update packages/desktop/views/dashboard/wallet/Wallet.svelte
begonaalvarezd Jan 10, 2024
3f0ab3c
Update packages/desktop/views/dashboard/wallet/Wallet.svelte
begonaalvarezd Jan 10, 2024
1347de2
Merge branch 'feat/add-implicit-account-router' into feat/add-implici…
evavirseda Jan 10, 2024
669d0af
Merge branch 'develop-iota2.0' into feat/add-implicit-account-creatio…
evavirseda Jan 11, 2024
1970e9e
fix: add router
evavirseda Jan 11, 2024
057c9f5
minor fixes
evavirseda Jan 11, 2024
e0e09c8
ix: add missing dots
evavirseda Jan 11, 2024
1016b96
fix: remove unnecessary function
evavirseda Jan 11, 2024
3171553
fix: rename files
evavirseda Jan 11, 2024
f4a90f5
fix: move if/else and key block
evavirseda Jan 11, 2024
9272310
fix: reset after finish
evavirseda Jan 11, 2024
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
6 changes: 6 additions & 0 deletions packages/desktop/lib/routers/actions/initialiseRouters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
} from '@core/router/routers'
import { loginRouter, LoginRouter } from '@core/router/subrouters'
import { OnboardingRouter, onboardingRouter } from '@views/onboarding'
import { implicitAccountCreationRouter, ImplicitAccountCreationRouter } from '@views/dashboard/wallet'

export function initialiseRouters(): void {
/**
Expand All @@ -34,12 +35,17 @@ function initialiseBaseRouters(): void {
collectiblesRouter.set(new CollectiblesRouter())
governanceRouter.set(new GovernanceRouter())
initialiseBaseOnboardingRouters()
initialiseBaseImplicitAccountCreationRouters()
}

function initialiseBaseOnboardingRouters(): void {
onboardingRouter.set(new OnboardingRouter())
}

function initialiseBaseImplicitAccountCreationRouters(): void {
implicitAccountCreationRouter.set(new ImplicitAccountCreationRouter())
}

function initialiseSubrouters(): void {
loginRouter.set(new LoginRouter())
}
2 changes: 2 additions & 0 deletions packages/desktop/lib/routers/actions/resetRouters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
loginRouter,
settingsRouter,
} from '@core/router'
import { implicitAccountCreationRouter } from '@views/dashboard/wallet'
import { onboardingRouter } from '@views/onboarding'
import { get } from 'svelte/store'

Expand All @@ -25,4 +26,5 @@ function resetBaseRouters(): void {
get(settingsRouter).reset()
get(collectiblesRouter).reset()
get(governanceRouter).reset()
get(implicitAccountCreationRouter).reset()
}
19 changes: 11 additions & 8 deletions packages/desktop/views/dashboard/wallet/Wallet.svelte
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
<script lang="ts">
import { WalletMainView } from './views'
import { ImplicitAccountCreationView, WalletView } from './views'

const hasAccount: boolean = false
</script>

{#if hasAccount}
<WalletMainView />
{:else}
<div class="flex w-full h-full p-12">
<h1>IMPLICIT ACCOUNT</h1>
</div>
{/if}
<wallet-container
class="w-full h-full flex flex-nowrap p-8 relative flex-1
bg-gray-50 dark:bg-gray-900 justify-center items-center"
>
{#if hasAccount}
<WalletView />
{:else}
<ImplicitAccountCreationView />
{/if}
</wallet-container>
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { get, writable } from 'svelte/store'
import { Router } from '../../../../shared/lib/core/router/classes'
import { ImplicitAccountCreationRoute } from './implicit-account-creation.enum'
import { appRouter } from '@core/router'

export const implicitAccountCreationRouter = writable<ImplicitAccountCreationRouter>(null)
export const implicitAccountCreationRoute = writable<ImplicitAccountCreationRoute>(null)

export class ImplicitAccountCreationRouter extends Router<ImplicitAccountCreationRoute> {
constructor() {
super(ImplicitAccountCreationRoute.Init, implicitAccountCreationRoute)
}

next(): void {
let nextRoute: ImplicitAccountCreationRoute

const currentRoute = get(this.routeStore)
switch (currentRoute) {
case ImplicitAccountCreationRoute.Init: {
nextRoute = ImplicitAccountCreationRoute.OneTimeDeposit
break
}
case ImplicitAccountCreationRoute.OneTimeDeposit: {
nextRoute = ImplicitAccountCreationRoute.FundConfirmation
break
}
case ImplicitAccountCreationRoute.FundConfirmation: {
nextRoute = ImplicitAccountCreationRoute.AccountCreation
break
}
case ImplicitAccountCreationRoute.AccountCreation: {
get(appRouter).next()
return
}
}
this.setNext(nextRoute)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export enum ImplicitAccountCreationRoute {
Init = 'init',
OneTimeDeposit = 'OneTimeDeposit',
FundConfirmation = 'FundConfirmation',
AccountCreation = 'AccountCreation',
}
4 changes: 4 additions & 0 deletions packages/desktop/views/dashboard/wallet/index.js
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
export { default as Wallet } from './Wallet.svelte'

export * from './implicit-account-creation-router'
export * from './implicit-account-creation.enum'
export * from './views'
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<script lang="ts">
import { implicitAccountCreationRoute, ImplicitAccountCreationRoute } from '../index'
import { InitView, AccountCreation, FundConfirmation, OneTimeDeposit } from '.'
import { Text, TextType } from 'shared/components'
import { localize } from '@core/i18n'

const IMPLICIT_ACCOUNT_STEPS = Object.keys(ImplicitAccountCreationRoute).slice(1)
</script>

<implicit-account-creation-view class="flex flex-col w-full h-full pt-5 px-60 pb-12 items-center justify-between">
<box-content class="flex flex-col w-full h-full pt-9 px-8 pb-12 items-center justify-between rounded-2xl">
<Text type={TextType.h2}>{localize('views.implicit-account-creation.title')}</Text>
{#if $implicitAccountCreationRoute === ImplicitAccountCreationRoute.Init}
<InitView />
{:else if $implicitAccountCreationRoute === ImplicitAccountCreationRoute.OneTimeDeposit}
<OneTimeDeposit />
{:else if $implicitAccountCreationRoute === ImplicitAccountCreationRoute.FundConfirmation}
<FundConfirmation />
{:else if $implicitAccountCreationRoute === ImplicitAccountCreationRoute.AccountCreation}
<AccountCreation />
{/if}
</box-content>
{#if $implicitAccountCreationRoute !== ImplicitAccountCreationRoute.Init}
<div class="flex flex-row justify-center space-x-2.5">
{#each IMPLICIT_ACCOUNT_STEPS as step}
<div
class="w-2.5 h-2.5 rounded-full {step === $implicitAccountCreationRoute
? 'bg-blue-500'
: 'bg-blue-200'}"
/>
{/each}
</div>
{/if}
</implicit-account-creation-view>

<style lang="scss">
box-content {
box-shadow: 0px 1px 4px 0px rgba(23, 27, 37, 0.04);
}
</style>

This file was deleted.

39 changes: 39 additions & 0 deletions packages/desktop/views/dashboard/wallet/views/WalletView.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<script lang="ts">
import { AssetList, Overflow, Pane, ReceiveAddressButton } from '@ui'
import { AccountSummary, AccountActivity, SendButton } from '@components'
import { selectedWalletAssets } from '@core/wallet'
import { selectedWallet } from '@core/wallet/stores'
import features from '@features/features'
</script>

{#if $selectedWallet}
{#key $selectedWallet?.index}
<div class="h-full grid grid-cols-3 gap-x-4 min-h-0 min-w-0 max-w-7xl">
<div class="flex flex-col space-y-4">
<Pane overflow={Overflow.Visible}>
{#if features?.wallet?.accountSummary?.enabled}
<AccountSummary />
{/if}
</Pane>
<Pane>
<div class="flex flex-col space-y-6">
{#if features?.wallet?.sendAndReceive?.enabled}
<SendButton />
<ReceiveAddressButton />
{/if}
</div>
</Pane>
</div>
<Pane>
{#if features?.wallet?.assets?.enabled}
<AssetList assets={$selectedWalletAssets} />
{/if}
</Pane>
<Pane>
{#if features?.wallet?.activityHistory?.enabled}
<AccountActivity />
{/if}
</Pane>
</div>
{/key}
{/if}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h1>AccountCreation</h1>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h1>FundConfirmation</h1>
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<script lang="ts">
import { Button, FontWeight, Text, TextType } from 'shared/components'
import { localize } from '@core/i18n'
import { implicitAccountCreationRouter, ImplicitAccountCreationRoute } from '../../index'

interface IStep {
title: string
description: string
image: string
}

const NUMBER_OF_STEPS = Object.keys(ImplicitAccountCreationRoute).slice(1).length
const MAIN_VIEW_STEPS: IStep[] = new Array(NUMBER_OF_STEPS).fill(null).map((_, index) => {
const stepNumber = index + 1
return {
title: localize(`views.implicit-account-creation.steps.step${stepNumber}.title`),
description: localize(`views.implicit-account-creation.steps.step${stepNumber}.body`),
image: `assets/illustrations/implicit-account-creation/step${stepNumber}.svg`,
}
})

function onContinueClick(): void {
$implicitAccountCreationRouter.next()
}
</script>

<steps-wrapper class="flex space-x-4">
{#each MAIN_VIEW_STEPS as step}
<step-content class="flex flex-col items-center space-y-8">
<img src={step.image} alt={step.title} />
<div class="flex flex-col text-center px-4 space-y-2">
<Text
type={TextType.h5}
fontSize="15"
color="blue-700"
darkColor="blue-700"
fontWeight={FontWeight.semibold}>{step.title}</Text
>
<Text type={TextType.h3} fontWeight={FontWeight.semibold}>{step.description}</Text>
</div>
</step-content>
{/each}
</steps-wrapper>
<Button onClick={onContinueClick}>{localize('views.implicit-account-creation.action')}</Button>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h1>OneTimeDeposit</h1>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export { default as OneTimeDeposit } from './OneTimeDeposit.svelte'
export { default as FundConfirmation } from './FundConfirmation.svelte'
export { default as AccountCreation } from './AccountCreation.svelte'
export { default as InitView } from './InitView.svelte'
5 changes: 4 additions & 1 deletion packages/desktop/views/dashboard/wallet/views/index.js
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
export { default as WalletMainView } from './WalletMainView.svelte'
export { default as ImplicitAccountCreationView } from './ImplicitAccountCreationView.svelte'
export { default as WalletView } from './WalletView.svelte'

export * from './implicit-account-creation-multistep'
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading