increase type-safety

deployables/app/app/components/ModSelect.tsx

@@ -13,7 +13,7 @@ export interface Option {
 
 interface Props<Option = unknown, Multi extends boolean = boolean>
   extends SelectProps<false, Option, Multi> {
-  avatarAddress: string
+  avatarAddress: HexAddress
 }
 
 export function ModSelect<Multi extends boolean = boolean>({
@@ -47,7 +47,7 @@ export function ModSelect<Multi extends boolean = boolean>({
 
 type ValueProps = PropsWithChildren<{
   label: string
-  address: string
+  address: HexAddress
 }>
 
 const Value = ({ label, address, children }: ValueProps) => (

deployables/app/app/components/ZodiacMod.tsx

@@ -117,7 +117,7 @@ export const ZodiacMod = ({
         }
         isDisabled={disabled || isLoading}
         placeholder={isLoading ? 'Loading modules...' : 'Select a module'}
-        avatarAddress={avatar}
+        avatarAddress={parsePrefixedAddress(avatar)}
       />
 
       {selectedModule?.type === SupportedZodiacModuleType.ROLES_V1 && (

deployables/app/app/components/wallet/Account.tsx

@@ -8,7 +8,7 @@ type AccountProps = {
 }
 
 export const Account = ({ children, type }: AccountProps) => {
-  const address = validateAddress(children) ?? ''
+  const address = validateAddress(children)
 
   return (
     <AddressInput

deployables/extension/src/panel/pages/$activeRouteId/transactions/ContractAddress/index.tsx

@@ -1,4 +1,5 @@
 import { EXPLORER_URL } from '@zodiac/chains'
+import type { HexAddress } from '@zodiac/schema'
 import { AddressInput, GhostLinkButton } from '@zodiac/ui'
 import { getAddress } from 'ethers'
 import { SquareArrowOutUpRight } from 'lucide-react'
@@ -7,7 +8,7 @@ import type { ContractInfo } from '../../../../utils/abi'
 
 interface Props {
   chainId: ChainId
-  address: string
+  address: HexAddress
   contractInfo?: ContractInfo
 }
 
@@ -21,7 +22,7 @@ export const ContractAddress = ({ chainId, address, contractInfo }: Props) => {
       readOnly
       label="Contract"
       description={contractInfo?.name}
-      value={checksumAddress}
+      value={checksumAddress as HexAddress}
       action={
         <GhostLinkButton
           openInNewWindow

deployables/extension/src/panel/pages/ConnectionStack/Address.tsx

@@ -1,9 +1,10 @@
 import { shortenAddress, validateAddress } from '@/utils'
+import type { HexAddress } from '@zodiac/schema'
 import { Address as BaseAddress, Blockie, Tag } from '@zodiac/ui'
 import { Unlink } from 'lucide-react'
 
 interface Props {
-  address: string
+  address: HexAddress
 }
 
 export const Address = ({ address }: Props) => {

packages/modules/src/updateChainId.ts

@@ -59,9 +59,5 @@ const updateWaypoint = (
         connection: updateConnection(connection, { chainId }),
       })
     }
-
-    default: {
-      throw new Error(`Cannot update waypoint of type "${account.type}"`)
-    }
   }
 }

packages/ui/package.json

@@ -19,6 +19,7 @@
   "dependencies": {
     "@epic-web/invariant": "^1.0.0",
     "@headlessui/react": "^2.2.0",
+    "@zodiac/chains": "workspace:*",
     "@zodiac/schema": "workspace:*",
     "classnames": "2.5.1",
     "ethereum-blockies-base64": "1.0.2",

packages/ui/src/inputs/AddressInput.tsx

@@ -1,3 +1,5 @@
+import { ZERO_ADDRESS } from '@zodiac/chains'
+import type { HexAddress } from '@zodiac/schema'
 import type { ComponentPropsWithoutRef, ReactNode } from 'react'
 import { Blockie } from '../Blockie'
 import { type ComposableInputProps, Input } from './Input'
@@ -7,7 +9,7 @@ type AddressInputProps = Omit<
   'id' | 'type' | 'className' | 'value'
 > &
   ComposableInputProps & {
-    value?: string
+    value?: HexAddress | null
     action?: ReactNode
   }
 
@@ -17,6 +19,7 @@ export const AddressInput = ({
   error,
   action,
   disabled,
+  value,
   ...props
 }: AddressInputProps) => (
   <Input
@@ -27,7 +30,7 @@ export const AddressInput = ({
     after={action && <div className="mr-2">{action}</div>}
     before={
       <Blockie
-        address={props.value || '0x0000000000000000000000000000000000000000'}
+        address={value || ZERO_ADDRESS}
         className="ml-4 size-5 shrink-0"
       />
     }
@@ -37,6 +40,7 @@ export const AddressInput = ({
         {...props}
         id={inputId}
         disabled={disabled}
+        value={value ?? ''}
         aria-describedby={descriptionId}
         aria-errormessage={error ?? undefined}
         className="w-full border-none bg-transparent px-4 py-2 font-mono text-sm outline-none"