From 0585d57fcf517ddf998a84c7d51321cff2e77a18 Mon Sep 17 00:00:00 2001
From: Sid Vishnoi <8426945+sidvishnoi@users.noreply.github.com>
Date: Fri, 5 Jul 2024 20:01:57 +0530
Subject: [PATCH] fix(background): better error message for `connectWallet`

---
 src/_locales/en/messages.json           |  3 +++
 src/background/services/openPayments.ts | 16 +++++++++++++---
 tsconfig.json                           |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index b2dfb478..de56e90a 100755
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -23,5 +23,8 @@
   },
   "siteNotMonetized": {
     "message": "This website is not monetized."
+  },
+  "error_connectWallet_invalidClient": {
+    "message": "Failed to connect. Did you copy the public key to the right wallet address?"
   }
 }
diff --git a/src/background/services/openPayments.ts b/src/background/services/openPayments.ts
index 78e6f37d..ff4c82e0 100644
--- a/src/background/services/openPayments.ts
+++ b/src/background/services/openPayments.ts
@@ -2,7 +2,8 @@
 import type { AccessToken, GrantDetails, WalletAmount } from 'shared/types'
 import {
   type AuthenticatedClient,
-  createAuthenticatedClient
+  createAuthenticatedClient,
+  OpenPaymentsClientError
 } from '@interledger/open-payments/dist/client'
 import {
   isFinalizedGrant,
@@ -25,7 +26,7 @@ import {
 import { StorageService } from '@/background/services/storage'
 import { exportJWK, generateEd25519KeyPair } from '@/shared/crypto'
 import { bytesToHex } from '@noble/hashes/utils'
-import { getWalletInformation } from '@/shared/helpers'
+import { getWalletInformation, type Translation } from '@/shared/helpers'
 import { ConnectWalletPayload } from '@/shared/messages'
 import {
   DEFAULT_RATE_OF_PAY,
@@ -97,7 +98,8 @@ export class OpenPaymentsService {
   constructor(
     private browser: Browser,
     private storage: StorageService,
-    private deduplicator: Deduplicator
+    private deduplicator: Deduplicator,
+    private t: Translation
   ) {
     void this.initialize()
   }
@@ -307,6 +309,14 @@ export class OpenPaymentsService {
       clientNonce,
       walletAddress,
       amount: transformedAmount
+    }).catch((err) => {
+      if (err instanceof OpenPaymentsClientError) {
+        if (err.status === 400 && err.code === 'invalid_client') {
+          const msg = this.t('error_connectWallet_invalidClient')
+          throw new Error(msg, { cause: err })
+        }
+      }
+      throw err
     })
 
     // Q: Should this be moved to continuation polling?
diff --git a/tsconfig.json b/tsconfig.json
index 91f40cc7..4c51a26d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,7 @@
     "baseUrl": "./src",
     "esModuleInterop": true,
     "module": "commonjs",
-    "target": "ES2020",
+    "target": "ES2022",
     "allowJs": true,
     "jsx": "react",
     "sourceMap": true,