@mezo-org/passport 0.4.0-dev.81 → 0.4.0-dev.83

package/src/components/Dropdown/Root/AccountOtherAssets.tsx

@@ -1,68 +1,85 @@
-import React, { useMemo } from "react"
-import { Block, useStyletron, CoinsStacked02 } from "@mezo-org/mezo-clay"
+import React from "react"
+import {
+  useStyletron,
+  CoinsStacked02,
+  mergeOverrides,
+  BlockProps,
+} from "@mezo-org/mezo-clay"
+import { formatUnits } from "viem"
 import ListingItem from "../ListingItem"
-import { formatUsd } from "../../../utils/currency"
+import { useTokensBalances } from "../../../hooks/useTokensBalances"
+import AccountError from "./AccountError"
+import { CONVERSION_RATE_DECIMALS } from "../../../hooks/useAssetsConversionRates"
 
 type AccountOtherAssetsProps = {
-  assetsCount: number
-  assetsUsdTotal: number
   onClick?: () => void
-}
+} & Omit<BlockProps, "children">
 
 export default function AccountOtherAssets(props: AccountOtherAssetsProps) {
-  const { assetsCount, assetsUsdTotal, onClick } = props
+  const { onClick, overrides, ...restProps } = props
 
   const [, theme] = useStyletron()
 
-  const label = useMemo(() => {
-    if (assetsCount === 0) return "No other assets"
-    if (assetsCount === 1) return "1 more asset"
-    return `${assetsCount} more assets`
-  }, [assetsCount])
+  const {
+    data: tokensBalancesData,
+    isPending: isTokensBalancesPending,
+    isError: isTokensBalancesError,
+  } = useTokensBalances()
+
+  if (isTokensBalancesError) {
+    return (
+      <AccountError
+        topic="other assets"
+        paddingTop={theme.sizing.scale100}
+        paddingBottom={theme.sizing.scale100}
+        overrides={overrides}
+      />
+    )
+  }
 
-  const formattedAssetsUsdTotal = formatUsd(assetsUsdTotal)
+  if (isTokensBalancesPending) {
+    return <ListingItem isLoading overrides={overrides} />
+  }
+
+  const otherAssets = Object.values(tokensBalancesData)
+    .filter((asset) => !["BTC", "MUSD"].includes(asset.symbol))
+    .filter((asset) => asset.value > 0n)
+
+  const assetsCount = otherAssets.length
+  const totalAssetsInUsd = Number(
+    formatUnits(
+      otherAssets.reduce((total, asset) => total + asset.usd.value, 0n),
+      CONVERSION_RATE_DECIMALS,
+    ),
+  )
+
+  let label = "No other assets"
+  if (assetsCount === 1) label = "1 more asset"
+  if (assetsCount > 1) label = `${assetsCount} more assets`
 
   return (
-    <Block
-      aria-label={label}
-      as="li"
-      overrides={{
-        Block: {
-          style: {
-            listStyle: "none",
-            borderTop: `1px solid ${theme.colors.borderInverseSelected}`,
-          },
-        },
-      }}
-    >
-      <ListingItem
-        icon={CoinsStacked02}
-        label={label}
-        value={formattedAssetsUsdTotal}
-        overrides={{
-          Root: {
+    <ListingItem
+      icon={<CoinsStacked02 color={theme.colors.contentPrimary} />}
+      label={label}
+      value={totalAssetsInUsd}
+      overrides={mergeOverrides(
+        {
+          Block: {
             props: {
               $as: "button",
               onClick,
             },
             style: {
-              border: 0,
-              padding: 0,
+              borderWidth: 0,
               cursor: "pointer",
+              backgroundColor: "transparent",
+              minHeight: "56px",
             },
           },
-          ArtworkContainer: {
-            style: {
-              stroke: theme.colors.contentPrimary,
-            },
-          },
-          Content: {
-            style: {
-              minHeight: theme.sizing.scale1200,
-            },
-          },
-        }}
-      />
-    </Block>
+        },
+        overrides,
+      )}
+      {...restProps}
+    />
   )
 }

package/src/components/Dropdown/Root/Root.tsx

@@ -6,47 +6,17 @@ import WalletAddress from "./WalletAddress"
 import AccountBalance from "./AccountBalance"
 import WelcomeBlock from "./WelcomeBlock"
 import AccountAddressActions from "./AccountAddressActions"
-import AccountAssetItem from "./AccountAssetItem"
-import { DetailedCryptoAsset } from "../../../utils/cryptoAssets"
-import { formatNumberToCompactString } from "../../../utils/numbers"
-import { formatUsd } from "../../../utils/currency"
 import AccountOtherAssets from "./AccountOtherAssets"
+import AccountBtcListing from "./AccountBtcListing"
+import AccountMusdListing from "./AccountMusdListing"
 
 type RootProps = {
-  mezoId: string
-  matsBalance: number
-  accountAddress: string
-  walletAddress: string
-  walletType: "bitcoin" | "evm"
-  usdTotalBalance: number
-  usdTroveDebt: number
-  usdCollateral: number
-  assets: {
-    btc: DetailedCryptoAsset
-    musd: DetailedCryptoAsset
-  }
-  otherAssetsCount: number
-  otherAssetsUsdTotal: number
   onSignOut?: () => void
   onOtherAssetsClick?: () => void
 }
 
 export default function Root(props: RootProps) {
-  const {
-    mezoId,
-    walletAddress,
-    accountAddress,
-    walletType,
-    usdTotalBalance,
-    usdTroveDebt,
-    usdCollateral,
-    matsBalance,
-    assets,
-    otherAssetsCount,
-    otherAssetsUsdTotal,
-    onSignOut,
-    onOtherAssetsClick,
-  } = props
+  const { onSignOut, onOtherAssetsClick } = props
 
   const [, theme] = useStyletron()
 
@@ -58,88 +28,48 @@ export default function Root(props: RootProps) {
       onSignOut()
       return
     }
-
     signOut()
     disconnect()
   }, [signOut, disconnect, onSignOut])
 
