From 313f9a92275177a904edd95a30622c9ef58ce0b8 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 28 Nov 2023 12:58:11 +0100
Subject: [PATCH 1/9] feat: Add address generation and history checking
 (chronicle) with fixed step algo to AddressHistoryPopup

---
 .../popups/AddressHistoryPopup.svelte         | 140 ++++++++++++++++--
 .../constants/chronicle-urls.constant.ts      |   9 ++
 2 files changed, 139 insertions(+), 10 deletions(-)
 create mode 100644 packages/shared/lib/core/network/constants/chronicle-urls.constant.ts

diff --git a/packages/desktop/components/popups/AddressHistoryPopup.svelte b/packages/desktop/components/popups/AddressHistoryPopup.svelte
index 49de27f2238..e786fa3f4eb 100644
--- a/packages/desktop/components/popups/AddressHistoryPopup.svelte
+++ b/packages/desktop/components/popups/AddressHistoryPopup.svelte
@@ -1,25 +1,131 @@
 <script lang="ts">
+    import { onMount } from 'svelte'
+    import { getProfileManager } from '@core/profile-manager/stores'
+    import { checkActiveProfileAuth, getActiveProfile } from '@core/profile'
+    import { fetchWithTimeout } from '@core/nfts'
+    import { CHRONICLE_URLS } from '@core/network/constants/chronicle-urls.constant'
     import { getSelectedAccount } from '@core/account'
+    import {
+        Button,
+        FontWeight,
+        KeyValueBox,
+        Text,
+        TextType,
+        Spinner,
+    } from 'shared/components'
+    import VirtualList from '@sveltejs/svelte-virtual-list'
+    import { AccountAddress } from '@iota/sdk/out/types'
+    import { closePopup } from '@auxiliary/popup/actions/closePopup'
     import { localize } from '@core/i18n'
     import { truncateString } from '@core/utils'
-    import { AccountAddress } from '@iota/sdk/out/types'
-    import VirtualList from '@sveltejs/svelte-virtual-list'
-    import { FontWeight, KeyValueBox, Spinner, Text, TextType } from 'shared/components'
-    import { onMount } from 'svelte'
 
-    let addressList: AccountAddress[] | undefined = undefined
+    interface AddressHistory {
+        address: string,
+        items: [{
+            milestoneIndex: number,
+            milestoneTimestamp: number,
+            outputId: string,
+            isSpent: boolean
+        }]
+    }
+
+    const CHRONICLE_ROUTE = 'api/explorer/v2/ledger/updates/by-address/'
+
+    const account = getSelectedAccount()
+    const accountIndex = account.index
+    const network = getActiveProfile().network.id;
+    const chronicleEndpoints = CHRONICLE_URLS[network];
+    // TODO Care with the 0
+    const chronicleRoot = chronicleEndpoints[0]
+    const baseURL = `${chronicleRoot}${CHRONICLE_ROUTE}`
+
+    let knownAddresses: AccountAddress[] | undefined = undefined
+
+    let addressSearchIndex = 0
+    const foundAddresses: string[] = []
+    const isBusy = false
+
+    $: console.log('Network', network);
+    $: console.log('Chronicle', chronicleRoot);
+    $: console.log('Known addresses are:', knownAddresses);
 
     onMount(() => {
         getSelectedAccount()
             ?.addresses()
             .then((_addressList) => {
-                addressList = _addressList?.sort((a, b) => a.keyIndex - b.keyIndex) ?? []
+                knownAddresses = _addressList?.sort((a, b) => a.keyIndex - b.keyIndex) ?? []
             })
             .catch((err) => {
                 console.error(err)
-                addressList = []
+                knownAddresses = []
             })
     })
+
+    async function isAddressWithHistory(address: string): Promise<boolean> {
+        try {
+            const response = await fetchWithTimeout(`${baseURL}${address}`, 3, { method: 'GET' });
+            const addressHistory: AddressHistory = await response.json()
+            return addressHistory?.items?.length > 0
+        } catch (err) {
+            console.error(err)
+            return false;
+        }
+    }
+
+    const GENERATE_STEP = 10
+    async function generateAddresses(): Promise<string[]> {
+        console.debug('Generating...')
+        let generatedCount = 0;
+        const generatedAddresses = [];
+        while (generatedCount < GENERATE_STEP) {
+            const address = await getProfileManager().generateEd25519Address(
+                accountIndex,
+                addressSearchIndex
+            )
+
+            addressSearchIndex++
+
+            if (knownAddresses.map(accountAddress => accountAddress.address).includes(address)) {
+                continue
+            }
+
+            generatedAddresses.push(address)
+            generatedCount++
+        }
+
+        return generatedAddresses
+    }
+
+    async function search(): Promise<void> {
+        const isUnlocked = await unlock
+        if (isUnlocked) {
+            const nextAddressesToCheck = await generateAddresses()
+            console.debug('Generated addresses:', nextAddressesToCheck)
+
+            for (const addressToCheck of nextAddressesToCheck) {
+                const hasHistory = await isAddressWithHistory(addressToCheck)
+                if (hasHistory) {
+                    foundAddresses.push(addressToCheck)
+                }
+            }
+
+            console.debug('Found addresses', foundAddresses)
+        }
+    }
+
+    const unlock = new Promise<boolean>((resolve) => {
+        const onSuccess: () => Promise<void> = () => {
+            resolve(true)
+            return Promise.resolve()
+        }
+        const onCancel: () => void = () => resolve(false)
+        const config = { stronghold: true, ledger: true }
+        checkActiveProfileAuth(onSuccess, config, onCancel)
+    })
+
+    function onCancelClick(): void {
+        closePopup()
+    }
 </script>
 
 <div class="flex flex-col space-y-6">
