Merge branch 'jribbink/non-wc-deeplink' into jribbink/wc-modal

onflow · Oct 30, 2024 · 34630d0 · 34630d0
2 parents 02f1f35 + bb42ce5
commit 34630d0
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 46 deletions.
diff --git a/.changeset/lovely-bikes-applaud.md b/.changeset/lovely-bikes-applaud.md
@@ -0,0 +1,5 @@
+---
+"@onflow/fcl-wc": patch
+---
+
+Fix WalletConnectModal close detection
diff --git a/.changeset/shaggy-snakes-vanish.md b/.changeset/shaggy-snakes-vanish.md
@@ -0,0 +1,6 @@
+---
+"@onflow/fcl-core": patch
+"@onflow/fcl-wc": patch
+---
+
+Improve deeplinking for WC/RPC wallets using non-WC/RPC pre-authz services
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/fcl-core/src/current-user/exec-service/index.js b/packages/fcl-core/src/current-user/exec-service/index.js
@@ -31,6 +31,7 @@ export async function execService({
   abortSignal = new AbortController().signal,
   user,
   execStrategy: _execStrategy,
+  user,
 }) {
   // Notify the developer if WalletConnect is not enabled
   checkWalletConnectEnabled()
@@ -56,7 +57,6 @@ export async function execService({
       config: execConfig,
       abortSignal,
       user,
-      opts,
     })
 
     if (res.status === "REDIRECT") {

diff --git a/packages/fcl-core/src/current-user/index.js b/packages/fcl-core/src/current-user/index.js
@@ -225,6 +225,7 @@ const getAuthenticate =
           opts,
           platform,
           execStrategy: discovery?.execStrategy,
+          user,
         })
 
         send(NAME, SET_CURRENT_USER, await buildUser(response))
@@ -258,8 +259,8 @@ const normalizePreAuthzResponse = authz => ({
 })
 
 const getResolvePreAuthz =
-  ({platform, user}) =>
-  authz => {
+  ({platform}) =>
+  (authz, {user}) => {
     const resp = normalizePreAuthzResponse(authz)
     const axs = []
 
@@ -276,9 +277,6 @@ const getResolvePreAuthz =
           service: az,
           msg: signable,
           platform,
-          opts: {
-            initiatedByPreAuthz: true,
-          },
           user,
         })
       },
@@ -322,7 +320,11 @@ const getAuthorization =
               msg: preSignable,
               user,
               platform,
