Merge pull request #345 from breez/RN-errors

React native errors
breez · Jul 21, 2023 · 7d6003a · 7d6003a
2 parents a750520 + bb540ea
commit 7d6003a
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 177 deletions.
diff --git a/libs/sdk-react-native/android/src/main/java/com/breezsdk/BreezSDKModule.kt b/libs/sdk-react-native/android/src/main/java/com/breezsdk/BreezSDKModule.kt
@@ -37,7 +37,7 @@ class BreezSDKModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
             return breezServices!!
         }
 
-        throw SdkException.Exception("BreezServices not initialized")
+        throw SdkException.Generic("BreezServices not initialized")
     }
 
     @ReactMethod
@@ -275,11 +275,8 @@ class BreezSDKModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
     fun nodeInfo(promise: Promise) {
         executor.execute {
             try {
-                getBreezServices().nodeInfo()?.let {nodeState->
-                    promise.resolve(readableMapOf(nodeState))
-                } ?: run {
-                    promise.reject(TAG, "No available node info")
-                }
+                val nodeState = getBreezServices().nodeInfo()
+                promise.resolve(readableMapOf(nodeState))                
             } catch (e: SdkException) {
                 e.printStackTrace()
                 promise.reject(TAG, e.message ?: "Error calling nodeInfo", e)

diff --git a/libs/sdk-react-native/ios/BreezSDKMapper.swift b/libs/sdk-react-native/ios/BreezSDKMapper.swift
@@ -58,14 +58,14 @@ class BreezSDKMapper {
         switch(envType) {
         case "production": return EnvironmentType.production
         case "staging": return EnvironmentType.staging
-        default: throw SdkError.Error(message: "Invalid environment type")
+        default: throw SdkError.Generic(message: "Invalid environment type")
         }
     }
 
     static func asBitcoinProvider(provider: String) throws -> BuyBitcoinProvider {
         switch(provider) {
         case "moonpay": return BuyBitcoinProvider.moonpay
-        default: throw SdkError.Error(message: "Invalid Bitcoin provider")
+        default: throw SdkError.Generic(message: "Invalid Bitcoin provider")
         }
     }
 
@@ -163,7 +163,7 @@ class BreezSDKMapper {
         case "sent": return PaymentTypeFilter.sent
         case "received": return PaymentTypeFilter.received
         case "all": return PaymentTypeFilter.all
-        default: throw SdkError.Error(message: "Invalid filter")
+        default: throw SdkError.Generic(message: "Invalid filter")
         }
     }
 
@@ -173,7 +173,7 @@ class BreezSDKMapper {
         case "regtest": return Network.regtest
         case "signet": return Network.signet
         case "testnet": return Network.testnet
-        default: throw SdkError.Error(message: "Invalid network")
+        default: throw SdkError.Generic(message: "Invalid network")
         }
     }