@@ -27,10 +133,10 @@
         {localize('popups.addressHistory.title')}
     </Text>
     <Text fontSize="15" color="gray-700" classes="text-left">{localize('popups.addressHistory.disclaimer')}</Text>
-    {#if addressList}
-        {#if addressList.length > 0}
+    {#if knownAddresses}
+        {#if knownAddresses.length > 0}
             <div class="w-full flex-col space-y-2 virtual-list-wrapper">
-                <VirtualList items={addressList} let:item>
+                <VirtualList items={knownAddresses} let:item>
                     <div class="mb-1">
                         <KeyValueBox
                             isCopyable
@@ -58,6 +164,20 @@
         </div>
     {/if}
 </div>
+<div class="flex flex-row flex-nowrap w-full space-x-4 mt-6">
+    <Button classes="w-full" outline onClick={onCancelClick} disabled={isBusy}>
+        {localize('actions.cancel')}
+    </Button>
+    <Button
+        classes="w-full"
+        onClick={search}
+        disabled={isBusy}
+        {isBusy}
+        busyMessage={localize('actions.searching')}
+    >
+        {localize('actions.search')}
+    </Button>
+</div>
 
 <style lang="scss">
     .virtual-list-wrapper :global(svelte-virtual-list-viewport) {
diff --git a/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts b/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts
new file mode 100644
index 00000000000..5b68b75752e
--- /dev/null
+++ b/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts
@@ -0,0 +1,9 @@
+import { NetworkId } from '../enums'
+
+export const CHRONICLE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = {
+    [NetworkId.Iota]: ['https://chronicle.stardust-mainnet.iotaledger.net/'],
+    [NetworkId.IotaAlphanet]: ['https://chronicle.alphanet.iotaledger.net'],
+    [NetworkId.Shimmer]: ['https://chronicle.shimmer.network'],
+    [NetworkId.Testnet]: ['https://chronicle.testnet.shimmer.network/'],
+}
+

From 5c90e1601515065c935509edea94635dc770be51 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 29 Nov 2023 11:23:12 +0100
Subject: [PATCH 2/9] feat: Implement search algo using "search gap" Add some
 error handing

---
 .../popups/AddressHistoryPopup.svelte         | 157 ++++++++++--------
 .../buildAccountStateAndPersistedData.ts      |   2 +
 .../persisted-account-data.interface.ts       |   3 +-
 .../constants/chronicle-urls.constant.ts      |   1 +
 4 files changed, 92 insertions(+), 71 deletions(-)

diff --git a/packages/desktop/components/popups/AddressHistoryPopup.svelte b/packages/desktop/components/popups/AddressHistoryPopup.svelte
index e786fa3f4eb..2c74ebd8583 100644
--- a/packages/desktop/components/popups/AddressHistoryPopup.svelte
+++ b/packages/desktop/components/popups/AddressHistoryPopup.svelte
@@ -1,18 +1,11 @@
 <script lang="ts">
     import { onMount } from 'svelte'
     import { getProfileManager } from '@core/profile-manager/stores'
-    import { checkActiveProfileAuth, getActiveProfile } from '@core/profile'
+    import { checkActiveProfileAuth, getActiveProfile, updateAccountPersistedDataOnActiveProfile } from '@core/profile'
     import { fetchWithTimeout } from '@core/nfts'
-    import { CHRONICLE_URLS } from '@core/network/constants/chronicle-urls.constant'
+    import { CHRONICLE_URLS, CHRONICLE_ADDRESS_HISTORY_ROUTE } from '@core/network/constants/chronicle-urls.constant'
     import { getSelectedAccount } from '@core/account'
-    import {
-        Button,
-        FontWeight,
-        KeyValueBox,
-        Text,
-        TextType,
-        Spinner,
-    } from 'shared/components'
+    import { Button, Error, FontWeight, KeyValueBox, Text, TextType, Spinner } from 'shared/components'
     import VirtualList from '@sveltejs/svelte-virtual-list'
     import { AccountAddress } from '@iota/sdk/out/types'
     import { closePopup } from '@auxiliary/popup/actions/closePopup'
@@ -20,96 +13,117 @@
     import { truncateString } from '@core/utils'
 
     interface AddressHistory {
-        address: string,
-        items: [{
-            milestoneIndex: number,
-            milestoneTimestamp: number,
-            outputId: string,
-            isSpent: boolean
-        }]
+        address: string
+        items: [
+            {
+                milestoneIndex: number
+                milestoneTimestamp: number
+                outputId: string
+                isSpent: boolean
+            }
+        ]
     }
 
-    const CHRONICLE_ROUTE = 'api/explorer/v2/ledger/updates/by-address/'
-
     const account = getSelectedAccount()
     const accountIndex = account.index
-    const network = getActiveProfile().network.id;
-    const chronicleEndpoints = CHRONICLE_URLS[network];
-    // TODO Care with the 0
-    const chronicleRoot = chronicleEndpoints[0]
-    const baseURL = `${chronicleRoot}${CHRONICLE_ROUTE}`
+    const network = getActiveProfile().network.id
+    const ADDRESS_GAP_LIMIT = 20
 
+    let error: string = ''
+    let searchURL: string
     let knownAddresses: AccountAddress[] | undefined = undefined
-
-    let addressSearchIndex = 0
-    const foundAddresses: string[] = []
-    const isBusy = false
-
-    $: console.log('Network', network);
-    $: console.log('Chronicle', chronicleRoot);
-    $: console.log('Known addresses are:', knownAddresses);
+    let searchAddressStartIndex = 0
+    let currendSearchGap = 0
+    let isBusy = false
 
     onMount(() => {
-        getSelectedAccount()
-            ?.addresses()
-            .then((_addressList) => {
-                knownAddresses = _addressList?.sort((a, b) => a.keyIndex - b.keyIndex) ?? []
-            })
-            .catch((err) => {
-                console.error(err)
-                knownAddresses = []
-            })
+        knownAddresses = getSelectedAccount().knownAddresses
+        if (knownAddresses === undefined) {
+            getSelectedAccount()
+                ?.addresses()
+                .then((_addressList) => {
+                    knownAddresses = _addressList ?? []
+                    updateAccountPersistedDataOnActiveProfile(accountIndex, { knownAddresses })
+                })
+                .catch((err) => {
+                    console.error(err)
+                })
+        }
+
+        if (CHRONICLE_URLS[network] && CHRONICLE_URLS[network].length > 0) {
+            const chronicleRoot = CHRONICLE_URLS[network][0]
+            searchURL = `${chronicleRoot}${CHRONICLE_ADDRESS_HISTORY_ROUTE}`
+        } else {
+            error = 'Chronicle not configured'
+        }
     })
 
     async function isAddressWithHistory(address: string): Promise<boolean> {
         try {
-            const response = await fetchWithTimeout(`${baseURL}${address}`, 3, { method: 'GET' });
+            const response = await fetchWithTimeout(`${searchURL}${address}`, 3, { method: 'GET' })
             const addressHistory: AddressHistory = await response.json()
             return addressHistory?.items?.length > 0
         } catch (err) {
             console.error(err)
-            return false;
+            error = 'Couldn\'t fetch address history'
         }
     }
 
-    const GENERATE_STEP = 10
-    async function generateAddresses(): Promise<string[]> {
-        console.debug('Generating...')
-        let generatedCount = 0;
-        const generatedAddresses = [];
-        while (generatedCount < GENERATE_STEP) {
-            const address = await getProfileManager().generateEd25519Address(
-                accountIndex,
-                addressSearchIndex
-            )
-
-            addressSearchIndex++
-
-            if (knownAddresses.map(accountAddress => accountAddress.address).includes(address)) {
-                continue
-            }
+    async function generateNextUnknownAddress(): Promise<[string, number]> {
+        let nextUnknownAddress: string
 
-            generatedAddresses.push(address)
-            generatedCount++
+        try {
+            do {
+                nextUnknownAddress = await getProfileManager().generateEd25519Address(
+                    accountIndex,
+                    searchAddressStartIndex
+                )
+
+                searchAddressStartIndex++
+            } while (knownAddresses.map((accountAddress) => accountAddress.address).includes(nextUnknownAddress))
+        } catch (err) {
+            console.error(err)
+            error = 'Couldn\'t generate a new address'
         }
 
-        return generatedAddresses
+        return [nextUnknownAddress, searchAddressStartIndex - 1]
     }
 
     async function search(): Promise<void> {
+        currendSearchGap = 0
         const isUnlocked = await unlock
-        if (isUnlocked) {
-            const nextAddressesToCheck = await generateAddresses()
-            console.debug('Generated addresses:', nextAddressesToCheck)
 
-            for (const addressToCheck of nextAddressesToCheck) {
-                const hasHistory = await isAddressWithHistory(addressToCheck)
+        if (isUnlocked && !error) {
+            isBusy = true
+            while (currendSearchGap < ADDRESS_GAP_LIMIT) {
+                const [nextAddressToCheck, addressIndex] = await generateNextUnknownAddress()
+                if (!nextAddressToCheck) {
+                    isBusy = false
+                    break
+                }
+
+                const hasHistory = await isAddressWithHistory(nextAddressToCheck)
+                if (error) {
+                    isBusy = false
+                    break
+                }
+
                 if (hasHistory) {
-                    foundAddresses.push(addressToCheck)
+                    const accountAddress: AccountAddress = {
+                        address: nextAddressToCheck,
+                        keyIndex: addressIndex,
+                        internal: false,
+                        used: true,
+                    }
+
+                    knownAddresses.push(accountAddress)
+                } else {
+                    currendSearchGap++
                 }
             }
 
-            console.debug('Found addresses', foundAddresses)
+            updateAccountPersistedDataOnActiveProfile(accountIndex, { knownAddresses })
+            isBusy = false
         }
     }
 
@@ -163,6 +177,9 @@
             <Spinner />
         </div>
     {/if}
+    {#if error}
+        <Error {error} />
+    {/if}
 </div>
 <div class="flex flex-row flex-nowrap w-full space-x-4 mt-6">
     <Button classes="w-full" outline onClick={onCancelClick} disabled={isBusy}>
@@ -171,7 +188,7 @@
     <Button
         classes="w-full"
         onClick={search}
-        disabled={isBusy}
+        disabled={isBusy || !!error}
         {isBusy}
         busyMessage={localize('actions.searching')}
     >
diff --git a/packages/shared/lib/core/account/actions/buildAccountStateAndPersistedData.ts b/packages/shared/lib/core/account/actions/buildAccountStateAndPersistedData.ts
index f4581911cdc..b334da2f5d3 100644
--- a/packages/shared/lib/core/account/actions/buildAccountStateAndPersistedData.ts
+++ b/packages/shared/lib/core/account/actions/buildAccountStateAndPersistedData.ts
@@ -9,11 +9,13 @@ export async function buildAccountStateAndPersistedData(
     color?: string
 ): Promise<[IAccountState, IPersistedAccountData]> {
     const { index } = account.getMetadata()
+    const knownAddresses = await account.addresses()
     const persistedAccountData: IPersistedAccountData = {
         name: name || `${localize('general.account')} ${index + 1}`,
         color: color || getRandomAccountColor(),
         hidden: false,
         shouldRevote: false,
+        knownAddresses,
     }
     const accountState = await buildAccountState(account, persistedAccountData)
     return [accountState, persistedAccountData]
diff --git a/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts b/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
index f3052b8d0e1..bc9bfe38c3c 100644
--- a/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
@@ -1,4 +1,4 @@
-import { ParticipationEventId } from '@iota/sdk/out/types'
+import { AccountAddress, ParticipationEventId } from '@iota/sdk/out/types'
 
 export interface IPersistedAccountData {
     name: string
@@ -6,4 +6,5 @@ export interface IPersistedAccountData {
     hidden: boolean
     shouldRevote: boolean
     removedProposalIds?: ParticipationEventId[]
+    knownAddresses: AccountAddress[]
 }
diff --git a/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts b/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts
index 5b68b75752e..9d326071109 100644
--- a/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts
+++ b/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts
@@ -7,3 +7,4 @@ export const CHRONICLE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = {
     [NetworkId.Testnet]: ['https://chronicle.testnet.shimmer.network/'],
 }
 
+export const CHRONICLE_ADDRESS_HISTORY_ROUTE = 'api/explorer/v2/ledger/updates/by-address/'

From 4577abfc6bcbf174cde3cd8420d25e5cb146489e Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 29 Nov 2023 11:26:49 +0100
Subject: [PATCH 3/9] fix: Fix the chronicle URL constants for all networks

---
 .../lib/core/network/constants/chronicle-urls.constant.ts     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts b/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts
index 9d326071109..5aacc85cdbe 100644
--- a/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts
+++ b/packages/shared/lib/core/network/constants/chronicle-urls.constant.ts
@@ -2,8 +2,8 @@ import { NetworkId } from '../enums'
 
 export const CHRONICLE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = {
     [NetworkId.Iota]: ['https://chronicle.stardust-mainnet.iotaledger.net/'],
-    [NetworkId.IotaAlphanet]: ['https://chronicle.alphanet.iotaledger.net'],
-    [NetworkId.Shimmer]: ['https://chronicle.shimmer.network'],
+    [NetworkId.IotaAlphanet]: ['https://chronicle.alphanet.iotaledger.net/'],
+    [NetworkId.Shimmer]: ['https://chronicle.shimmer.network/'],
     [NetworkId.Testnet]: ['https://chronicle.testnet.shimmer.network/'],
 }
 

From 6c59a0c18af84467b7949c61980a4a7602a69f37 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Mon, 11 Dec 2023 15:46:12 +0100
Subject: [PATCH 4/9] feat: Localize error strings

---
 .../desktop/components/popups/AddressHistoryPopup.svelte    | 6 +++---
 packages/shared/locales/en.json                             | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/desktop/components/popups/AddressHistoryPopup.svelte b/packages/desktop/components/popups/AddressHistoryPopup.svelte
index 2c74ebd8583..994d3711772 100644
--- a/packages/desktop/components/popups/AddressHistoryPopup.svelte
+++ b/packages/desktop/components/popups/AddressHistoryPopup.svelte
@@ -54,7 +54,7 @@
             const chronicleRoot = CHRONICLE_URLS[network][0]
             searchURL = `${chronicleRoot}${CHRONICLE_ADDRESS_HISTORY_ROUTE}`
         } else {
-            error = 'Chronicle not configured'
+            error = localize('popups.addressHistory.errorNoChronicle')
         }
     })
 
@@ -65,7 +65,7 @@
             return addressHistory?.items?.length > 0
         } catch (err) {
             console.error(err)
-            error = 'Couldn\'t fetch address history'
+            error = localize('popups.addressHistory.errorFailedFetch')
         }
     }
 
@@ -83,7 +83,7 @@
             } while (knownAddresses.map((accountAddress) => accountAddress.address).includes(nextUnknownAddress))
         } catch (err) {
             console.error(err)
-            error = 'Couldn\'t generate a new address'
+            error = localize('popups.addressHistory.errorFailedGenerate')
         }
 
         return [nextUnknownAddress, searchAddressStartIndex - 1]
diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
index 03ac0d48f1f..876945022a1 100644
--- a/packages/shared/locales/en.json
+++ b/packages/shared/locales/en.json
@@ -1187,7 +1187,10 @@
             "title": "Address history",
             "disclaimer": "List of addresses with funds or known by this profile",
             "indexAndType": "{internal, select, true {Internal address} other {Deposit address}} {index}",
-            "internal": "Internal"
+            "internal": "Internal",
+            "errorNoChronicle": "Chronicle not configured",
+            "errorFailedFetch": "Couldn't fetch address history",
+            "errorFailedGenerate": "Couldn't generate a new address"
         }
     },
     "charts": {

From ba1990de856c0b5fc3f7552dfc3488f2a56c6e07 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Mon, 11 Dec 2023 15:50:42 +0100
Subject: [PATCH 5/9] feat: Add missing field in
 checkAndMigrateChrysalisProfiles.ts

---
 .../profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts
index 0f700da6207..2148e075869 100644
--- a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts
+++ b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts
@@ -48,6 +48,7 @@ export function checkAndMigrateChrysalisProfiles(): boolean {
                         color: account.color,
                         hidden: chrysalisProfile.hiddenAccounts?.includes(account.id) ?? false,
                         shouldRevote: false,
+                        knownAddresses: [],
                     }
 
                     if (chrysalisProfile.lastUsedAccountId === account.id) {

From ae1f83862fb691bd6ca111e655f04b502c6578a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Tue, 12 Dec 2023 15:14:06 +0100
Subject: [PATCH 6/9] fix: typo

---
 .../desktop/components/popups/AddressHistoryPopup.svelte  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/desktop/components/popups/AddressHistoryPopup.svelte b/packages/desktop/components/popups/AddressHistoryPopup.svelte
index 994d3711772..2daffa1310e 100644
--- a/packages/desktop/components/popups/AddressHistoryPopup.svelte
+++ b/packages/desktop/components/popups/AddressHistoryPopup.svelte
@@ -33,7 +33,7 @@
     let searchURL: string
     let knownAddresses: AccountAddress[] | undefined = undefined
     let searchAddressStartIndex = 0
-    let currendSearchGap = 0
+    let currentSearchGap = 0
     let isBusy = false
 
     onMount(() => {
@@ -90,12 +90,12 @@
     }
 
     async function search(): Promise<void> {
-        currendSearchGap = 0
+        currentSearchGap = 0
         const isUnlocked = await unlock
 
         if (isUnlocked && !error) {
             isBusy = true
-            while (currendSearchGap < ADDRESS_GAP_LIMIT) {
+            while (currentSearchGap < ADDRESS_GAP_LIMIT) {
                 const [nextAddressToCheck, addressIndex] = await generateNextUnknownAddress()
                 if (!nextAddressToCheck) {
                     isBusy = false
@@ -118,7 +118,7 @@
 
                     knownAddresses.push(accountAddress)
                 } else {
-                    currendSearchGap++
+                    currentSearchGap++
                 }
             }
 

From 739d9879f32e9ccc192a068d493d64aaf137b1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Tue, 12 Dec 2023 16:03:08 +0100
Subject: [PATCH 7/9] chore: improve error handling & add alphanet

---
 .../modals/AccountActionsMenu.svelte          |   2 +-
 .../popups/AddressHistoryPopup.svelte         | 125 +++++++-----------
 2 files changed, 46 insertions(+), 81 deletions(-)

diff --git a/packages/desktop/components/modals/AccountActionsMenu.svelte b/packages/desktop/components/modals/AccountActionsMenu.svelte
index 691e11a08bf..f2b1d3e0866 100644
--- a/packages/desktop/components/modals/AccountActionsMenu.svelte
+++ b/packages/desktop/components/modals/AccountActionsMenu.svelte
@@ -72,7 +72,7 @@
 <Modal bind:this={modal} {...$$restProps}>
     <account-actions-menu class="flex flex-col">
         <MenuItem icon={Icon.Doc} title={localize('actions.viewBalanceBreakdown')} onClick={onViewBalanceClick} />
-        {#if $activeProfile?.network?.id === NetworkId.Iota}
+        {#if $activeProfile?.network?.id === NetworkId.Iota || $activeProfile?.network?.id === NetworkId.IotaAlphanet}
             <MenuItem
                 icon={Icon.Timer}
                 title={localize('actions.viewAddressHistory')}
diff --git a/packages/desktop/components/popups/AddressHistoryPopup.svelte b/packages/desktop/components/popups/AddressHistoryPopup.svelte
index 2daffa1310e..9af98ad9258 100644
--- a/packages/desktop/components/popups/AddressHistoryPopup.svelte
+++ b/packages/desktop/components/popups/AddressHistoryPopup.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-    import { onMount } from 'svelte'
-    import { getProfileManager } from '@core/profile-manager/stores'
-    import { checkActiveProfileAuth, getActiveProfile, updateAccountPersistedDataOnActiveProfile } from '@core/profile'
-    import { fetchWithTimeout } from '@core/nfts'
-    import { CHRONICLE_URLS, CHRONICLE_ADDRESS_HISTORY_ROUTE } from '@core/network/constants/chronicle-urls.constant'
-    import { getSelectedAccount } from '@core/account'
-    import { Button, Error, FontWeight, KeyValueBox, Text, TextType, Spinner } from 'shared/components'
-    import VirtualList from '@sveltejs/svelte-virtual-list'
-    import { AccountAddress } from '@iota/sdk/out/types'
-    import { closePopup } from '@auxiliary/popup/actions/closePopup'
+    import { getSelectedAccount, selectedAccount } from '@core/account'
+    import { handleError } from '@core/error/handlers/handleError'
     import { localize } from '@core/i18n'
+    import { CHRONICLE_ADDRESS_HISTORY_ROUTE, CHRONICLE_URLS } from '@core/network/constants/chronicle-urls.constant'
+    import { fetchWithTimeout } from '@core/nfts'
+    import { checkActiveProfileAuth, getActiveProfile, updateAccountPersistedDataOnActiveProfile } from '@core/profile'
+    import { getProfileManager } from '@core/profile-manager/stores'
     import { truncateString } from '@core/utils'
+    import { AccountAddress } from '@iota/sdk/out/types'
+    import VirtualList from '@sveltejs/svelte-virtual-list'
+    import { Button, FontWeight, KeyValueBox, Spinner, Text, TextType } from 'shared/components'
+    import { onMount } from 'svelte'
 
     interface AddressHistory {
         address: string
@@ -24,37 +24,26 @@
         ]
     }
 
-    const account = getSelectedAccount()
-    const accountIndex = account.index
-    const network = getActiveProfile().network.id
+    const activeProfile = getActiveProfile()
     const ADDRESS_GAP_LIMIT = 20
 
-    let error: string = ''
+    $: accountIndex = $selectedAccount?.index
+    $: network = activeProfile?.network?.id
+    $: knownAddresses = $selectedAccount?.knownAddresses
+
     let searchURL: string
-    let knownAddresses: AccountAddress[] | undefined = undefined
     let searchAddressStartIndex = 0
     let currentSearchGap = 0
     let isBusy = false
 
     onMount(() => {
         knownAddresses = getSelectedAccount().knownAddresses
-        if (knownAddresses === undefined) {
-            getSelectedAccount()
-                ?.addresses()
-                .then((_addressList) => {
-                    knownAddresses = _addressList ?? []
-                    updateAccountPersistedDataOnActiveProfile(accountIndex, { knownAddresses })
-                })
-                .catch((err) => {
-                    console.error(err)
-                })
-        }
 
         if (CHRONICLE_URLS[network] && CHRONICLE_URLS[network].length > 0) {
             const chronicleRoot = CHRONICLE_URLS[network][0]
             searchURL = `${chronicleRoot}${CHRONICLE_ADDRESS_HISTORY_ROUTE}`
         } else {
-            error = localize('popups.addressHistory.errorNoChronicle')
+            throw new Error(localize('popups.addressHistory.errorNoChronicle'))
         }
     })
 
@@ -64,14 +53,12 @@
             const addressHistory: AddressHistory = await response.json()
             return addressHistory?.items?.length > 0
         } catch (err) {
-            console.error(err)
-            error = localize('popups.addressHistory.errorFailedFetch')
+            throw new Error(localize('popups.addressHistory.errorFailedFetch'))
         }
     }
 
     async function generateNextUnknownAddress(): Promise<[string, number]> {
         let nextUnknownAddress: string
-
         try {
             do {
                 nextUnknownAddress = await getProfileManager().generateEd25519Address(
@@ -82,8 +69,7 @@
                 searchAddressStartIndex++
             } while (knownAddresses.map((accountAddress) => accountAddress.address).includes(nextUnknownAddress))
         } catch (err) {
-            console.error(err)
-            error = localize('popups.addressHistory.errorFailedGenerate')
+            throw new Error(localize('popups.addressHistory.errorFailedGenerate'))
         }
 
         return [nextUnknownAddress, searchAddressStartIndex - 1]
@@ -91,54 +77,39 @@
 
     async function search(): Promise<void> {
         currentSearchGap = 0
-        const isUnlocked = await unlock
-
-        if (isUnlocked && !error) {
-            isBusy = true
-            while (currentSearchGap < ADDRESS_GAP_LIMIT) {
-                const [nextAddressToCheck, addressIndex] = await generateNextUnknownAddress()
-                if (!nextAddressToCheck) {
-                    isBusy = false
-                    break
-                }
+        while (currentSearchGap < ADDRESS_GAP_LIMIT) {
+            const [nextAddressToCheck, addressIndex] = await generateNextUnknownAddress()
+            if (!nextAddressToCheck) {
+                isBusy = false
+                break
+            }
 
-                const hasHistory = await isAddressWithHistory(nextAddressToCheck)
-                if (error) {
-                    isBusy = false
-                    break
+            const hasHistory = await isAddressWithHistory(nextAddressToCheck)
+            if (hasHistory) {
+                const accountAddress: AccountAddress = {
+                    address: nextAddressToCheck,
+                    keyIndex: addressIndex,
+                    internal: false,
+                    used: true,
                 }
 
-                if (hasHistory) {
-                    const accountAddress: AccountAddress = {
-                        address: nextAddressToCheck,
-                        keyIndex: addressIndex,
-                        internal: false,
-                        used: true,
-                    }
-
-                    knownAddresses.push(accountAddress)
-                } else {
-                    currentSearchGap++
-                }
+                knownAddresses.push(accountAddress)
+            } else {
+                currentSearchGap++
             }
-
-            updateAccountPersistedDataOnActiveProfile(accountIndex, { knownAddresses })
-            isBusy = false
         }
+        updateAccountPersistedDataOnActiveProfile(accountIndex, { knownAddresses })
     }
 
-    const unlock = new Promise<boolean>((resolve) => {
-        const onSuccess: () => Promise<void> = () => {
-            resolve(true)
-            return Promise.resolve()
+    async function handleSearchClick(): Promise<void> {
+        isBusy = true
+        try {
+            await checkActiveProfileAuth(search, { stronghold: true, ledger: true })
+        } catch (err) {
+            handleError(err)
+        } finally {
+            isBusy = false
         }
-        const onCancel: () => void = () => resolve(false)
-        const config = { stronghold: true, ledger: true }
-        checkActiveProfileAuth(onSuccess, config, onCancel)
-    })
-
-    function onCancelClick(): void {
-        closePopup()
     }
 </script>
 
@@ -177,18 +148,12 @@
             <Spinner />
         </div>
     {/if}
-    {#if error}
-        <Error {error} />
-    {/if}
 </div>
 <div class="flex flex-row flex-nowrap w-full space-x-4 mt-6">
-    <Button classes="w-full" outline onClick={onCancelClick} disabled={isBusy}>
-        {localize('actions.cancel')}
-    </Button>
     <Button
         classes="w-full"
-        onClick={search}
-        disabled={isBusy || !!error}
+        onClick={handleSearchClick}
+        disabled={isBusy}
         {isBusy}
         busyMessage={localize('actions.searching')}
     >

From f9ef36280c20f5da5e27e38fc66bb639e1dbd26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Tue, 12 Dec 2023 16:38:00 +0100
Subject: [PATCH 8/9] feat: init and sort

---
 .../popups/AddressHistoryPopup.svelte         | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/packages/desktop/components/popups/AddressHistoryPopup.svelte b/packages/desktop/components/popups/AddressHistoryPopup.svelte
index 9af98ad9258..e7c8074356b 100644
--- a/packages/desktop/components/popups/AddressHistoryPopup.svelte
+++ b/packages/desktop/components/popups/AddressHistoryPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { getSelectedAccount, selectedAccount } from '@core/account'
+    import { selectedAccount } from '@core/account'
     import { handleError } from '@core/error/handlers/handleError'
     import { localize } from '@core/i18n'
     import { CHRONICLE_ADDRESS_HISTORY_ROUTE, CHRONICLE_URLS } from '@core/network/constants/chronicle-urls.constant'
@@ -27,9 +27,10 @@
     const activeProfile = getActiveProfile()
     const ADDRESS_GAP_LIMIT = 20
 
+    let knownAddresses: AccountAddress[] = []
+
     $: accountIndex = $selectedAccount?.index
     $: network = activeProfile?.network?.id
-    $: knownAddresses = $selectedAccount?.knownAddresses
 
     let searchURL: string
     let searchAddressStartIndex = 0
@@ -37,7 +38,20 @@
     let isBusy = false
 
     onMount(() => {
-        knownAddresses = getSelectedAccount().knownAddresses
+        knownAddresses = $selectedAccount?.knownAddresses
+        if (!knownAddresses?.length) {
+            isBusy = true
+            $selectedAccount
+                .addresses()
+                .then((_knownAddresses) => {
+                    knownAddresses = sortAddresses(_knownAddresses)
+                    updateAccountPersistedDataOnActiveProfile(accountIndex, { knownAddresses })
+                    isBusy = false
+                })
+                .finally(() => {
+                    isBusy = false
+                })
+        }
 
         if (CHRONICLE_URLS[network] && CHRONICLE_URLS[network].length > 0) {
             const chronicleRoot = CHRONICLE_URLS[network][0]
@@ -77,6 +91,7 @@
 
     async function search(): Promise<void> {
         currentSearchGap = 0
+        const tmpKnownAddresses = [...knownAddresses]
         while (currentSearchGap < ADDRESS_GAP_LIMIT) {
             const [nextAddressToCheck, addressIndex] = await generateNextUnknownAddress()
             if (!nextAddressToCheck) {
@@ -93,11 +108,12 @@
                     used: true,
                 }
 
-                knownAddresses.push(accountAddress)
+                tmpKnownAddresses.push(accountAddress)
             } else {
                 currentSearchGap++
             }
         }
+        knownAddresses = sortAddresses(tmpKnownAddresses)
         updateAccountPersistedDataOnActiveProfile(accountIndex, { knownAddresses })
     }
 
@@ -111,6 +127,10 @@
             isBusy = false
         }
     }
+
+    function sortAddresses(addresses: AccountAddress[] = []): AccountAddress[] {
+        return addresses.sort((a, b) => a.keyIndex - b.keyIndex)
+    }
 </script>
 
 <div class="flex flex-col space-y-6">

From 50aeb6afbf12d946275706a06e7acc5cbd793890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Mon, 18 Dec 2023 18:14:02 +0100
Subject: [PATCH 9/9] chore: remove unncessary disclaimer

---
 packages/desktop/components/popups/AddressHistoryPopup.svelte | 1 -
 packages/shared/locales/en.json                               | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/desktop/components/popups/AddressHistoryPopup.svelte b/packages/desktop/components/popups/AddressHistoryPopup.svelte
index e7c8074356b..b096834f366 100644
--- a/packages/desktop/components/popups/AddressHistoryPopup.svelte
+++ b/packages/desktop/components/popups/AddressHistoryPopup.svelte
@@ -137,7 +137,6 @@
     <Text type={TextType.h3} fontWeight={FontWeight.semibold} lineHeight="6">
         {localize('popups.addressHistory.title')}
     </Text>
-    <Text fontSize="15" color="gray-700" classes="text-left">{localize('popups.addressHistory.disclaimer')}</Text>
     {#if knownAddresses}
         {#if knownAddresses.length > 0}
             <div class="w-full flex-col space-y-2 virtual-list-wrapper">
diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
index 876945022a1..b76c37a5b1a 100644
--- a/packages/shared/locales/en.json
+++ b/packages/shared/locales/en.json
@@ -1185,7 +1185,6 @@
         },
         "addressHistory": {
             "title": "Address history",
-            "disclaimer": "List of addresses with funds or known by this profile",
             "indexAndType": "{internal, select, true {Internal address} other {Deposit address}} {index}",
             "internal": "Internal",
             "errorNoChronicle": "Chronicle not configured",