release: 1.0.1-beta.1

celo-org · Jun 27, 2023 · 97412bb · 97412bb
1 parent 0ec5573
commit 97412bb
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 19 deletions.
diff --git a/packages/rainbowkit-celo/lists/index.ts b/packages/rainbowkit-celo/lists/index.ts
@@ -7,7 +7,7 @@ import {
   safeWallet,
   braveWallet,
 } from "@rainbow-me/rainbowkit/wallets";
-import { Valora, CeloWallet } from "@celo/rainbowkit-celo/wallets";
+import { Valora, CeloWallet } from "../wallets";
 
 import type { Chain } from "@rainbow-me/rainbowkit";
 

diff --git a/packages/rainbowkit-celo/package.json b/packages/rainbowkit-celo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@celo/rainbowkit-celo",
   "author": "cLabs",
-  "version": "1.0.0",
+  "version": "1.0.1-beta.1",
   "description": "Quickly Setup RainbowKit for Celo",
   "homepage": "https://rainbowkit-with-celo.vercel.app/",
   "repository": {
@@ -76,12 +76,12 @@
     "build": "tsc -b"
   },
   "dependencies": {
-    "@wagmi/chains": "^0.2.22"
+    "@wagmi/chains": "^1.3.0"
   },
   "peerDependencies": {
-    "@rainbow-me/rainbowkit": "^1.0.0",
-    "viem": "^0.3.21",
-    "wagmi": "^1.0.0"
+    "@rainbow-me/rainbowkit": "^1.0.3",
+    "viem": "^1.1.8",
+    "wagmi": "^1.3.1"
   },
   "devDependencies": {
     "@types/react": "^17.0.37",

diff --git a/packages/rainbowkit-celo/utils/getWalletConnectUri.ts b/packages/rainbowkit-celo/utils/getWalletConnectUri.ts
@@ -0,0 +1,13 @@
+// Note: taken from https://github.com/rainbow-me/rainbowkit/blob/main/packages/rainbowkit/src/utils/getWalletConnectUri.ts#L3
+// since they don't expose it
+import type { Connector } from "wagmi/connectors";
+
+export async function getWalletConnectUri(
+  connector: Connector,
+  version: "1" | "2"
+): Promise<string> {
+  const provider = await connector.getProvider();
+  return version === "2"
+    ? new Promise<string>((resolve) => provider.once("display_uri", resolve))
+    : provider.connector.uri;
+}
diff --git a/packages/rainbowkit-celo/wallets/celo-terminal.ts b/packages/rainbowkit-celo/wallets/celo-terminal.ts
@@ -4,6 +4,7 @@ import {
   Wallet,
 } from "@rainbow-me/rainbowkit";
 import { Alfajores, Baklava, Celo } from "@celo/rainbowkit-celo/chains";
+import { getWalletConnectUri } from "../utils/getWalletConnectUri";
 
 interface CeloTerminalOptions {
   chains: Chain[];
@@ -21,6 +22,7 @@ export const CeloTerminal = ({
   iconBackground: "#FFF",
   createConnector: () => {
     const connector = getWalletConnectConnector({
+      version: "2",
       chains,
       projectId,
     });
@@ -29,7 +31,7 @@ export const CeloTerminal = ({
       connector,
       desktop: {
         getUri: async () => {
-          const { uri } = (await connector.getProvider()).connector;
+          const uri = await getWalletConnectUri(connector, "2");
           // Note: This doesn't work. I'll try to have a PR to add deeplinking to CeloTerminal - Nicolas
           return `https://celoterminal.com/wc?uri=${encodeURIComponent(uri)}`;
         },

diff --git a/packages/rainbowkit-celo/wallets/celo-wallet.ts b/packages/rainbowkit-celo/wallets/celo-wallet.ts
@@ -2,8 +2,9 @@ import type { Chain, Wallet } from "@rainbow-me/rainbowkit";
 import { getWalletConnectConnector } from "@rainbow-me/rainbowkit";
 
 import { Alfajores, Baklava, Celo } from "@celo/rainbowkit-celo/chains";
+import { getWalletConnectUri } from "../utils/getWalletConnectUri";
 
-interface CeloWalletOptions {
+export interface CeloWalletOptions {
   chains: Chain[];
   projectId: string;
 }
@@ -18,20 +19,18 @@ export const CeloWallet = ({
   iconBackground: "#FFF",
   createConnector: () => {
     const connector = getWalletConnectConnector({
+      version: "2",
       chains,
       projectId,
     });
     return {
       connector,
       mobile: {
-        getUri: async () => {
-          const { uri } = (await connector.getProvider()).connector;
-          return uri;
-        },
+        getUri: () => getWalletConnectUri(connector, "2"),
       },
       desktop: {
         getUri: async () => {
-          const { uri } = (await connector.getProvider()).connector;
+          const uri = await getWalletConnectUri(connector, "2");
           return `celowallet://wc?uri=${encodeURIComponent(uri)}`;
         },
       },

diff --git a/packages/rainbowkit-celo/wallets/valora.ts b/packages/rainbowkit-celo/wallets/valora.ts
@@ -1,12 +1,16 @@
-import type { Chain, Wallet } from "@rainbow-me/rainbowkit";
-import { getWalletConnectConnector } from "@rainbow-me/rainbowkit";
+import {
+  Chain,
+  getWalletConnectConnector,
+  Wallet,
+} from "@rainbow-me/rainbowkit";
 
 import {
   Alfajores,
   Baklava,
   Celo,
   Cannoli,
 } from "@celo/rainbowkit-celo/chains";
+import { getWalletConnectUri } from "../utils/getWalletConnectUri";
 
 // rainbowkit utils has it but doesn't export it :/
 function isAndroid(): boolean {
@@ -15,7 +19,7 @@ function isAndroid(): boolean {
   );
 }
 
-interface ValoraOptions {
+export interface ValoraOptions {
   chains: Chain[];
   projectId: string;
 }
@@ -36,22 +40,23 @@ export const Valora = ({
   },
   createConnector: () => {
     const connector = getWalletConnectConnector({
+      version: "2",
       chains,
       projectId,
     });
     return {
       connector,
       mobile: {
         getUri: async () => {
-          const { uri } = (await connector.getProvider()).connector;
+          const uri = await getWalletConnectUri(connector, "2");
           return isAndroid()
             ? uri
             : // ideally this would use the WalletConnect registry, but this will do for now
               `https://valoraapp.com/wc?uri=${encodeURIComponent(uri)}`;
         },
       },
       qrCode: {
-        getUri: async () => (await connector.getProvider()).connector.uri,
+        getUri: () => getWalletConnectUri(connector, "2"),
         instructions: {
           learnMoreUrl: "https://valoraapp.com/learn",
           steps: [

diff --git a/yarn.lock b/yarn.lock
@@ -1517,11 +1517,16 @@
   resolved "https://registry.yarnpkg.com/@wagmi/chains/-/chains-0.2.16.tgz#a726716e4619ec1c192b312e23f9c38407617aa0"
   integrity sha512-rkWaI2PxCnbD8G07ZZff5QXftnSkYL0h5f4DkHCG3fGYYr/ZDvmCL4bMae7j7A9sAif1csPPBmbCzHp3R5ogCQ==
 
-"@wagmi/[email protected]", "@wagmi/chains@^0.2.22":
+"@wagmi/[email protected]":
   version "0.2.22"
   resolved "https://registry.yarnpkg.com/@wagmi/chains/-/chains-0.2.22.tgz#25e511e134a00742e4fbf5108613dadf876c5bd9"
   integrity sha512-TdiOzJT6TO1JrztRNjTA5Quz+UmQlbvWFG8N41u9tta0boHA1JCAzGGvU6KuIcOmJfRJkKOUIt67wlbopCpVHg==
 
+"@wagmi/chains@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@wagmi/chains/-/chains-1.3.0.tgz#a17438d44abe98fdf1ec3a91df115c6bfaed39c0"
+  integrity sha512-7tyr1irTZQpA4/4HoIiJP3XYZuJIZuWiZ1V1j5WEG3cjm8TXIlMEzO0N+hT/cZKw4/UtF2EukvB8GkDWa2S77w==
+
 "@wagmi/[email protected]":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@wagmi/connectors/-/connectors-1.0.2.tgz#114822768bd56a9a62c8d12b9ba6895bc7f7b616"