-  const formattedMatsBalance = formatNumberToCompactString(matsBalance, 2)
-  const formattedUsdTotalBalance = formatUsd(usdTotalBalance)
-  const formattedUsdTroveDebt = formatUsd(usdTroveDebt)
-  const formattedUsdCollateral = formatUsd(usdCollateral)
+  const overridesWithDivider = {
+    Block: {
+      style: {
+        borderBottomWidth: "1px",
+        borderBottomStyle: "solid",
+        borderBottomColor: theme.colors.borderOpaque,
+      },
+    },
+  }
 
   return (
-    <Block
-      display="inline-flex"
-      flexDirection="column"
-      padding={theme.sizing.scale600}
-    >
-      <WelcomeBlock mezoId={mezoId} matsBalance={formattedMatsBalance} />
+    <Block display="inline-flex" flexDirection="column">
+      <WelcomeBlock />
 
-      <AccountAddressActions address={accountAddress} />
+      <AccountAddressActions overrides={overridesWithDivider} />
 
-      <Block
-        display="flex"
-        flexDirection="column"
-        backgroundColor={theme.colors.backgroundSecondary}
-        overflow="hidden"
-        overrides={{
-          Block: { style: { borderRadius: theme.borders.radius300 } },
-        }}
-      >
-        <WalletAddress address={walletAddress} type={walletType} />
+      <WalletAddress overrides={overridesWithDivider} />
 
-        <AccountBalance
-          totalBalance={formattedUsdTotalBalance}
-          totalDebt={formattedUsdTroveDebt}
-        />
+      <AccountBalance overrides={overridesWithDivider} />
 
-        <AccountAssetItem
-          type="BTC"
-          amount={assets.btc.formattedUsdBalance}
-          subLabel="Locked collateral"
-          subValue={formattedUsdCollateral}
-        />
+      <AccountBtcListing />
 
-        <AccountAssetItem
-          type="MUSD"
-          amount={assets.musd.formattedUsdBalance}
-          subLabel="Borrowed"
-          subValue={formattedUsdTroveDebt}
-        />
+      <AccountMusdListing />
 
-        <AccountOtherAssets
-          assetsCount={otherAssetsCount}
-          assetsUsdTotal={otherAssetsUsdTotal}
-          onClick={onOtherAssetsClick}
-        />
-      </Block>
+      <AccountOtherAssets
+        onClick={onOtherAssetsClick}
+        overrides={overridesWithDivider}
+      />
 
-      <Block
-        marginTop={theme.sizing.scale700}
-        padding={`0 ${theme.sizing.scale100}`}
-      >
+      <Block padding={theme.sizing.scale300}>
         <Button
           size="small"
+          shape="pill"
           kind="tertiary"
-          startEnhancer={<LogOut01 color="currentColor" size={12} />}
-          onClick={() => handleLogOut()}
-          overrides={{
-            Root: {
-              style: {
-                ":hover": {
-                  backgroundColor: theme.colors.backgroundSecondary,
-                  boxShadow: "none",
-                },
-                ":active": {
-                  backgroundColor: theme.colors.backgroundSecondary,
-                  color: theme.colors.contentPrimary,
-                },
-              },
-            },
-          }}
+          startEnhancer={<LogOut01 color="currentColor" size={16} />}
+          onClick={handleLogOut}
         >
-          Log out
+          Sign out
         </Button>
       </Block>
     </Block>

package/src/components/Dropdown/Root/WalletAddress.tsx

@@ -1,47 +1,55 @@
 import {
+  BitcoinCircle,
   Block,
-  Copy03 as CopyIcon,
-  LinkExternal02 as LinkIcon,
-  ParagraphSmall,
+  BlockProps,
+  EthCircle,
+  LabelMedium,
+  LabelXSmall,
+  mergeOverrides,
+  MonoLabelXSmall,
   useStyletron,
 } from "@mezo-org/mezo-clay"
-import React, { useCallback, useState } from "react"
+import React, { useState } from "react"
 import { useCopyToClipboard } from "usehooks-ts"
 import { usePassportContext } from "../../../hooks/usePassportContext"
 import { getAddressExplorerUrl, trimAddress } from "../../../utils/address"
-import { getCryptoAsset } from "../../../utils/cryptoAssets"
+import useWalletAccount from "../../../hooks/useWalletAccount"
 
-type WalletAddressProps = {
-  address: string
-  type: "bitcoin" | "evm"
-}
-
-export default function WalletAddress(props: WalletAddressProps) {
-  const { address, type } = props
-
-  const { environment } = usePassportContext()
-  const blockExplorerUrl = getAddressExplorerUrl(
-    address,
-    type,
-    environment === "testnet",
-  )
-  const trimmedAddress = trimAddress(address)
-  const { icon: accountIcon } = getCryptoAsset(
-    type === "bitcoin" ? "BTC" : "ETH",
-  )
+export default function WalletAddress(props: BlockProps) {
+  const { overrides, ...restProps } = props
 
+  const { data, isError, isPending } = useWalletAccount()
+  const { environment = "mainnet" } = usePassportContext()
   const [, theme] = useStyletron()
-
   const [, copy] = useCopyToClipboard()
   const [isCopiedMessageVisible, setIsCopiedMessageVisible] = useState(false)
-  const handleCopyAddress = useCallback(() => {
-    copy(address)
+
+  if (isError) {
+    return "Error loading wallet address"
+  }
+
+  if (isPending) {
+    return "Loading..."
+  }
+
+  const { walletAddress, networkFamily } = data
+
+  const handleCopyAddress = () => {
+    copy(walletAddress)
     setIsCopiedMessageVisible(true)
 
     setTimeout(() => {
       setIsCopiedMessageVisible(false)
     }, 2000)
-  }, [copy, address])
+  }
+
+  const blockExplorerUrl = getAddressExplorerUrl(
+    walletAddress,
+    networkFamily,
+    environment === "testnet",
+  )
+  const trimmedAddress = trimAddress(walletAddress)
+  const AccountIcon = networkFamily === "bitcoin" ? BitcoinCircle : EthCircle
 
   return (
     <Block
@@ -50,79 +58,77 @@ export default function WalletAddress(props: WalletAddressProps) {
       display="flex"
       alignItems="center"
       backgroundColor="transparent"
-      padding={`${theme.sizing.scale600} ${theme.sizing.scale500}`}
-      overrides={{
-        Block: {
-          style: {
-            borderWidth: 0,
-            cursor: "pointer",
-            ":hover": {
-              backgroundColor: theme.colors.backgroundTertiary,
+      padding={`${theme.sizing.scale800} ${theme.sizing.scale700}`}
+      overrides={mergeOverrides(
+        {
+          Block: {
+            style: {
+              gap: theme.sizing.scale700,
+              borderWidth: 0,
+              cursor: "pointer",
+              ":hover": {
+                backgroundColor: theme.colors.backgroundTertiary,
+              },
             },
           },
         },
-      }}
-    >
-      <Block as={accountIcon} size={theme.sizing.scale600} />
-      {isCopiedMessageVisible ? (
-        <ParagraphSmall
-          margin={0}
-          marginLeft={theme.sizing.scale500}
-          color={theme.colors.contentPrimary}
-        >
-          Copied address to clipboard
-        </ParagraphSmall>
-      ) : (
-        <Block
-          as="a"
-          marginLeft={theme.sizing.scale500}
-          href={blockExplorerUrl}
-          target="_blank"
-          overrides={{
-            Block: {
-              style: {
-                color: "inherit",
-                textDecoration: "none",
-                ":hover": {
-                  textDecoration: "underline",
-                },
-              },
-            },
-          }}
-        >
-          <ParagraphSmall
-            display="flex"
-            alignItems="center"
-            margin={0}
-            color={theme.colors.contentPrimary}
-          >
-            {trimmedAddress}
-            <LinkIcon
-              display="inline"
-              size={theme.sizing.scale550}
-              overrides={{
-                Svg: {
-                  style: {
-                    stroke: "currentColor",
-                    marginLeft: theme.sizing.scale300,
-                  },
-                },
-              }}
-            />
-          </ParagraphSmall>
-        </Block>
+        overrides,
       )}
-      <CopyIcon
-        size={theme.sizing.scale550}
-        color={theme.colors.contentPrimary}
+      {...restProps}
+    >
+      <AccountIcon
+        color={theme.colors.black}
+        size={theme.sizing.scale800}
         overrides={{
           Svg: {
             style: {
-              marginLeft: "auto",
+              backgroundColor: theme.colors.black,
+              overflow: "hidden",
+              borderRadius: theme.borders.radius200,
             },
           },
         }}
       />
+      <Block
+        display="flex"
+        flexDirection="column"
+        alignItems="flex-start"
+        overrides={{
+          Block: {
+            style: {
+              gap: theme.sizing.scale100,
+            },
+          },
+        }}
+      >
+        <LabelMedium>Connected Wallet</LabelMedium>
+
+        {isCopiedMessageVisible ? (
+          <LabelXSmall color={theme.colors.contentSecondary}>
+            Copied address to clipboard
+          </LabelXSmall>
+        ) : (
+          <Block
+            as="a"
+            color={theme.colors.contentSecondary}
+            href={blockExplorerUrl}
+            target="_blank"
+            overrides={{
+              Block: {
+                style: {
+                  color: "inherit",
+                  textDecoration: "none",
+                  ":hover": {
+                    textDecoration: "underline",
+                  },
+                },
+              },
+            }}
+          >
+            <MonoLabelXSmall>{trimmedAddress}</MonoLabelXSmall>
+          </Block>
+        )}
+      </Block>
     </Block>
   )
 }