From c85c82381230a8a10ab6995ee587e08629c1b680 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Wed, 1 Nov 2023 14:22:43 +0000
Subject: [PATCH] switch to swr

---
 package-lock.json                             | 36 ++++++++---------
 package.json                                  |  2 +-
 .../Web3/components/Conversion/Conversion.tsx |  7 ++--
 src/features/Web3/components/Form/index.tsx   | 11 ++++--
 .../Web3/components/Input/InputGroup.tsx      |  1 -
 .../Web3/components/Send/SendErc20.tsx        |  5 +--
 .../components/TokenSelect/TokenSelect.tsx    | 37 ++++++------------
 src/features/Web3/hooks/useTokens/index.ts    |  2 +
 .../tokens => hooks/useTokens}/types.ts       |  0
 .../Web3/hooks/useTokens/useTokens.tsx        | 39 +++++++++++++++++++
 src/features/Web3/hooks/useTokensStore.tsx    | 34 ----------------
 src/features/Web3/stores/tokens/fetcher.ts    | 12 ------
 src/features/Web3/stores/tokens/index.ts      |  3 --
 .../Web3/stores/tokens/selectedToken.ts       | 21 ----------
 src/features/Web3/stores/tokens/tokens.ts     | 12 ------
 src/stores/fetcher.ts                         |  8 +++-
 16 files changed, 89 insertions(+), 141 deletions(-)
 create mode 100644 src/features/Web3/hooks/useTokens/index.ts
 rename src/features/Web3/{stores/tokens => hooks/useTokens}/types.ts (100%)
 create mode 100644 src/features/Web3/hooks/useTokens/useTokens.tsx
 delete mode 100644 src/features/Web3/hooks/useTokensStore.tsx
 delete mode 100644 src/features/Web3/stores/tokens/fetcher.ts
 delete mode 100644 src/features/Web3/stores/tokens/index.ts
 delete mode 100644 src/features/Web3/stores/tokens/selectedToken.ts
 delete mode 100644 src/features/Web3/stores/tokens/tokens.ts

diff --git a/package-lock.json b/package-lock.json
index 7315ce97..b25a4f6e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,6 @@
         "@astrojs/rss": "^3.0.0",
         "@astrojs/sitemap": "^3.0.2",
         "@coingecko/cryptoformat": "^0.6.0",
-        "@nanostores/persistent": "^0.9.1",
         "@nanostores/query": "^0.2.4",
         "@nanostores/react": "^0.7.1",
         "@radix-ui/react-select": "^2.0.0",
@@ -34,6 +33,7 @@
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "slugify": "^1.6.6",
+        "swr": "^2.2.4",
         "use-debounce": "^9.0.4",
         "viem": "^1.18.0",
         "wagmi": "^1.4.5"
@@ -2016,23 +2016,6 @@
         "tslib": "^2.3.1"
       }
     },
-    "node_modules/@nanostores/persistent": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/@nanostores/persistent/-/persistent-0.9.1.tgz",
-      "integrity": "sha512-ow57Hxm5VMaI5GHET/cVk8hX/iKMmbhcGrB9owfN8p8OHiiJgUlYxe1giacwlAALJXAh2t8bxXh42hHb64BCEA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "engines": {
-        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
-      },
-      "peerDependencies": {
-        "nanostores": "^0.9.0"
-      }
-    },
     "node_modules/@nanostores/query": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/@nanostores/query/-/query-0.2.4.tgz",
@@ -6184,6 +6167,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/client-only": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz",
+      "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA=="
+    },
     "node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -17926,6 +17914,18 @@
         "node": ">= 10"
       }
     },
