Merge branch 'develop' into 2362-move-polling-of-the-network-health-a…

…nd-status-inside-the-respective-classes
bloomwalletio · Apr 29, 2024 · 4bb5642 · 4bb5642
2 parents b3c344a + fca1423
commit 4bb5642
Show file tree

Hide file tree

Showing 157 changed files with 59 additions and 3,090 deletions.
diff --git a/packages/desktop/components/WindowsControlButtons.svelte b/packages/desktop/components/WindowsControlButtons.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
-    import { Icon as IconEnum } from '@auxiliary/icon'
     import { Platform } from '@core/app'
     import { OS } from '@core/app/constants'
-    import { Icon } from '@ui'
+    import { Icon, IconName } from '@bloomwalletio/ui'
     import { onDestroy, onMount } from 'svelte'
 
     let isMaximized = false
@@ -26,20 +25,20 @@
 
 <window-control-buttons class="flex flex-row justify-end space-x-4 mr-4">
     <button on:click={Platform.minimize} class="text-gray-500 dark:text-gray-100" type="button">
-        <Icon icon={IconEnum.Minimize} />
+        <Icon name={IconName.WindowsMinimize} />
     </button>
     <button
         on:click={async () => (isMaximized = await Platform.maximize())}
         class="text-gray-500 dark:text-gray-100"
         type="button"
     >
         {#if isMaximized}
-            <Icon icon={IconEnum.RestoreSize} />
+            <Icon name={IconName.WindowsRestoreSize} />
         {:else}
-            <Icon icon={IconEnum.Maximize} />
+            <Icon name={IconName.WindowsMaximize} />
         {/if}
     </button>
     <button on:click={Platform.close} class="text-gray-500 dark:text-gray-100" type="button">
-        <Icon icon={IconEnum.CloseThin} />
+        <Icon name={IconName.WindowsClose} />
     </button>
 </window-control-buttons>
diff --git a/packages/desktop/components/WindowsPopupMenu.svelte b/packages/desktop/components/WindowsPopupMenu.svelte
@@ -1,13 +1,12 @@
 <script lang="ts">
-    import { Icon as IconEnum } from '@auxiliary/icon'
     import { Platform } from '@core/app'
-    import { Icon } from '@ui'
+    import { Icon, IconName } from '@bloomwalletio/ui'
 </script>
 
 <button
     on:click={Platform.popupMenu}
     class="flex justify-center items-center p-3 text-gray-500 dark:text-gray-100"
     type="button"
 >
-    <Icon icon={IconEnum.Hamburger} />
+    <Icon name={IconName.WindowsHamburger} />
 </button>
diff --git a/packages/desktop/lib/electron/apis/electron.api.ts b/packages/desktop/lib/electron/apis/electron.api.ts
@@ -137,7 +137,7 @@ const electronApi: IPlatform = {
     minimize(): Promise<void> {
         return ipcRenderer.invoke('minimize')
     },
-    maximize(): Promise<void> {
+    maximize(): Promise<boolean> {
         return ipcRenderer.invoke('maximize')
     },
     isMaximized(): Promise<boolean> {

diff --git a/packages/desktop/views/dashboard/campaigns/components/Leaderboard.svelte b/packages/desktop/views/dashboard/campaigns/components/Leaderboard.svelte
@@ -1,13 +1,12 @@
 <script lang="ts">
     import { Pane } from '@ui'
-    import { Avatar, IconName, Pill, Text } from '@bloomwalletio/ui'
+    import { Avatar, IconName, Pill, Spinner, Text } from '@bloomwalletio/ui'
     import { truncateString } from '@core/utils'
     import { darkMode } from '@core/app/stores'
     import { ITideLeaderboardItem } from '@core/tide/interfaces'
     import { getSubjectFromAddress } from '@core/wallet'
     import { NetworkId } from '@core/network'
     import { EmptyListPlaceholder } from '@components'
-    import { Spinner } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
 
     export let leaderboardItems: ITideLeaderboardItem[]

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { Button, SidebarToast, Steps } from '@bloomwalletio/ui'
-    import { DappInfo, Spinner } from '@ui'
+    import { Button, SidebarToast, Spinner, Steps } from '@bloomwalletio/ui'
+    import { DappInfo } from '@ui'
     import { localize } from '@core/i18n'
     import { Router } from '@core/router'
     import { DrawerTemplate } from '@components'
@@ -179,7 +179,7 @@
             </div>
         {:else}
             <div class="w-full h-full flex items-center justify-center">
-                <Spinner busy size={50} />
+                <Spinner size="lg" />
             </div>
         {/if}
     </div>

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { Button, Table, TableRow, Text } from '@bloomwalletio/ui'
-    import { DappInfo, Spinner } from '@ui'
+    import { Button, Spinner, Table, TableRow, Text } from '@bloomwalletio/ui'
+    import { DappInfo } from '@ui'
     import { localize } from '@core/i18n'
     import { Router } from '@core/router'
     import { DrawerTemplate } from '@components'
@@ -150,7 +150,7 @@
             {/if}
         {:else}
             <div class="w-full h-full flex items-center justify-center">
-                <Spinner busy size={50} />
+                <Spinner size="lg" />
             </div>
         {/if}
     </div>

diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedNetworksDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedNetworksDrawer.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
-    import { Icon as IconEnum } from '@auxiliary/icon'
     import { DrawerTemplate, NetworkCard } from '@components'
     import { localize } from '@core/i18n'
     import { clearSelectedChain, networks } from '@core/network'
     import { Router } from '@core/router'
     import features from '@features/features'
-    import { Icon } from '@ui'
+    import { Button, IconName } from '@bloomwalletio/ui'
     import { onMount } from 'svelte'
     import { NetworkConfigRoute, networkConfigRouter } from '../'
 
@@ -27,15 +26,15 @@
                 <NetworkCard {network} />
             {/each}
         </div>
+    </connected-chains-drawer>
+    <div slot="footer" class="flex justify-center">
         {#if features.network.config.addChain.enabled}
-            <button
-                type="button"
-                class="flex flex-row items-center justify-center w-full space-x-2 bg-transparent text-blue-500 px-8 py-3 text-15 rounded-lg"
-                on:click|stopPropagation={onAddChainClick}
-            >
-                <Icon icon={IconEnum.Plus} height={12} />
-                {localize('actions.addChain')}
-            </button>
+            <Button
+                variant="text"
+                text={localize('actions.addChain')}
+                icon={IconName.Plus}
+                on:click={onAddChainClick}
+            />
         {/if}
-    </connected-chains-drawer>
+    </div>
 </DrawerTemplate>
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -5,7 +5,7 @@
     "author": "Bloom Labs Ltd <[email protected]>",
     "license": "PolyForm Strict License 1.0.0",
     "dependencies": {
-        "@bloomwalletio/ui": "0.20.19",
+        "@bloomwalletio/ui": "0.20.20",
         "@ethereumjs/common": "4.3.0",
         "@ethereumjs/rlp": "5.0.2",
         "@ethereumjs/tx": "5.3.0",

diff --git a/packages/shared/src/components/Spinner.svelte b/packages/shared/src/components/Spinner.svelte
diff --git a/packages/shared/src/components/atoms/Icon.svelte b/packages/shared/src/components/atoms/Icon.svelte
diff --git a/packages/shared/src/components/atoms/index.ts b/packages/shared/src/components/atoms/index.ts
@@ -1,6 +1,5 @@
 export { default as BalanceSummaryRow } from './BalanceSummaryRow.svelte'
 export { default as BalanceSummarySection } from './BalanceSummarySection.svelte'
-export { default as Icon } from './Icon.svelte'
 export { default as LedgerIllustration } from './LedgerIllustration.svelte'
 export { default as MediaDisplay } from './MediaDisplay.svelte'
 export { default as Pane } from './Pane.svelte'

diff --git a/packages/shared/src/components/index.ts b/packages/shared/src/components/index.ts
@@ -8,7 +8,6 @@ export { default as LoadingScreen } from './LoadingScreen.svelte'
 export { default as Logo } from './Logo.svelte'
 export { default as QR } from './QR.svelte'
 export { default as RecoveryPhrase } from './RecoveryPhrase.svelte'
-export { default as Spinner } from './Spinner.svelte'
 export { default as StrengthMeter } from './StrengthMeter.svelte'
 export { default as Text } from './Text.svelte'
 export { default as ToastContainer } from './ToastContainer.svelte'

diff --git a/packages/shared/src/components/inputs/Radio.svelte b/packages/shared/src/components/inputs/Radio.svelte
diff --git a/packages/shared/src/components/inputs/index.ts b/packages/shared/src/components/inputs/index.ts
@@ -7,7 +7,6 @@ export { default as Dropzone } from './Dropzone.svelte'
 export { default as NetworkInput } from './NetworkInput.svelte'
 export { default as NodeInput } from './NodeInput.svelte'
 export { default as OptionalInput } from './OptionalInput.svelte'
-export { default as Radio } from './Radio.svelte'
 export { default as RecipientInput } from './RecipientInput.svelte'
 export { default as Selection } from './Selection.svelte'
 export { default as SearchInput } from './SearchInput.svelte'