FIX/UPDATE - i18n wallets connected string handling, formatting and v…

…ersion bumps (#2326) * Update i18n string usage for connected wallets * Add new def to the zh translation file * Add docs info for chinese translation * Merge in changes and bump version * Bump versions for release * Refine types * Format * Revert demo changes for testing * Bump Wallet connect deps
blocknative · Dec 27, 2024 · 7b54d8a · 7b54d8a
1 parent 9db4d8e
commit 7b54d8a
Show file tree

Hide file tree

Showing 15 changed files with 620 additions and 62 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -57,7 +57,7 @@
     "@web3-onboard/capsule": "^2.4.0-alpha.1",
     "@web3-onboard/cede-store": "^2.3.1",
     "@web3-onboard/coinbase": "^2.3.1",
-    "@web3-onboard/core": "^2.23.0",
+    "@web3-onboard/core": "^2.23.1-alpha.1",
     "@web3-onboard/dcent": "^2.2.8",
     "@web3-onboard/enkrypt": "^2.1.1",
     "@web3-onboard/finoaconnect": "^2.0.0",

diff --git a/docs/src/routes/docs/[...3]modules/[...1]core/+page.md b/docs/src/routes/docs/[...3]modules/[...1]core/+page.md
@@ -317,9 +317,12 @@ type ConnectModalOptions = {
 #### i18n
 
 An object that defines the display text for different locales. Can also be used to override the default text. To override the default text, pass in an object for the `en` locale.
+Currently there is built-in support for:
+- English (`en`) - Default
+- Simplified Chinese (`zh`)
 
 ```typescript
-type Locale = string // eg 'en', 'es'
+type Locale = string // eg 'en', 'zh', 'es'
 type i18nOptions = Record<Locale, i18n>
 ```
 

diff --git a/packages/core/README.md b/packages/core/README.md
@@ -296,9 +296,12 @@ type disableFontDownload = boolean // defaults to false
 
 **`i18n`**
 An object that defines the display text for different locales. Can also be used to override the default text. To override the default text, pass in a object for the `en` locale.
+Currently there is built-in support for:
+- English (`en`) - Default
+- Simplified Chinese (`zh`)
 
 ```typescript
-type Locale = string // eg 'en', 'es'
+type Locale = string // eg 'en', 'zh', 'es'
 type i18nOptions = Record<Locale, i18n>
 ```
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.23.0",
+  "version": "2.23.1-alpha.1",
   "description": "Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -96,7 +96,7 @@
     "nanoid": "^4.0.0",
     "rxjs": "^7.5.5",
     "svelte": "^3.49.0",
-    "svelte-i18n": "^3.3.13",
+    "svelte-i18n": "^4.0.1",
     "viem": "2.12.0"
   },
   "engines": {

diff --git a/packages/core/src/i18n/en.json b/packages/core/src/i18n/en.json
@@ -39,7 +39,9 @@
         "subheading": "Connection Successful!",
         "paragraph": "Your wallet is now connected to {app}"
       },
-      "mainText": "Connected"
+      "mainText": "Connected",
+      "accountSelected": "Account Selected",
+      "availableWallet": "available wallet"
     }
   },
   "modals": {

diff --git a/packages/core/src/i18n/zh.json b/packages/core/src/i18n/zh.json
@@ -39,7 +39,9 @@
         "subheading": "连接成功！",
         "paragraph": "您的钱包现已连接到{app}"
       },
