Merge pull request #279 from airgap-it/develop

Develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-sdk",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "The beacon-sdk allows you to easily connect DApps with Wallets through P2P communication or a chrome extension.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

scripts/generate-wallet-list.ts

@@ -36,7 +36,8 @@ export const webList: WebApp[] = [
       [NetworkType.DELPHINET]: 'https://testnet.kukai.app',
       [NetworkType.EDONET]: 'https://edonet.kukai.app',
       [NetworkType.FLORENCENET]: 'https://florencenet.kukai.app',
-      [NetworkType.GRANADANET]: 'https://granadanet.kukai.app'
+      [NetworkType.GRANADANET]: 'https://granadanet.kukai.app',
+      [NetworkType.HANGZHOUNET]: 'https://hangzhounet.kukai.app'
     }
   }
 ]

src/constants.ts

@@ -1,2 +1,2 @@
-export const SDK_VERSION: string = '2.3.2'
+export const SDK_VERSION: string = '2.3.3'
 export const BEACON_VERSION: string = '2'

src/events.ts

@@ -229,7 +229,7 @@ const showAcknowledgedToast = async (data: {
 }
 
 const showPrepare = async (data: { walletInfo?: WalletInfo }): Promise<void> => {
-  const text = data.walletInfo ? `Preparing Request for {{wallet}}...` : 'Preparing Request...'
+  const text = data.walletInfo ? `Preparing Request for&nbsp;{{wallet}}...` : 'Preparing Request...'
   openToast({
     body: `<span class="beacon-toast__wallet__outer">${text}<span>`,
     state: 'prepare',

src/types/beacon/NetworkType.ts

@@ -4,5 +4,6 @@ export enum NetworkType {
   EDONET = 'edonet',
   FLORENCENET = 'florencenet',
   GRANADANET = 'granadanet',
+  HANGZHOUNET = 'hangzhounet',
   CUSTOM = 'custom'
 }

src/ui/alert/Pairing.ts

@@ -53,6 +53,7 @@ export interface WebApp extends AppBase {
     [NetworkType.EDONET]?: string
     [NetworkType.FLORENCENET]?: string
     [NetworkType.GRANADANET]?: string
+    [NetworkType.HANGZHOUNET]?: string
     [NetworkType.CUSTOM]?: string
   }
 }
@@ -339,11 +340,26 @@ export class Pairing {
         color: app.color,
         logo: app.logo,
         enabled: true,
-        async clickHandler(): Promise<void> {
-          const code = await serializer.serialize(await pairingCode())
-          const link = getTzip10Link(app.links[network] ?? app.links[NetworkType.MAINNET], code)
-          window.open(link, '_blank')
-          statusUpdateHandler(WalletType.WEB, this, true)
+        clickHandler(): void {
+          const newTab = window.open('', '_blank')
+
+          pairingCode()
+            .then((code) => serializer.serialize(code))
+            .then((code) => {
+              const link = getTzip10Link(app.links[network] ?? app.links[NetworkType.MAINNET], code)
+
+              if (newTab) {
+                newTab.location.href = link
+              } else {
+                window.open(link, '_blank')
+              }
+
+              statusUpdateHandler(WalletType.WEB, this, true)
+            })
+            .catch((error) => {
+              // eslint-disable-next-line no-console
+              console.error(error)
+            })
         }
       }))
       .sort((a, b) => a.key.localeCompare(b.key))

src/utils/tezblock-blockexplorer.ts

@@ -9,6 +9,7 @@ export class TezblockBlockExplorer extends BlockExplorer {
       [NetworkType.EDONET]: 'https://edonet.tezblock.io',
       [NetworkType.FLORENCENET]: 'https://florencenet.tezblock.io',
       [NetworkType.GRANADANET]: 'https://granadanet.tezblock.io',
+      [NetworkType.HANGZHOUNET]: 'https://hangzhounet.tezblock.io',
       [NetworkType.CUSTOM]: 'https://granadanet.tezblock.io'
     }
   ) {