From 1e22a96d20aa2bf512d7c57cbd6e2b2058256a59 Mon Sep 17 00:00:00 2001
From: yuval-fireblocks <109523195+yuval-fireblocks@users.noreply.github.com>
Date: Thu, 15 Aug 2024 14:37:15 +0300
Subject: [PATCH] upgrade (#35)

---
 package.json    |  2 +-
 src/AppStore.ts | 24 +++++++++++++++---------
 yarn.lock       | 18 +++++++++---------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 7ae54f3..a5b1cbb 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@fireblocks/ncw-js-sdk": "12.2.0",
+    "@fireblocks/ncw-js-sdk": "12.5.0",
     "base58-js": "^2.0.0",
     "classnames": "^2.3.2",
     "js-base64": "^3.7.5",
diff --git a/src/AppStore.ts b/src/AppStore.ts
index f1a5adf..76a5aaf 100644
--- a/src/AppStore.ts
+++ b/src/AppStore.ts
@@ -14,6 +14,7 @@ import {
   TEvent,
   TMPCAlgorithm,
   version as fireblocksNCWSdkVersion,
+  getFireblocksNCWInstance,
 } from "@fireblocks/ncw-js-sdk";
 import { create } from "zustand";
 import { IAppState, IPassphraseInfo, TPassphrases, TAppMode, INewTransactionData } from "./IAppState";
@@ -367,15 +368,20 @@ export const useAppStore = create<IAppState>()((set, get) => {
         });
         logger = await IndexedDBLoggerFactory({ deviceId, logger: ConsoleLoggerFactory() });
 
-        fireblocksNCW = await FireblocksNCWFactory({
-          env: ENV_CONFIG.NCW_SDK_ENV as TEnv,
-          logLevel: "INFO",
-          deviceId,
-          messagesHandler,
-          eventsHandler,
-          secureStorageProvider,
-          logger,
-        });
+        const ncwInstance = getFireblocksNCWInstance(deviceId);
+        if (ncwInstance) {
+          fireblocksNCW = ncwInstance;
+        } else {
+          fireblocksNCW = await FireblocksNCWFactory({
+            env: ENV_CONFIG.NCW_SDK_ENV as TEnv,
+            logLevel: "INFO",
+            deviceId,
+            messagesHandler,
+            eventsHandler,
+            secureStorageProvider,
+            logger,
+          });
+        }
 
         txsUnsubscriber = apiService.listenToTxs(deviceId, (tx: ITransactionData) => {
           const txs = updateOrAddTx(get().txs, tx);
diff --git a/yarn.lock b/yarn.lock
index f55ed96..237cf90 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -738,19 +738,19 @@
   resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.5.tgz#cd9897680d0a2f1bce8d8c23a590e5874f4617c5"
   integrity sha512-eSkJsnhBWv5kCTSU1tSUVl9mpFu+5NXXunZc83le8GMjMlsWwQArSc7cJJ4yl+aDFY0NGLi0AjZWMn1axOrkRg==
 
-"@fireblocks/ncw-js-infra@1.0.19":
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/@fireblocks/ncw-js-infra/-/ncw-js-infra-1.0.19.tgz#b95ce94c930b9d89565164138b17e5531662d4cd"
-  integrity sha512-ROogCO7li4Ouevunm4sBiw/4hNuUxynxNPSUymKPV3GrKJBSRaTp6+/KXnDkYG2PHW3vlowE/ndKXSMVx1wUEg==
+"@fireblocks/ncw-js-infra@1.0.21":
+  version "1.0.21"
+  resolved "https://registry.yarnpkg.com/@fireblocks/ncw-js-infra/-/ncw-js-infra-1.0.21.tgz#ac1f4c73a37cb3510b1c8f94ebffadfca63eab52"
+  integrity sha512-sGeTxGGMPXxT8saigEQUHJL1pFoN9RuvEKmfUdMTBfuQ0SvZkyg3uNdrq3ZnIvv6SVFDPZ4RNHjhgu39SKlv+Q==
   dependencies:
     "@types/emscripten" "^1.39.7"
 
-"@fireblocks/ncw-js-sdk@12.2.0":
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/@fireblocks/ncw-js-sdk/-/ncw-js-sdk-12.2.0.tgz#32c810641544ec2a7e2cad4af560addd0453c886"
-  integrity sha512-nAaM+jtnxRoVho6QDsqSkLPYoVEIUOIsVlFyQ9nLWYEtwXRiX7L14Wnr2yDGTo4q+g3YZJIIAhdPOEJmPFQ/kA==
+"@fireblocks/ncw-js-sdk@12.5.0":
+  version "12.5.0"
+  resolved "https://registry.yarnpkg.com/@fireblocks/ncw-js-sdk/-/ncw-js-sdk-12.5.0.tgz#616383b3bf19e3a6e2c8e17aec487d79e85a5ac4"
+  integrity sha512-KmMia8L6J1HY8LTHeaGVwKEioPaBY2E+w9ulO5qLPeNszlvq6jZomb7rdX8HumnfrpQIL/9YzFCKrCTGcv4F2A==
   dependencies:
-    "@fireblocks/ncw-js-infra" "1.0.19"
+    "@fireblocks/ncw-js-infra" "1.0.21"
     jwt-decode "^3.1.2"
     node-forge "^1.3.1"