From af504e3e4ee9176259af5d27029512c92161a028 Mon Sep 17 00:00:00 2001
From: evavirseda <evirseda@boxfish.studio>
Date: Thu, 4 Jan 2024 12:58:02 +0100
Subject: [PATCH] feat: update naming and improve code

---
 .../ImplicitAccountCreationRouterView.svelte  |  2 +-
 .../views/implicit-account-creation/index.js  |  3 ++
 .../multi-step/AccountCreation.svelte         |  1 +
 .../multi-step/FundConfirmation.svelte        |  1 +
 .../multi-step/GenerateMana.svelte            |  1 -
 .../multi-step/MultiStep.svelte               |  6 ++--
 .../multi-step/OneTimeDeposit.svelte          |  1 +
 .../multi-step/ShowOneTimeAddress.svelte      |  1 -
 .../multi-step/SignTransaction.svelte         |  1 -
 .../multi-step/index.js                       |  4 +++
 .../multi-step/index.ts                       |  4 ---
 .../{ => views}/activate/MainView.svelte      | 32 +++++++------------
 .../index.ts => views/activate/index.js}      |  0
 .../implicit-account-creation/views/index.js  |  1 +
 .../step1.svg}                                |  0
 .../step2.svg}                                |  0
 .../step3.svg}                                |  0
 .../account/enums/account-state.enum.ts       |  5 ---
 .../enums/account-state.enum.ts               |  5 +++
 .../enums/index.ts                            |  0
 .../index.ts                                  |  0
 packages/shared/locales/en.json               |  2 +-
 22 files changed, 33 insertions(+), 37 deletions(-)
 create mode 100644 packages/desktop/views/implicit-account-creation/multi-step/AccountCreation.svelte
 create mode 100644 packages/desktop/views/implicit-account-creation/multi-step/FundConfirmation.svelte
 delete mode 100644 packages/desktop/views/implicit-account-creation/multi-step/GenerateMana.svelte
 create mode 100644 packages/desktop/views/implicit-account-creation/multi-step/OneTimeDeposit.svelte
 delete mode 100644 packages/desktop/views/implicit-account-creation/multi-step/ShowOneTimeAddress.svelte
 delete mode 100644 packages/desktop/views/implicit-account-creation/multi-step/SignTransaction.svelte
 create mode 100644 packages/desktop/views/implicit-account-creation/multi-step/index.js
 delete mode 100644 packages/desktop/views/implicit-account-creation/multi-step/index.ts
 rename packages/desktop/views/implicit-account-creation/{ => views}/activate/MainView.svelte (66%)
 rename packages/desktop/views/implicit-account-creation/{activate/index.ts => views/activate/index.js} (100%)
 create mode 100644 packages/desktop/views/implicit-account-creation/views/index.js
 rename packages/shared/assets/illustrations/{implicit-account/show-one-time-address.svg => implicit-account-creation/step1.svg} (100%)
 rename packages/shared/assets/illustrations/{implicit-account/generate-mana.svg => implicit-account-creation/step2.svg} (100%)
 rename packages/shared/assets/illustrations/{implicit-account/sign-transaction.svg => implicit-account-creation/step3.svg} (100%)
 delete mode 100644 packages/shared/lib/contexts/account/enums/account-state.enum.ts
 create mode 100644 packages/shared/lib/contexts/implicit-account-creation/enums/account-state.enum.ts
 rename packages/shared/lib/contexts/{account => implicit-account-creation}/enums/index.ts (100%)
 rename packages/shared/lib/contexts/{account => implicit-account-creation}/index.ts (100%)

diff --git a/packages/desktop/views/implicit-account-creation/ImplicitAccountCreationRouterView.svelte b/packages/desktop/views/implicit-account-creation/ImplicitAccountCreationRouterView.svelte
index f6e7f1f6fe9..43373fe208c 100644
--- a/packages/desktop/views/implicit-account-creation/ImplicitAccountCreationRouterView.svelte
+++ b/packages/desktop/views/implicit-account-creation/ImplicitAccountCreationRouterView.svelte
@@ -3,7 +3,7 @@
     import { ImplicitAccountCreationRoute, implicitAccountCreationRoute } from '@core/router'
     import features from '@features/features'
     import { Transition } from 'shared/components'
