merge account into wallet

Author: marc2332

packages/desktop/components/popups/CreateAccountPopup.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
     import { onMount } from 'svelte'
     import { Button, ColorPicker, Input, Text, TextType } from '@ui'
-    import { getRandomAccountColor, tryCreateAdditionalAccount, validateAccountName } from '@core/account'
+    import { getRandomWalletColor, tryCreateAdditionalAccount, validateAccountName } from '@core/account'
     import { handleError } from '@core/error/handlers/handleError'
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth } from '@core/profile'
@@ -10,7 +10,7 @@
 
     export let accountAlias = ''
     export let error: string
-    export let color = getRandomAccountColor()
+    export let color = getRandomWalletColor()
     export let isBusy = false
     export let _onMount: (..._: any[]) => Promise<void> = async () => {}
 

packages/shared/components/AssetIcon.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
     import { AnimationRenderer } from '@auxiliary/animation'
     import { Icon as IconEnum, NETWORK_ICON_SVG } from '@auxiliary/icon'
-    import { getIconColorFromString } from '@core/account'
+    import { getIconColorFromString } from '@core/wallet/utils'
     import { COIN_TYPE, NetworkId } from '@core/network'
     import { isBright } from '@core/utils'
     import { ANIMATED_TOKEN_IDS, getAssetInitials, IPersistedAsset, TokenStandard } from '@core/wallet'

packages/shared/components/ProfilePicture.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { getIconColorFromString } from '@core/account/utils'
+    import { getIconColorFromString } from '@core/wallet/utils'
     import { IPersistedProfile } from '@core/profile'
     import { getInitials } from '@core/utils'
     import { NftMedia, Text, FontWeight, Size } from '@ui'

packages/shared/components/inputs/RecipientInput.svelte

@@ -1,14 +1,12 @@
 <script lang="ts">
     import { Modal, SelectorInput, IOption, ColoredCircle } from 'shared/components'
-    import { selectedAccountIndex } from '@core/account/stores'
-    import { getAccountColorById } from '@core/account/utils'
     import { localize } from '@core/i18n'
-    import { visibleActiveAccounts } from '@core/profile/stores'
     import { validateBech32Address, validateEthereumAddress } from '@core/utils/crypto'
     import { Subject } from '@core/wallet/types'
     import { getSubjectFromAddress } from '@core/wallet/utils'
     import { Layer1RecipientError } from '@core/layer-2/errors'
-    import { getNetworkHrp } from '@core/profile'
+    import { getNetworkHrp, getWalletColorById, visibleActiveWallets } from '@core/profile'
+    import { selectedWalletId } from '@core/wallet/stores'
 
     export let recipient: Subject
     export let disabled = false
@@ -47,20 +45,20 @@
                 throw new Error(localize('error.send.recipientRequired'))
             }
 
-            Promise.resolve()
+            return Promise.resolve()
         } catch (err) {
             error = err?.message ?? err
             return Promise.reject(error)
         }
     }
 
     function getLayer1AccountOptions(): IOption[] {
-        return $visibleActiveAccounts
-            .filter((account) => account.index !== $selectedAccountIndex)
-            .map((account) => ({
-                id: account.index,
-                key: account.name,
-                value: account.depositAddress,
+        return $visibleActiveWallets
+            .filter((wallet) => wallet.id !== $selectedWalletId)
+            .map((wallet) => ({
+                id: wallet.id,
+                key: wallet.name,
+                value: wallet.depositAddress,
             }))
     }
 </script>
@@ -78,6 +76,6 @@
     let:option
 >
     {#if option?.id}
-        <ColoredCircle color={getAccountColorById(option?.id)} />
+        <ColoredCircle color={getWalletColorById(option?.id)} />
     {/if}
 </SelectorInput>

packages/shared/components/interfaces/option.interface.ts

@@ -1,5 +1,5 @@
 export interface IOption {
-    id?: number
+    id?: string
     key?: string
     value?: string
 }