chore: progress

Author: o-az

app/app.nix

@@ -9,7 +9,7 @@
     {
       packages = {
         app = unstablePkgs.buildNpmPackage {
-          npmDepsHash = "sha256-6U8sYT79+jLlWSFUrRxp34MgkHLN4UvOdntMtmGjkkY=";
+          npmDepsHash = "sha256-o0iMZ4VvEDlj0OEoieLzZG4J2eeTF4EMRWrYI15e2RY=";
           src = ./.;
           sourceRoot = "app";
           npmFlags = [ "--legacy-peer-deps" ];

app/package-lock.json

@@ -24,8 +24,8 @@
     "@tanstack/svelte-query": "^5.53.3",
     "@tanstack/svelte-query-persist-client": "^5.53.3",
     "@tanstack/svelte-table": "^8.20.5",
-    "@union/client": "npm:@jsr/union__client@^0.0.8",
     "@tanstack/svelte-virtual": "^3.10.6",
+    "@union/client": "npm:@jsr/union__client@^0.0.13",
     "@wagmi/connectors": "^5.1.8",
     "@wagmi/core": "^2.13.4",
     "bits-ui": "^0.21.13",

app/package.json

@@ -43,8 +43,9 @@ let checkedChains: Readable<Array<Chain>> = derived(chains, $chains => {
 
     let ucs1_configurations = chain.ucs1_configurations.reduce<Chain["ucs1_configurations"]>(
       (acc, item) => {
-        let forwards = item.forwards.reduce<Record<string, (typeof item.forward)[number]>>(
+        let forwards = item.forwards.reduce<Record<string, (typeof item.forwards)[number]>>(
           (acc2, item2) => {
+            // @ts-expect-error
             acc2[item2.destination_chain.chain_id] = item2
             return acc2
           },
@@ -56,6 +57,7 @@ let checkedChains: Readable<Array<Chain>> = derived(chains, $chains => {
           forwards
         }
 
+        // @ts-expect-error
         acc[item.destination_chain.chain_id] = item_with_fwd
 
         return acc
@@ -78,7 +80,7 @@ let checkedChains: Readable<Array<Chain>> = derived(chains, $chains => {
       assets: chain.assets.filter(
         asset => asset.display_symbol !== null && asset.decimals !== null && asset.denom !== null
       ) as Chain["assets"]
-    }
+    } as Chain
   })
 })
 </script>

app/src/lib/components/chains-gate.svelte

@@ -1,5 +1,13 @@
 import type { Readable } from "svelte/store"
 
+export type Pretty<T> = { [K in keyof T]: T[K] } & {}
+
+export type MaybePromise<TValue> = TValue | Promise<TValue>
+
+export type TypeFromSet<T extends Set<any>> = T extends Set<infer U> ? U : never
+
+export type ExtractParameters<T> = T extends new (..._args: infer P) => any ? P[0] : never
+
 export type AtLeastOne<T, U = T> = T extends any
   ? T | (U & Record<Exclude<keyof U, keyof T>, never>)
   : never

app/src/lib/utilities/types.ts

@@ -1,27 +1,27 @@
 <script lang="ts">
+import { toast } from "svelte-sonner"
 import { cn } from "$lib/utilities/shadcn.ts"
-import * as Dialog from "$lib/components/ui/dialog"
-import { Button } from "$lib/components/ui/button/index.js"
 import { Badge } from "$lib/components/ui/badge"
 import type { UserAddresses } from "$lib/types.ts"
-import { toast } from "svelte-sonner"
+import * as Dialog from "$lib/components/ui/dialog"
+import { Button } from "$lib/components/ui/button/index.js"
 
 export let kind: "from" | "to"
 export let dialogOpen = false
 export let onChainSelect: (newSelectedChain: string) => void
 export let chains: Array<{ chain_id: string; display_name: string; rpc_type: string }>
 export let selectedChain: string
-export let userAddr: UserAddresses | null
+export let userAddress: UserAddresses | null
 
 $: document.body.style.overflow = dialogOpen ? "hidden" : "auto"
 
 function selectChain(chain: { chain_id: string; display_name: string; rpc_type: string }) {
-  if (chain.rpc_type === "evm" && !userAddr?.evm) {
+  if (chain.rpc_type === "evm" && !userAddress?.evm) {
     toast.info(`Connect EVM wallet`)
     return
   }
 
-  if (chain.rpc_type === "cosmos" && !userAddr?.cosmos) {
+  if (chain.rpc_type === "cosmos" && !userAddress?.cosmos) {
     toast.info(`Connect Cosmos wallet`)
     return
   }
@@ -36,55 +36,35 @@ function selectChain(chain: { chain_id: string; display_name: string; rpc_type:
   bind:open={dialogOpen}
   closeOnOutsideClick={true}
 >
-  <Dialog.Content
-    class={cn(
-      'border-solid overflow-auto flex flex-col items-start p-0 pt-4 pb-2',
-    )}
-  >
+  <Dialog.Content class={cn('border-solid overflow-auto flex flex-col items-start p-0 pt-4 pb-2')}>
     <Dialog.Header class="max-h-min p-2 w-full">
       <Dialog.Title class="px-2">
         Select {kind} Network
       </Dialog.Title>
     </Dialog.Header>
     <Dialog.Description class="size-full">
-      <!--
-      <div class="relative mr-auto flex-1 w-full">
-        <Search class="absolute left-2.5 top-2.5 size-4 text-muted-foreground" />
-        <Input
-          type="search"
-          pattern="[a-z]"
-          autocorrect="off"
-          spellcheck="false"
-          autocapitalize="off"
-          placeholder="choose origin chain"
-          on:input={event => handleChainSearch(event)}
-          class="w-full bg-current/95 pl-8 self-stretch lowercase focus-visible:ring-0 rounded-none focus-visible:outline-none border-x-0"
-        />
-      </div>
-      !-->
       <ul class="flex flex-col">
         {#each chains as chain, index}
           {@const selected = selectedChain === chain.chain_id}
-          <li
-            class={cn(
-              'dark:text-accent-foreground flex flex-col',
-            )}
-          >
+          <li class={cn('dark:text-accent-foreground flex flex-col')}>
             <Button
               variant={'ghost'}
-              on:click={() => {selectChain(chain)}}
-              class={cn('size-full px-4 py-2 w-full text-foreground rounded-none flex items-center justify-between dark:hover:text-black',
-                selected ? 'bg-muted-foreground text-background' : ''
+              on:click={() => {
+                selectChain(chain)
+              }}
+              class={cn(
+                'size-full px-4 py-2 w-full text-foreground rounded-none flex items-center justify-between dark:hover:text-black',
+                selected ? 'bg-muted-foreground text-background' : '',
               )}
             >
               <span class="text-lg font-bold">
                 {chain.display_name}
               </span>
-                {#if (chain.rpc_type === "evm" && !userAddr?.evm) || (chain.rpc_type === "cosmos" && !userAddr?.cosmos) }
-                  <Badge variant={selected ? 'secondary' : 'default'}>Disconnected</Badge>
-                {:else}
-                  <Badge variant={selected ? 'secondary' : 'default'}>Connected</Badge>
-                {/if}
+              {#if (chain.rpc_type === 'evm' && !userAddress?.evm) || (chain.rpc_type === 'cosmos' && !userAddress?.cosmos)}
+                <Badge variant={selected ? 'secondary' : 'default'}>Disconnected</Badge>
+              {:else}
+                <Badge variant={selected ? 'secondary' : 'default'}>Connected</Badge>
+              {/if}
             </Button>
           </li>
         {/each}

app/src/routes/transfer/(components)/chain-dialog.svelte

@@ -1,8 +1,6 @@
 <script lang="ts">
 import type { Writable } from "svelte/store"
 import { cn } from "$lib/utilities/shadcn.ts"
-import { sepoliaStore } from "$lib/wallet/evm"
-import { cosmosStore } from "$lib/wallet/cosmos"
 import LockLockedIcon from "virtual:icons/lucide/lock"
 import LockOpenIcon from "virtual:icons/lucide/lock-open"
 import { Input } from "$lib/components/ui/input/index.ts"
@@ -12,12 +10,6 @@ export let recipient: Writable<string>
 
 let recipientInputState: "locked" | "unlocked" | "invalid" = "unlocked"
 
-const recipientAddressByChainId = (chainId?: string | null) => {
-  if (!chainId) return ""
-  if (chainId === "11155111") return $sepoliaStore.address
-  return $cosmosStore.rawAddress
-}
-
 const onUnlockClick = (_event: MouseEvent) => {
   if (recipientInputState === "locked") {
     $recipient = ""