-    import { MainView } from './activate'
+    import { MainView } from './views'
 
     $: if (features.analytics.implicitAccountCreationRoute.enabled && $implicitAccountCreationRoute)
         Platform.trackEvent('implicit-account-route', { route: $implicitAccountCreationRoute })
diff --git a/packages/desktop/views/implicit-account-creation/index.js b/packages/desktop/views/implicit-account-creation/index.js
index 671b10b60ca..2f35e2f350f 100644
--- a/packages/desktop/views/implicit-account-creation/index.js
+++ b/packages/desktop/views/implicit-account-creation/index.js
@@ -1 +1,4 @@
 export { default as ImplicitAccountCreationRouterView } from './ImplicitAccountCreationRouterView.svelte'
+
+export * from './views'
+export * from './multi-step'
diff --git a/packages/desktop/views/implicit-account-creation/multi-step/AccountCreation.svelte b/packages/desktop/views/implicit-account-creation/multi-step/AccountCreation.svelte
new file mode 100644
index 00000000000..e7372a8d642
--- /dev/null
+++ b/packages/desktop/views/implicit-account-creation/multi-step/AccountCreation.svelte
@@ -0,0 +1 @@
+<h1>AccountCreation</h1>
diff --git a/packages/desktop/views/implicit-account-creation/multi-step/FundConfirmation.svelte b/packages/desktop/views/implicit-account-creation/multi-step/FundConfirmation.svelte
new file mode 100644
index 00000000000..896db9eff77
--- /dev/null
+++ b/packages/desktop/views/implicit-account-creation/multi-step/FundConfirmation.svelte
@@ -0,0 +1 @@
+<h1>FundConfirmation</h1>
diff --git a/packages/desktop/views/implicit-account-creation/multi-step/GenerateMana.svelte b/packages/desktop/views/implicit-account-creation/multi-step/GenerateMana.svelte
deleted file mode 100644
index d7dae7e5f41..00000000000
--- a/packages/desktop/views/implicit-account-creation/multi-step/GenerateMana.svelte
+++ /dev/null
@@ -1 +0,0 @@
-<h1>GenerateMana</h1>
diff --git a/packages/desktop/views/implicit-account-creation/multi-step/MultiStep.svelte b/packages/desktop/views/implicit-account-creation/multi-step/MultiStep.svelte
index 2aa61f93e9b..0d4fb0634bb 100644
--- a/packages/desktop/views/implicit-account-creation/multi-step/MultiStep.svelte
+++ b/packages/desktop/views/implicit-account-creation/multi-step/MultiStep.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-    import { AccountState } from '@contexts/account'
+    import { ImplicitAccountCreationState } from '@contexts/implicit-account-creation'
 
-    const IMPLICIT_ACCOUNT_STEPS: AccountState[] = Object.values(AccountState)
+    const IMPLICIT_ACCOUNT_STEPS: ImplicitAccountCreationState[] = Object.values(ImplicitAccountCreationState)
 
-    let activeState: AccountState | null = null
+    let activeState: ImplicitAccountCreationState | null = null
     let onNext: () => Promise<boolean>
     let currentStep: number = 0
     let activeComponent
