Merge pull request #64 from CityOfZion/CU-86drw584r-4

CU-86drw584r Swap Multi Invoke - Implement SwapController without routes
CityOfZion · Jun 28, 2024 · 00d69bd · 00d69bd
2 parents ced9fc2 + 0a73693
commit 00d69bd
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 35 deletions.
diff --git a/common/changes/@cityofzion/bs-neo-legacy/CU-86drw584r-4_2024-06-28-21-50.json b/common/changes/@cityofzion/bs-neo-legacy/CU-86drw584r-4_2024-06-28-21-50.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cityofzion/bs-neo-legacy",
+      "comment": "Removing react-native",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cityofzion/bs-neo-legacy"
+}
diff --git a/common/changes/@cityofzion/bs-neo3/CU-86drw584r-4_2024-06-28-21-50.json b/common/changes/@cityofzion/bs-neo3/CU-86drw584r-4_2024-06-28-21-50.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cityofzion/bs-neo3",
+      "comment": "Removing react-native",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cityofzion/bs-neo3"
+}
diff --git a/packages/bs-neo-legacy/src/BSNeoLegacy.ts b/packages/bs-neo-legacy/src/BSNeoLegacy.ts
@@ -98,22 +98,8 @@ export class BSNeoLegacy<BSCustomName extends string = string>
   }
 
   async decrypt(encryptedKey: string, password: string): Promise<Account> {
-    let BsReactNativeDecrypt: any
-
-    try {
-      const { NativeModules } = require('react-native')
-      BsReactNativeDecrypt = NativeModules.BsReactNativeDecrypt
-
-      if (!BsReactNativeDecrypt) {
-        throw new Error('@CityOfZion/bs-react-native-decrypt is not installed')
-      }
-    } catch {
-      const key = await wallet.decrypt(encryptedKey, password)
-      return this.generateAccountFromKey(key)
-    }
-
-    const privateKey = await BsReactNativeDecrypt.decryptNeoLegacy(encryptedKey, password)
-    return this.generateAccountFromKey(privateKey)
+    const key = await wallet.decrypt(encryptedKey, password)
+    return this.generateAccountFromKey(key)
   }
 
   encrypt(key: string, password: string): Promise<string> {

diff --git a/packages/bs-neo3/package.json b/packages/bs-neo3/package.json
@@ -41,8 +41,5 @@
     "ts-jest": "29.1.1",
     "ts-node": "10.9.1",
     "typescript": "4.9.5"
-  },
-  "optionalDependencies": {
-    "react-native": "*"
   }
 }
diff --git a/packages/bs-neo3/src/BSNeo3.ts b/packages/bs-neo3/src/BSNeo3.ts
@@ -136,22 +136,8 @@ export class BSNeo3<BSCustomName extends string = string>
   }
 
   async decrypt(encryptedKey: string, password: string): Promise<Account> {
-    let BsReactNativeDecrypt: any
-
-    try {
-      const { NativeModules } = require('react-native')
-      BsReactNativeDecrypt = NativeModules.BsReactNativeDecrypt
-
-      if (!BsReactNativeDecrypt) {
-        throw new Error('@CityOfZion/bs-react-native-decrypt is not installed')
-      }
-    } catch {
-      const key = await wallet.decrypt(encryptedKey, password)
-      return this.generateAccountFromKey(key)
-    }
-
-    const privateKey = await BsReactNativeDecrypt.decryptNeo3(encryptedKey, password)
-    return this.generateAccountFromKey(privateKey)
+    const key = await wallet.decrypt(encryptedKey, password)
+    return this.generateAccountFromKey(key)
   }
 
   async encrypt(key: string, password: string): Promise<string> {