update health server and examples to beta.17

examples/react-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "walletconnect-react-app",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.17",
   "private": true,
   "keywords": [
     "walletconnect",
@@ -38,10 +38,10 @@
     "@types/react": "^16.9.53",
     "@types/react-dom": "^16.9.8",
     "@types/styled-components": "^5.1.3",
-    "@walletconnect/client": "^2.0.0-beta.16",
+    "@walletconnect/client": "^2.0.0-beta.17",
     "@walletconnect/qrcode-modal": "^2.0.0-alpha.20",
-    "@walletconnect/types": "^2.0.0-beta.16",
-    "@walletconnect/utils": "^2.0.0-beta.16",
+    "@walletconnect/types": "^2.0.0-beta.17",
+    "@walletconnect/utils": "^2.0.0-beta.17",
     "axios": "^0.21.1",
     "blockies-ts": "^1.0.0",
     "caip-api": "^2.0.0-beta.1",

examples/react-app/src/App.tsx

@@ -336,7 +336,7 @@ class App extends React.Component<any, any> {
     try {
       const arr = await Promise.all(
         this.state.accounts.map(async account => {
-          const [namespace, reference] = account.split(":");
+          const [namespace, reference, address] = account.split(":");
           const chainId = `${namespace}:${reference}`;
           const assets = await apiGetAccountAssets(address, chainId);
           return { account, assets };
@@ -382,8 +382,10 @@ class App extends React.Component<any, any> {
 
     try {
       // get ethereum address
-      const address = this.state.accounts.find(account => account.startsWith(chainId));
-      const account = `${chainId}:${address}`;
+      const account = this.state.accounts.find(account => account.startsWith(chainId));
+      if (account === undefined) throw new Error("Account is not found");
+      const address = account.split(":").pop();
+      if (address === undefined) throw new Error("Address is invalid");
 
       // open modal
       this.openRequestModal();
@@ -443,8 +445,10 @@ class App extends React.Component<any, any> {
       const hexMsg = encoding.utf8ToHex(message, true);
 
       // get ethereum address
-      const address = this.state.accounts.find(account => account.startsWith(chainId));
-      if (address === undefined) throw new Error("Address is not valid");
+      const account = this.state.accounts.find(account => account.startsWith(chainId));
+      if (account === undefined) throw new Error("Account is not found");
+      const address = account.split(":").pop();
+      if (address === undefined) throw new Error("Address is invalid");
 
       // personal_sign params
       const params = [hexMsg, address];
@@ -505,8 +509,10 @@ class App extends React.Component<any, any> {
       const message = JSON.stringify(eip712.example);
 
       // get ethereum address
-      const address = this.state.accounts.find(account => account.startsWith(chainId));
-      if (address === undefined) throw new Error("Address is not valid");
+      const account = this.state.accounts.find(account => account.startsWith(chainId));
+      if (account === undefined) throw new Error("Account is not found");
+      const address = account.split(":").pop();
+      if (address === undefined) throw new Error("Address is invalid");
 
       // eth_signTypedData params
       const params = [address, message];
@@ -592,8 +598,10 @@ class App extends React.Component<any, any> {
       );
 
       // get cosmos address
-      const address = this.state.accounts.find(account => account.startsWith(chainId));
-      if (address === undefined) throw new Error("Address is not valid");
+      const account = this.state.accounts.find(account => account.startsWith(chainId));
+      if (account === undefined) throw new Error("Account is not found");
+      const address = account.split(":").pop();
+      if (address === undefined) throw new Error("Address is invalid");
 
       // cosmos_signDirect params
       const params = {
@@ -662,8 +670,10 @@ class App extends React.Component<any, any> {
       };
 
       // get cosmos address
-      const address = this.state.accounts.find(account => account.startsWith(chainId));
-      if (address === undefined) throw new Error("Address is not valid");
+      const account = this.state.accounts.find(account => account.startsWith(chainId));
+      if (account === undefined) throw new Error("Account is not found");
+      const address = account.split(":").pop();
+      if (address === undefined) throw new Error("Address is invalid");
 
       // cosmos_signAmino params
       const params = { signerAddress: address, signDoc };