Merge pull request #26 from Hanssen0/main

feat(common): support local config for `runPopup`
nervina-labs · Jun 24, 2024 · 7dd4ba5 · 7dd4ba5
2 parents e1d004e + 4c2a6a9
commit 7dd4ba5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.changeset/wise-boxes-drop.md b/.changeset/wise-boxes-drop.md
@@ -0,0 +1,5 @@
+---
+"@joyid/common": minor
+---
+
+feat(common): support local config for `runPopup`
diff --git a/packages/common/src/sdk/popup.ts b/packages/common/src/sdk/popup.ts
@@ -1,6 +1,7 @@
 /* eslint-disable prefer-const */
 import type {
   AuthResponseData,
+  DappConfig,
   DappRequestType,
   SignCkbTxResponseData,
   SignCotaNFTResponseData,
@@ -51,7 +52,7 @@ export const openPopup = (url: string = ''): Window | null => {
   )
 }
 
-interface PopupRerurnType {
+export interface PopupRerurnType {
   [DappRequestType.Auth]: AuthResponseData
   [DappRequestType.SignMessage]: SignMessageResponseData
   [DappRequestType.SignEvm]: SignEvmTxResponseData
@@ -72,7 +73,7 @@ interface PopupRerurnType {
 }
 
 export const runPopup = async <T extends DappRequestType>(
-  config: PopupConfigOptions<T>
+  config: PopupConfigOptions<T> & Partial<DappConfig>
 ): Promise<PopupRerurnType[T]> =>
   new Promise<PopupRerurnType[T]>((resolve, reject) => {
     if (isStandaloneBrowser()) {
@@ -100,7 +101,7 @@ export const runPopup = async <T extends DappRequestType>(
     )
 
     popupEventListener = (e: MessageEvent) => {
-      const { joyidAppURL } = getConfig()
+      const joyidAppURL = config.joyidAppURL ?? getConfig().joyidAppURL
       if (joyidAppURL == null) {
         throw new Error('joyidAppURL is not set in the config')
       }