diff --git a/packages/desktop/views/implicit-account-creation/multi-step/OneTimeDeposit.svelte b/packages/desktop/views/implicit-account-creation/multi-step/OneTimeDeposit.svelte
new file mode 100644
index 00000000000..03648fe3fac
--- /dev/null
+++ b/packages/desktop/views/implicit-account-creation/multi-step/OneTimeDeposit.svelte
@@ -0,0 +1 @@
+<h1>OneTimeDeposit</h1>
diff --git a/packages/desktop/views/implicit-account-creation/multi-step/ShowOneTimeAddress.svelte b/packages/desktop/views/implicit-account-creation/multi-step/ShowOneTimeAddress.svelte
deleted file mode 100644
index 3059779aa37..00000000000
--- a/packages/desktop/views/implicit-account-creation/multi-step/ShowOneTimeAddress.svelte
+++ /dev/null
@@ -1 +0,0 @@
-<h1>ShowOneTimeAddress</h1>
diff --git a/packages/desktop/views/implicit-account-creation/multi-step/SignTransaction.svelte b/packages/desktop/views/implicit-account-creation/multi-step/SignTransaction.svelte
deleted file mode 100644
index 7a8be6edcdb..00000000000
--- a/packages/desktop/views/implicit-account-creation/multi-step/SignTransaction.svelte
+++ /dev/null
@@ -1 +0,0 @@
-<h1>SignTransaction</h1>
diff --git a/packages/desktop/views/implicit-account-creation/multi-step/index.js b/packages/desktop/views/implicit-account-creation/multi-step/index.js
new file mode 100644
index 00000000000..1364085b303
--- /dev/null
+++ b/packages/desktop/views/implicit-account-creation/multi-step/index.js
@@ -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 MultiStep } from './MultiStep.svelte'
diff --git a/packages/desktop/views/implicit-account-creation/multi-step/index.ts b/packages/desktop/views/implicit-account-creation/multi-step/index.ts
deleted file mode 100644
index 21ed76473ef..00000000000
--- a/packages/desktop/views/implicit-account-creation/multi-step/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as ShowOneTimeAddress } from './ShowOneTimeAddress.svelte'
-export { default as GenerateMana } from './GenerateMana.svelte'
-export { default as SignTransaction } from './SignTransaction.svelte'
-export { default as MultiStep } from './MultiStep.svelte'
diff --git a/packages/desktop/views/implicit-account-creation/activate/MainView.svelte b/packages/desktop/views/implicit-account-creation/views/activate/MainView.svelte
similarity index 66%
rename from packages/desktop/views/implicit-account-creation/activate/MainView.svelte
rename to packages/desktop/views/implicit-account-creation/views/activate/MainView.svelte
index bb7cec55e1c..342e9e1c6f1 100644
--- a/packages/desktop/views/implicit-account-creation/activate/MainView.svelte
+++ b/packages/desktop/views/implicit-account-creation/views/activate/MainView.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Button, FontWeight, Text, TextType } from 'shared/components'
-    import { MultiStep } from '../multi-step'
+    import { MultiStep } from '../../multi-step'
     import { localize } from '@core/i18n'
 
     interface IStep {
@@ -9,23 +9,15 @@
         image: string
     }
 