-      "mainText": "已连接"
+      "mainText": "已连接",
+      "accountSelected": "已选择账户",
+      "availableWallet": "可用钱包"
     }
   },
   "modals": {

diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts
@@ -1,4 +1,4 @@
-import { fromEventPattern, Observable } from 'rxjs'
+import { fromEventPattern, type Observable } from 'rxjs'
 import { filter, takeUntil, take, share, switchMap } from 'rxjs/operators'
 import partition from 'lodash.partition'
 import { isAddress, weiHexToEth } from '@web3-onboard/common'

diff --git a/packages/core/src/views/connect/Index.svelte b/packages/core/src/views/connect/Index.svelte
@@ -1,8 +1,5 @@
 <script lang="ts">
-  import {
-    ProviderRpcErrorCode,
-    type WalletModule
-  } from '@web3-onboard/common'
+  import { ProviderRpcErrorCode, type WalletModule } from '@web3-onboard/common'
   import EventEmitter from 'eventemitter3'
   import { _ } from 'svelte-i18n'
   import en from '../../i18n/en.json'
@@ -210,11 +207,14 @@
     try {
       let address
       let wagmiConnector: Connector | undefined
-      
+
       if (wagmi) {
         const { buildWagmiConfig, wagmiConnect, getWagmiConnector } = wagmi
 
-        const wagmiConfig: Config = await buildWagmiConfig(chains, { label, provider })
+        const wagmiConfig: Config = await buildWagmiConfig(chains, {
+          label,
+          provider
+        })
         updateWagmiConfig(wagmiConfig)
         wagmiConnector = getWagmiConnector(label)
 
@@ -284,7 +284,10 @@
 
       const chain = await getChainId(provider)
 
-      const update: Pick<WalletState, 'accounts' | 'chains' | 'wagmiConnector'> = {
+      const update: Pick<
+        WalletState,
+        'accounts' | 'chains' | 'wagmiConnector'
+      > = {
         accounts: [{ address, ens: null, uns: null, balance: null }],
         chains: [{ namespace: 'evm', id: chain }],
         wagmiConnector
@@ -601,8 +604,16 @@
               </div>
               <div class="mobile-subheader">
                 {$modalStep$ === 'selectingWallet'
-                  ? `${availableWallets} available wallets`
-                  : '1 account selected'}
+                  ? availableWallets > 1
+                    ? `${availableWallets} ${$_(
+                        'connect.selectingWallet.header'
+                      ).toLowerCase()}`
+                    : `1 ${$_(
+                        'connect.connectedWallet.availableWallet'
+                      ).toLowerCase()}`
+                  : `1 ${$_(
+                      'connect.connectedWallet.accountSelected'
+                    ).toLowerCase()}`}
               </div>
             </div>
           </div>

diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -34,7 +34,7 @@
     "@web3-onboard/bloom": "2.0.0",
     "@web3-onboard/capsule": "^2.4.0-alpha.1",
     "@web3-onboard/cede-store": "^2.3.1",
-    "@web3-onboard/core": "2.23.0",
+    "@web3-onboard/core": "2.23.1-alpha.1",
     "@web3-onboard/coinbase": "^2.4.1",
     "@web3-onboard/dcent": "^2.2.7",
     "@web3-onboard/enkrypt": "^2.1.1",
@@ -45,7 +45,7 @@
     "@web3-onboard/gas": "^2.2.1",
     "@web3-onboard/gnosis": "^2.3.1",
     "@web3-onboard/infinity-wallet": "^2.1.1",
-    "@web3-onboard/injected-wallets": "^2.11.2",
+    "@web3-onboard/injected-wallets": "^2.11.3-alpha.1",
     "@web3-onboard/keepkey": "^2.3.8",
     "@web3-onboard/keplr": "2.0.0",
     "@web3-onboard/keystone": "^2.3.8",
@@ -67,7 +67,7 @@
     "@web3-onboard/uauth": "^2.2.1",
     "@web3-onboard/venly": "^2.1.1",
     "@web3-onboard/wagmi": "^2.0.1",
-    "@web3-onboard/walletconnect": "^2.6.1",
+    "@web3-onboard/walletconnect": "^2.6.2-alpha.1",
     "@web3-onboard/web3auth": "^2.4.0",
     "@web3-onboard/xdefi": "^2.1.1",
     "@web3-onboard/zeal": "^2.1.1",

diff --git a/packages/injected/package.json b/packages/injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/injected-wallets",
-  "version": "2.11.2",
+  "version": "2.11.3-alpha.1",
   "description": "Injected wallet module for connecting browser extension and mobile wallets to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -61,7 +61,7 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@web3-onboard/core": "2.23.0",
+    "@web3-onboard/core": "2.23.1-alpha.1",
     "@web3-onboard/common": "^2.4.1",
     "use-sync-external-store": "1.0.0"
   },

diff --git a/packages/solid/package.json b/packages/solid/package.json
@@ -63,7 +63,7 @@
   },
   "dependencies": {
     "@web3-onboard/common": "^2.4.1",
-    "@web3-onboard/core": "2.23.0",
+    "@web3-onboard/core": "2.23.1-alpha.1",
     "solid-js": "^1.8.1"
   }
 }
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -62,7 +62,7 @@
     "@vueuse/core": "^8.4.2",
     "@vueuse/rxjs": "^8.2.0",
     "@web3-onboard/common": "^2.4.1",
-    "@web3-onboard/core": "2.23.0",
+    "@web3-onboard/core": "2.23.1-alpha.1",
     "vue-demi": "^0.12.4"
   },
   "peerDependencies": {

diff --git a/packages/walletconnect/package.json b/packages/walletconnect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/walletconnect",
-  "version": "2.6.1",
+  "version": "2.6.2-alpha.1",
   "description": "WalletConnect SDK module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -56,10 +56,10 @@
   "license": "MIT",
   "devDependencies": {
     "typescript": "^5.4.5",
-    "@walletconnect/types": "^2.13.0"
+    "@walletconnect/types": "^2.17.3"
   },
   "dependencies": {
-    "@walletconnect/ethereum-provider": "^2.13.0",
+    "@walletconnect/ethereum-provider": "^2.17.3",
     "@web3-onboard/common": "^2.4.1",
     "joi": "17.9.1",
     "rxjs": "^7.5.2"