-            })
+              user,
+            }),
+            {
+              user,
+            }
           )
         if (authz) {
           return {

diff --git a/packages/fcl-wc/CHANGELOG.md b/packages/fcl-wc/CHANGELOG.md
@@ -1,19 +1,12 @@
 # @onflow/fcl-wc
 
-## 6.0.0-alpha.2
+## 5.4.1-alpha.1
 
 ### Patch Changes
 
 - Updated dependencies [[`8a5f8e9874980c40c1feb3eac915c6e8570abbf3`](https://github.com/onflow/fcl-js/commit/8a5f8e9874980c40c1feb3eac915c6e8570abbf3)]:
   - @onflow/fcl-core@1.13.0-alpha.2
 
-## 6.0.0-alpha.1
-
-### Patch Changes
-
-- Updated dependencies [[`b9f49494d5b3faed1bc24005adc6ba312f653a21`](https://github.com/onflow/fcl-js/commit/b9f49494d5b3faed1bc24005adc6ba312f653a21)]:
-  - @onflow/fcl-core@1.13.0-alpha.1
-
 ## 5.4.1-alpha.0
 
 ### Patch Changes

diff --git a/packages/fcl-wc/package.json b/packages/fcl-wc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onflow/fcl-wc",
-  "version": "6.0.0-alpha.2",
+  "version": "5.4.1-alpha.1",
   "description": "WalletConnect adapter for FCL",
   "license": "Apache-2.0",
   "author": "Dapper Labs <[email protected]>",

diff --git a/packages/fcl-wc/src/service.ts b/packages/fcl-wc/src/service.ts
@@ -1,15 +1,17 @@
 import {invariant} from "@onflow/util-invariant"
 import {log, LEVELS} from "@onflow/util-logger"
-import {isMobile, openDeeplink} from "./utils"
-import {FLOW_METHODS, REQUEST_TYPES} from "./constants"
+import {isMobile, openDeeplink, shouldDeepLink} from "./utils"
+import {REQUEST_TYPES} from "./constants"
 import {SignClient} from "@walletconnect/sign-client/dist/types/client"
 import {createSessionProposal, request} from "./session"
 import {showNotification} from "./ui/notifications"
 
 import mobileIcon from "./ui/assets/mobile.png"
+import {ModalCtrlState} from "@walletconnect/modal-core/dist/_types/src/types/controllerTypes"
 
-type WalletConnectModalType =
-  typeof import("@walletconnect/modal").WalletConnectModal
+type WalletConnectModalType = import("@walletconnect/modal").WalletConnectModal
+
+type Constructor<T> = new (...args: any[]) => T
 
 export const SERVICE_PLUGIN_NAME = "fcl-plugin-service-walletconnect"
 export const WC_SERVICE_METHOD = "WC/RPC"
@@ -47,7 +49,7 @@ export const makeServicePlugin = (
 const makeExec = (
   clientPromise: Promise<SignClient | null>,
   {wcRequestHook, pairingModalOverride}: any,
-  WalletConnectModal: Promise<WalletConnectModalType>
+  WalletConnectModal: Promise<Constructor<WalletConnectModalType>>
 ) => {
   return async ({
     service,
@@ -110,11 +112,8 @@ const makeExec = (
       })
     }
 
-    if (
-      isMobile() &&
-      method !== FLOW_METHODS.FLOW_AUTHN &&
-      !(method === FLOW_METHODS.FLOW_AUTHZ && opts.initiatedByPreAuthz)
-    ) {
+    // Deeplink to the wallet app if necessary
+    if (shouldDeepLink({service, user})) {
       openDeeplink(appLink)
     }
 
@@ -148,7 +147,9 @@ const makeExec = (
 }
 
 // Connect to WalletConnect directly from the browser via deep link or WalletConnectModal
-function connectWc(WalletConnectModal: Promise<WalletConnectModalType>) {
+function connectWc(
+  WalletConnectModal: Promise<Constructor<WalletConnectModalType>>
+) {
   return async ({
     service,
     onClose,
@@ -177,7 +178,7 @@ function connectWc(WalletConnectModal: Promise<WalletConnectModalType>) {
     )
 
     let _uri: string | null = null,
-      walletConnectModal: any
+      walletConnectModal: WalletConnectModalType | null = null
 
     try {
       const {uri, approval} = await createSessionProposal({
@@ -206,7 +207,22 @@ function connectWc(WalletConnectModal: Promise<WalletConnectModalType>) {
           walletConnectModal = new (await WalletConnectModal)({
             projectId,
           })
-          walletConnectModal.openModal({uri, onClose})
+
+          // Open WalletConnectModal
+          walletConnectModal.openModal({
+            uri,
+            onClose,
+          })
+
+          // Subscribe to modal state changes
+          const unsubscribeModal = walletConnectModal.subscribeModal(
+            (state: ModalCtrlState) => {
+              if (state.open === false) {
+                onClose?.()
+                unsubscribeModal()
+              }
+            }
+          )
         } else {
           pairingModalOverride(uri, onClose)
         }

diff --git a/packages/fcl-wc/src/utils.ts b/packages/fcl-wc/src/utils.ts
@@ -1,6 +1,9 @@
 import {log, LEVELS} from "@onflow/util-logger"
 import {invariant} from "@onflow/util-invariant"
 import * as fclCore from "@onflow/fcl-core"
+import {FLOW_METHODS} from "./constants"
+import {WC_SERVICE_METHOD} from "./service"
+import {Service} from "@onflow/typedefs"
 
 const makeFlowServicesFromWallets = (wallets: any[]) => {
   return Object.values(wallets)
@@ -94,3 +97,20 @@ export function openDeeplink(url: string) {
     window.open(url, "_blank")
   }
 }
+
+export function shouldDeepLink({service, user}: {service: Service; user: any}) {
+  // Only deeplink on mobile
+  if (!isMobile()) return false
+
+  // If this is an authn request, the user has already been deeplinked by connectWc
+  if (service.method === FLOW_METHODS.FLOW_AUTHN) return false
+
+  // If there was a pre-authz WC request, the user has already been deeplinked
+  if (
+    service.method === FLOW_METHODS.FLOW_AUTHZ &&
+    user?.services?.find((s: Service) => s.method === WC_SERVICE_METHOD)
+  )
+    return false
+
+  return true
+}
diff --git a/packages/fcl/CHANGELOG.md b/packages/fcl/CHANGELOG.md
@@ -1,21 +1,12 @@
 # @onflow/fcl
 
-## 1.12.4-alpha.2
+## 1.12.4-alpha.3
 
 ### Patch Changes
 
-- Updated dependencies [[`8a5f8e9874980c40c1feb3eac915c6e8570abbf3`](https://github.com/onflow/fcl-js/commit/8a5f8e9874980c40c1feb3eac915c6e8570abbf3)]:
+- Updated dependencies:
   - @onflow/fcl-core@1.13.0-alpha.2
-  - @onflow/fcl-wc@6.0.0-alpha.2
-
-## 1.12.4-alpha.1
-
-### Patch Changes
-
-- Updated dependencies [[`b9f49494d5b3faed1bc24005adc6ba312f653a21`](https://github.com/onflow/fcl-js/commit/b9f49494d5b3faed1bc24005adc6ba312f653a21)]:
-  - @onflow/fcl-core@1.13.0-alpha.1
-  - @onflow/sdk@1.5.4-alpha.1
-  - @onflow/fcl-wc@6.0.0-alpha.1
+  - @onflow/fcl-wc@5.4.1-alpha.1
 
 ## 1.12.4-alpha.0
 

diff --git a/packages/fcl/package.json b/packages/fcl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onflow/fcl",
-  "version": "1.12.4-alpha.2",
+  "version": "1.12.4-alpha.3",
   "description": "Flow Client Library",
   "license": "Apache-2.0",
   "author": "Dapper Labs <[email protected]>",
@@ -50,7 +50,7 @@
     "@babel/runtime": "^7.25.7",
     "@onflow/config": "1.5.1-alpha.0",
     "@onflow/fcl-core": "1.13.0-alpha.2",
-    "@onflow/fcl-wc": "6.0.0-alpha.2",
+    "@onflow/fcl-wc": "5.4.1-alpha.1",
     "@onflow/interaction": "0.0.11",
     "@onflow/rlp": "1.2.3-alpha.0",
     "@onflow/sdk": "1.5.4-alpha.1",