-    const MAIN_VIEW_STEPS: IStep[] = [
-        {
-            title: localize('views.implicit-account.steps.step1.title'),
-            description: localize('views.implicit-account.steps.step1.body'),
-            image: 'assets/illustrations/implicit-account/show-one-time-address.svg',
-        },
-        {
-            title: localize('views.implicit-account.steps.step2.title'),
-            description: localize('views.implicit-account.steps.step2.body'),
-            image: 'assets/illustrations/implicit-account/generate-mana.svg',
-        },
-        {
-            title: localize('views.implicit-account.steps.step3.title'),
-            description: localize('views.implicit-account.steps.step3.body'),
-            image: 'assets/illustrations/implicit-account/sign-transaction.svg',
-        },
-    ]
+    const NUMBER_OF_STEPS = Object.keys(localize('views.implicit-account-creation.steps')).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`,
+        }
+    })
 
     let startProccess = false
 
@@ -36,7 +28,7 @@
 
 <section 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.title')}</Text>
+        <Text type={TextType.h2}>{localize('views.implicit-account-creation.title')}</Text>
         {#if !startProccess}
             <steps-wrapper class="flex space-x-4">
                 {#each MAIN_VIEW_STEPS as step}
@@ -55,7 +47,7 @@
                     </step-content>
                 {/each}
             </steps-wrapper>
-            <Button onClick={startMultiStepProccess}>{localize('views.implicit-account.action')}</Button>
+            <Button onClick={startMultiStepProccess}>{localize('views.implicit-account-creation.action')}</Button>
         {:else}
             <MultiStep />
         {/if}
diff --git a/packages/desktop/views/implicit-account-creation/activate/index.ts b/packages/desktop/views/implicit-account-creation/views/activate/index.js
similarity index 100%
rename from packages/desktop/views/implicit-account-creation/activate/index.ts
rename to packages/desktop/views/implicit-account-creation/views/activate/index.js
diff --git a/packages/desktop/views/implicit-account-creation/views/index.js b/packages/desktop/views/implicit-account-creation/views/index.js
new file mode 100644
index 00000000000..281797a11ca
--- /dev/null
+++ b/packages/desktop/views/implicit-account-creation/views/index.js
@@ -0,0 +1 @@
+export * from './activate'
diff --git a/packages/shared/assets/illustrations/implicit-account/show-one-time-address.svg b/packages/shared/assets/illustrations/implicit-account-creation/step1.svg
similarity index 100%
rename from packages/shared/assets/illustrations/implicit-account/show-one-time-address.svg
rename to packages/shared/assets/illustrations/implicit-account-creation/step1.svg
diff --git a/packages/shared/assets/illustrations/implicit-account/generate-mana.svg b/packages/shared/assets/illustrations/implicit-account-creation/step2.svg
similarity index 100%
rename from packages/shared/assets/illustrations/implicit-account/generate-mana.svg
rename to packages/shared/assets/illustrations/implicit-account-creation/step2.svg
diff --git a/packages/shared/assets/illustrations/implicit-account/sign-transaction.svg b/packages/shared/assets/illustrations/implicit-account-creation/step3.svg
similarity index 100%
rename from packages/shared/assets/illustrations/implicit-account/sign-transaction.svg
rename to packages/shared/assets/illustrations/implicit-account-creation/step3.svg
diff --git a/packages/shared/lib/contexts/account/enums/account-state.enum.ts b/packages/shared/lib/contexts/account/enums/account-state.enum.ts
deleted file mode 100644
index e117134ea81..00000000000
--- a/packages/shared/lib/contexts/account/enums/account-state.enum.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export enum AccountState {
-    SHOW_ONE_TIME_ADDRESS = 'ShowOneTimeAddress',
-    GENERATE_MANA = 'GenerateMana',
-    SIGN_TRANSACTION = 'SignTransaction',
-}
diff --git a/packages/shared/lib/contexts/implicit-account-creation/enums/account-state.enum.ts b/packages/shared/lib/contexts/implicit-account-creation/enums/account-state.enum.ts
new file mode 100644
index 00000000000..be3b658f328
--- /dev/null
+++ b/packages/shared/lib/contexts/implicit-account-creation/enums/account-state.enum.ts
@@ -0,0 +1,5 @@
+export enum ImplicitAccountCreationState {
+    ONE_TIME_DEPOSIT = 'OneTimeDeposit',
+    FUND_CONFIRMATION = 'FundConfirmation',
+    ACCOUNT_CREATION = 'AccountCreation',
+}
diff --git a/packages/shared/lib/contexts/account/enums/index.ts b/packages/shared/lib/contexts/implicit-account-creation/enums/index.ts
similarity index 100%
rename from packages/shared/lib/contexts/account/enums/index.ts
rename to packages/shared/lib/contexts/implicit-account-creation/enums/index.ts
diff --git a/packages/shared/lib/contexts/account/index.ts b/packages/shared/lib/contexts/implicit-account-creation/index.ts
similarity index 100%
rename from packages/shared/lib/contexts/account/index.ts
rename to packages/shared/lib/contexts/implicit-account-creation/index.ts
diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
index 7c2fa6ef4d9..1cb995a85b7 100644
--- a/packages/shared/locales/en.json
+++ b/packages/shared/locales/en.json
@@ -656,7 +656,7 @@
                 "body": "From the tokens users received through an IOTA token airdrop, 10% are being available to users immediately at the genesis of the IOTA Stardust network. The rest is gradually unlocked over the course of two years in equal proportion happening every two weeks."
             }
         },
-        "implicit-account":{
+        "implicit-account-creation":{
             "title": "Activate Account",
             "steps" : {
                 "step1": {