Merge branch 'main' into feature/fet-2590-app-v3-header-zoom-is-unresponsive

Author: laurgk

.github/workflows/test-wallet.yaml

@@ -2,10 +2,10 @@ name: Wallet Tests (Container)
 
 on:
   workflow_dispatch:
-  push:
-    paths:
-      #all files
-      - '**'
+  # push:
+  #   paths:
+  #     #all files
+  #     - '**'
 
 env:
   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

src/hooks/registration/utils/useExistingCommitment.test.ts

@@ -62,6 +62,7 @@ vi.mock('@ensdomains/ensjs/contracts', () => ({
   legacyEthRegistrarControllerABI: [],
   legacyEthRegistrarControllerInterface: {},
   nameWrapperErrors: [],
+  dnsRegistrarErrors: [],
   nameWrapperABI: [],
   nameWrapperInterface: {},
   nameWrapperCommitSnippet: [

src/transaction-flow/input/SyncManager/SyncManager-flow.tsx

@@ -73,7 +73,7 @@ const SyncManager = ({ data: { name }, dispatch, onDismiss }: Props) => {
       canSyncDNS
         ? createTransactionItem('syncManager', {
             name,
-            address: account.address!,
+            address: account.address,
             dnsImportData: dnsImportData.data!,
           })
         : null,

src/transaction-flow/transaction/syncManager.ts

@@ -7,7 +7,7 @@ import { Transaction, TransactionDisplayItem, TransactionFunctionParameters } fr
 
 type Data = {
   name: string
-  address: Address
+  address?: Address
   dnsImportData: GetDnsImportDataReturnType
 }
 
@@ -24,15 +24,20 @@ const displayItems = (
     label: 'action',
     value: t('transaction.description.syncManager'),
   },
-  {
-    label: 'address',
-    value: address,
-    type: 'address',
-  },
+  ...(address
+    ? [
+        {
+          label: 'address',
+          value: address,
+          type: 'address' as const,
+        },
+      ]
+    : []),
 ]
 
 const transaction = ({ connectorClient, data }: TransactionFunctionParameters<Data>) => {
-  return importDnsName.makeFunctionData(connectorClient, data)
+  const { address: _, ...dataWithoutAddress } = data
+  return importDnsName.makeFunctionData(connectorClient, dataWithoutAddress)
 }
 
 export default {

src/utils/errors.ts

@@ -8,7 +8,11 @@ import {
   TransactionRejectedRpcError,
 } from 'viem'
 
-import { ethRegistrarControllerErrors, nameWrapperErrors } from '@ensdomains/ensjs/contracts'
+import {
+  dnsRegistrarErrors,
+  ethRegistrarControllerErrors,
+  nameWrapperErrors,
+} from '@ensdomains/ensjs/contracts'
 
 type ReadableErrorType = 'insufficientFunds' | 'contract' | 'unknown'
 type ReadableError = {
@@ -22,7 +26,11 @@ export const getViemRevertErrorData = (err: unknown) => {
   return typeof error.data === 'object' ? error.data.data : error.data
 }
 
-export const allContractErrors = [...ethRegistrarControllerErrors, ...nameWrapperErrors]
+export const allContractErrors = [
+  ...ethRegistrarControllerErrors,
+  ...nameWrapperErrors,
+  ...dnsRegistrarErrors,
+]
 
 const insufficientFundsRegex =
   /insufficient funds for gas \* price \+ value: address (?<address>0x[a-fA-F0-9]{40}) have (?<availableBalance>\d*) want (?<requiredBalance>\d*)/