Merge pull request #296 from airgap-it/develop

Develop
airgap-it · Nov 10, 2021 · 3462b66 · 3462b66
2 parents 01ea422 + 493e0d1
commit 3462b66
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 8 deletions.
diff --git a/assets/toast/toast.css b/assets/toast/toast.css
@@ -55,8 +55,8 @@
     flex-wrap: wrap;
   }
   .beacon-toast__wallet__link {
-    flex: 0 0 100%;
-    margin-left: 0 !important;
+    display: flex;
+    margin-left: 12px !important;
   }
 }
 
@@ -148,7 +148,7 @@ hr {
   display: contents;
 }
 .beacon-toast__wallet__link {
-  margin-left: 12px;
+  margin-left: 8px;
 }
 .beacon-toast__wallet__link svg {
   margin-left: 4px;
@@ -221,6 +221,11 @@ a:hover {
   padding-right: 24px;
 }
 
+#beacon-text-content {
+  display: flex;
+  align-items: center;
+}
+
 .progress-line,
 .progress-line:before {
   height: 3px;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-sdk",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "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",

diff --git a/scripts/generate-wallet-list.ts b/scripts/generate-wallet-list.ts
@@ -37,7 +37,8 @@ export const webList: WebApp[] = [
       [NetworkType.EDONET]: 'https://edonet.kukai.app',
       [NetworkType.FLORENCENET]: 'https://florencenet.kukai.app',
       [NetworkType.GRANADANET]: 'https://granadanet.kukai.app',
-      [NetworkType.HANGZHOUNET]: 'https://hangzhounet.kukai.app'
+      [NetworkType.HANGZHOUNET]: 'https://hangzhounet.kukai.app',
+      [NetworkType.IDIAZABALNET]: 'https://idiazabalnet.kukai.app'
     }
   }
 ]

diff --git a/src/constants.ts b/src/constants.ts
@@ -1,2 +1,2 @@
-export const SDK_VERSION: string = '2.3.6'
+export const SDK_VERSION: string = '2.3.7'
 export const BEACON_VERSION: string = '2'
diff --git a/src/types/beacon/NetworkType.ts b/src/types/beacon/NetworkType.ts
@@ -5,5 +5,6 @@ export enum NetworkType {
   FLORENCENET = 'florencenet',
   GRANADANET = 'granadanet',
   HANGZHOUNET = 'hangzhounet',
+  IDIAZABALNET = 'idiazabalnet',
   CUSTOM = 'custom'
 }
diff --git a/src/ui/alert/Pairing.ts b/src/ui/alert/Pairing.ts
@@ -54,6 +54,7 @@ export interface WebApp extends AppBase {
     [NetworkType.FLORENCENET]?: string
     [NetworkType.GRANADANET]?: string
     [NetworkType.HANGZHOUNET]?: string
+    [NetworkType.IDIAZABALNET]?: string
     [NetworkType.CUSTOM]?: string
   }
 }

diff --git a/src/utils/tezblock-blockexplorer.ts b/src/utils/tezblock-blockexplorer.ts
@@ -10,6 +10,7 @@ export class TezblockBlockExplorer extends BlockExplorer {
       [NetworkType.FLORENCENET]: 'https://florencenet.tezblock.io',
       [NetworkType.GRANADANET]: 'https://granadanet.tezblock.io',
       [NetworkType.HANGZHOUNET]: 'https://hangzhounet.tezblock.io',
+      [NetworkType.IDIAZABALNET]: 'https://idiazabalnet.tezblock.io',
       [NetworkType.CUSTOM]: 'https://granadanet.tezblock.io'
     }
   ) {