+    "node_modules/swr": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/swr/-/swr-2.2.4.tgz",
+      "integrity": "sha512-njiZ/4RiIhoOlAaLYDqwz5qH/KZXVilRLvomrx83HjzCWTfa+InyfAjv05PSFxnmLzZkNO9ZfvgoqzAaEI4sGQ==",
+      "dependencies": {
+        "client-only": "^0.0.1",
+        "use-sync-external-store": "^1.2.0"
+      },
+      "peerDependencies": {
+        "react": "^16.11.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
diff --git a/package.json b/package.json
index 5b107ae7..6547449b 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
     "@astrojs/rss": "^3.0.0",
     "@astrojs/sitemap": "^3.0.2",
     "@coingecko/cryptoformat": "^0.6.0",
-    "@nanostores/persistent": "^0.9.1",
     "@nanostores/query": "^0.2.4",
     "@nanostores/react": "^0.7.1",
     "@radix-ui/react-select": "^2.0.0",
@@ -73,6 +72,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "slugify": "^1.6.6",
+    "swr": "^2.2.4",
     "use-debounce": "^9.0.4",
     "viem": "^1.18.0",
     "wagmi": "^1.4.5"
diff --git a/src/features/Web3/components/Conversion/Conversion.tsx b/src/features/Web3/components/Conversion/Conversion.tsx
index 3236c786..1e1b9323 100644
--- a/src/features/Web3/components/Conversion/Conversion.tsx
+++ b/src/features/Web3/components/Conversion/Conversion.tsx
@@ -1,10 +1,9 @@
 import { useEffect, type ReactElement, useState } from 'react'
 import styles from './Conversion.module.css'
-import { $selectedToken } from '../../stores/tokens/selectedToken'
-import { useStore } from '@nanostores/react'
+import { useTokens } from '@features/Web3/hooks/useTokens'
 
 export function Conversion({ amount }: { amount: string }): ReactElement {
-  const selectedToken = useStore($selectedToken)
+  const { selectedToken } = useTokens()
 
   const [dollar, setDollar] = useState('0.00')
   const [euro, setEuro] = useState('0.00')
@@ -22,7 +21,7 @@ export function Conversion({ amount }: { amount: string }): ReactElement {
     const euro = eur ? (Number(amount) * eur).toFixed(2) : '0.00'
     setDollar(dollar)
     setEuro(euro)
-  }, [selectedToken?.price, amount])
+  }, [selectedToken, amount])
 
   return (
     <div
diff --git a/src/features/Web3/components/Form/index.tsx b/src/features/Web3/components/Form/index.tsx
index dd8fd2ff..4654f6f0 100644
--- a/src/features/Web3/components/Form/index.tsx
+++ b/src/features/Web3/components/Form/index.tsx
@@ -8,12 +8,11 @@ import styles from './index.module.css'
 import { SendNative, SendErc20 } from '../Send'
 import { useSend } from '../../hooks/useSend'
 import type { SendFormData } from './types'
-import { $selectedToken } from '../../stores/tokens/selectedToken'
-import { useStore } from '@nanostores/react'
+import { useTokens } from '@features/Web3/hooks/useTokens'
 
 export default function Web3Form(): ReactElement {
   const { address: account } = useAccount()
-  const selectedToken = useStore($selectedToken)
+  const { selectedToken } = useTokens()
 
   const [amount, setAmount] = useState('')
   const [debouncedAmount] = useDebounce(amount, 500)
@@ -37,7 +36,7 @@ export default function Web3Form(): ReactElement {
         <ConnectButton chainStatus="full" showBalance={false} />
       </div>
 
-      {message ? (
+      {message && message.status !== 'error' ? (
         <Alert message={message} transactionHash={data?.hash} />
       ) : (
         <InputGroup
@@ -47,6 +46,10 @@ export default function Web3Form(): ReactElement {
         />
       )}
 
+      {message && message?.status === 'error' ? (
+        <Alert message={message} />
+      ) : null}
+
       {selectedToken?.address === '0x0' ? (
         <SendNative
           amount={debouncedAmount}
diff --git a/src/features/Web3/components/Input/InputGroup.tsx b/src/features/Web3/components/Input/InputGroup.tsx
index d199cb53..822da4df 100644
--- a/src/features/Web3/components/Input/InputGroup.tsx
+++ b/src/features/Web3/components/Input/InputGroup.tsx
@@ -27,7 +27,6 @@ export function InputGroup({
           placeholder="0.00"
           onChange={(e) => setAmount(e.target.value)}
           className={styles.inputInput}
-          disabled={isDisabled}
         />
         <button
           className={`${styles.submit} btn btn-primary`}
diff --git a/src/features/Web3/components/Send/SendErc20.tsx b/src/features/Web3/components/Send/SendErc20.tsx
index efef832e..58055e15 100644
--- a/src/features/Web3/components/Send/SendErc20.tsx
+++ b/src/features/Web3/components/Send/SendErc20.tsx
@@ -3,8 +3,7 @@ import { useContractWrite, usePrepareContractWrite } from 'wagmi'
 import siteConfig from '@config/blog.config'
 import { abiErc20Transfer } from './abiErc20Transfer'
 import { useEffect } from 'react'
-import { useStore } from '@nanostores/react'
-import { $selectedToken } from '@features/Web3/stores/tokens/selectedToken'
+import { useTokens } from '@features/Web3/hooks/useTokens'
 
 export function SendErc20({
   amount,
@@ -13,7 +12,7 @@ export function SendErc20({
   amount: string
   setSendFormData: any
 }) {
-  const selectedToken = useStore($selectedToken)
+  const { selectedToken } = useTokens()
 
   const { config } = usePrepareContractWrite({
     address: selectedToken?.address,
diff --git a/src/features/Web3/components/TokenSelect/TokenSelect.tsx b/src/features/Web3/components/TokenSelect/TokenSelect.tsx
index eaa6a4a1..71ed562f 100644
--- a/src/features/Web3/components/TokenSelect/TokenSelect.tsx
+++ b/src/features/Web3/components/TokenSelect/TokenSelect.tsx
@@ -3,21 +3,15 @@ import './TokenSelect.css'
 import { Token } from './Token'
 import { ChevronDown, ChevronsDown, ChevronsUp } from '@images/components/react'
 import { TokenLoading } from './TokenLoading'
-import { useEffect } from 'react'
-import { useAccount, useNetwork } from 'wagmi'
-import { useTokensStore } from '@features/Web3/hooks/useTokensStore'
-import { $selectedToken, $setSelectedToken } from '@features/Web3/stores/tokens'
-import { useStore } from '@nanostores/react'
+import { useTokens } from '@features/Web3/hooks/useTokens'
 
 export function TokenSelect() {
-  const { chain } = useNetwork()
-  const { address } = useAccount()
-
-  const { data: tokens, loading } = useTokensStore({
-    chainId: chain?.id,
-    address
-  })
-  const selectedToken = useStore($selectedToken)
+  const {
+    data: tokens,
+    isLoading,
+    selectedToken,
+    setSelectedToken
+  } = useTokens()
 
   const items = tokens?.map((token) => (
     <Token key={token.address} token={token} />
@@ -26,31 +20,22 @@ export function TokenSelect() {
   function handleValueChange(value: `0x${string}`) {
     const token = tokens?.find((token) => token.address === value)
     if (!token) return
-    $setSelectedToken(token)
+    setSelectedToken(token)
   }
 
-  // Set default token data to first item,
-  // which most of time is native token
-  useEffect(() => {
-    if (!tokens) return
-
-    if (!selectedToken || !selectedToken?.address)
-      handleValueChange(tokens[0].address)
-  }, [chain?.id, address, tokens, selectedToken])
-
   return (
     <Select.Root
       defaultValue={selectedToken?.address}
       onValueChange={(value: `0x${string}`) => handleValueChange(value)}
-      disabled={!tokens || loading}
+      disabled={!tokens || isLoading}
       value={selectedToken?.address}
     >
       <Select.Trigger
         className="SelectTrigger"
-        disabled={!tokens || loading}
+        disabled={!tokens || isLoading}
         aria-label="Token"
       >
-        {loading ? <TokenLoading /> : <Select.Value />}
+        {isLoading ? <TokenLoading /> : <Select.Value />}
         <Select.Icon>
           <ChevronDown />
         </Select.Icon>
diff --git a/src/features/Web3/hooks/useTokens/index.ts b/src/features/Web3/hooks/useTokens/index.ts
new file mode 100644
index 00000000..e1d38f28
--- /dev/null
+++ b/src/features/Web3/hooks/useTokens/index.ts
@@ -0,0 +1,2 @@
+export * from './useTokens'
+export * from './types'
diff --git a/src/features/Web3/stores/tokens/types.ts b/src/features/Web3/hooks/useTokens/types.ts
similarity index 100%
rename from src/features/Web3/stores/tokens/types.ts
rename to src/features/Web3/hooks/useTokens/types.ts
diff --git a/src/features/Web3/hooks/useTokens/useTokens.tsx b/src/features/Web3/hooks/useTokens/useTokens.tsx
new file mode 100644
index 00000000..6febde96
--- /dev/null
+++ b/src/features/Web3/hooks/useTokens/useTokens.tsx
@@ -0,0 +1,39 @@
+import { useEffect, useState } from 'react'
+import useSWR from 'swr'
+import type { GetToken } from './types'
+import { useNetwork, useAccount } from 'wagmi'
+import { fetcher } from '@stores/fetcher'
+
+//
+// Wrapper for fetching user tokens with swr,
+// and simple store for selected token.
+//
+export function useTokens() {
+  const { chain } = useNetwork()
+  const { address } = useAccount()
+
+  const [url, setUrl] = useState<string | undefined>(undefined)
+  const [selectedToken, setSelectedToken] = useState<GetToken | undefined>()
+
+  const fetchResults = useSWR<GetToken[] | undefined>(url, fetcher)
+  const { data: tokens } = fetchResults
+
+  // Set url only after we have all data loaded on client,
+  // preventing initial fetch.
+  useEffect(() => {
+    if (!address || !chain?.id) return
+
+    const url = `https://web3.kremalicious.com/api/balance?address=${address}&chainId=${chain?.id}`
+    setUrl(url)
+  }, [address, chain?.id])
+
+  // Set default token data to first item,
+  // which most of time is native token
+  useEffect(() => {
+    if (!tokens?.[0]?.address) return
+
+    setSelectedToken(tokens?.[0])
+  }, [tokens?.[0]?.address])
+
+  return { ...fetchResults, selectedToken, setSelectedToken }
+}
diff --git a/src/features/Web3/hooks/useTokensStore.tsx b/src/features/Web3/hooks/useTokensStore.tsx
deleted file mode 100644
index c2efe9a2..00000000
--- a/src/features/Web3/hooks/useTokensStore.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { useStore } from '@nanostores/react'
-import { useState } from 'react'
-import { createTokensStore } from '../stores/tokens'
-
-//
-// Wrapper around $tokens store.
-//
-// Workaround to dynamically create the store based on
-// user address and chainId.
-//
-export function useTokensStore({
-  address,
-  chainId
-}: {
-  address: `0x${string}` | undefined
-  chainId: number | undefined
-}) {
-  const store = createTokensStore(address, chainId)
-
-  const [tokensFetchStore] = useState(store)
-  const $tokens = useStore(tokensFetchStore)
-
-  //   useEffect(() => {
-  //     if (!chainId || !address) return
-
-  //     console.log(tokensFetchStore.key)
-
-  //     const newUrl = `https://web3.kremalicious.com/api/balance?address=${address}&chainId=${chainId}`
-  //     tokensFetchStore.setKey(tokensFetchStore.key, newUrl)
-  //     console.log(tokensFetchStore.key)
-  //   }, [chainId, address])
-
-  return $tokens
-}
diff --git a/src/features/Web3/stores/tokens/fetcher.ts b/src/features/Web3/stores/tokens/fetcher.ts
deleted file mode 100644
index bff4d1fe..00000000
--- a/src/features/Web3/stores/tokens/fetcher.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { nanoquery } from '@nanostores/query'
-
-export const [
-  createFetcherStore,
-  createMutatorStore,
-  { invalidateKeys, mutateCache }
-] = nanoquery({
-  fetcher: async (...keys: (string | number)[]) => {
-    const response = await fetch(keys.join(''))
-    return await response.json()
-  }
-})
diff --git a/src/features/Web3/stores/tokens/index.ts b/src/features/Web3/stores/tokens/index.ts
deleted file mode 100644
index dcdf5c10..00000000
--- a/src/features/Web3/stores/tokens/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './types'
-export * from './tokens'
-export * from './selectedToken'
diff --git a/src/features/Web3/stores/tokens/selectedToken.ts b/src/features/Web3/stores/tokens/selectedToken.ts
deleted file mode 100644
index 2e753579..00000000
--- a/src/features/Web3/stores/tokens/selectedToken.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { action } from 'nanostores'
-import { persistentAtom } from '@nanostores/persistent'
-import type { GetToken } from './types'
-
-export const $selectedToken = persistentAtom<GetToken | undefined>(
-  '@kremalicious/selectedToken',
-  undefined,
-  {
-    encode: JSON.stringify,
-    decode: JSON.parse
-  }
-)
-
-export const $setSelectedToken = action(
-  $selectedToken,
-  'setSelectedToken',
-  (store, token: GetToken) => {
-    store.set(token)
-    return store.get()
-  }
-)
diff --git a/src/features/Web3/stores/tokens/tokens.ts b/src/features/Web3/stores/tokens/tokens.ts
deleted file mode 100644
index 2c11c673..00000000
--- a/src/features/Web3/stores/tokens/tokens.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { createFetcherStore } from './fetcher'
-import type { GetToken } from './types'
-
-export const createTokensStore = (
-  address: `0x${string}` | undefined,
-  chainId: number | undefined
-) => {
-  const url = `https://web3.kremalicious.com/api/balance?address=${address}&chainId=${chainId}`
-  const fetcherStore = createFetcherStore<GetToken[]>(url)
-
-  return fetcherStore
-}
diff --git a/src/stores/fetcher.ts b/src/stores/fetcher.ts
index b28bdbee..6b43c623 100644
--- a/src/stores/fetcher.ts
+++ b/src/stores/fetcher.ts
@@ -1,6 +1,10 @@
 import { nanoquery } from '@nanostores/query'
 
+export async function fetcher(...args: (string | number)[]) {
+  const res = await fetch(args.join(''))
+  return await res.json()
+}
+
 export const [createFetcherStore, createMutatorStore] = nanoquery({
-  fetcher: (...keys: (string | number)[]) =>
-    fetch(keys.join('')).then((r) => r.json())
+  fetcher
 })