Refactor

vultisig · Nov 19, 2024 · fdb9f8c · fdb9f8c
1 parent 0e2492f
commit fdb9f8c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/app/src/main/java/com/vultisig/wallet/ui/models/swap/SwapFormViewModel.kt b/app/src/main/java/com/vultisig/wallet/ui/models/swap/SwapFormViewModel.kt
@@ -859,6 +859,9 @@ internal class SwapFormViewModel @Inject constructor(
 
                             is SwapException.TimeOut ->
                                 UiText.StringResource(R.string.swap_error_time_out)
+
+                            is SwapException.NetworkConnection ->
+                                UiText.StringResource(R.string.network_connection_lost)
                         }
                         uiState.update {
                             it.copy(

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -482,4 +482,5 @@
     <string name="swap_screen_invalid_zero_token_amount" translatable="false">Token amount cannot be Zero</string>
     <string name="swap_screen_invalid_gas_fee_calculation" translatable="false">Gas fee calculation failed</string>
     <string name="swap_screen_invalid_quote_calculation" translatable="false">Quote calculation failed</string>
+    <string name="network_connection_lost " translatable="false">Network connection lost. Please check your internet connection</string>
 </resources>
diff --git a/data/src/main/kotlin/com/vultisig/wallet/data/api/errors/SwapException.kt b/data/src/main/kotlin/com/vultisig/wallet/data/api/errors/SwapException.kt
@@ -8,6 +8,7 @@ sealed class SwapException(message: String) : Exception(message) {
     class InsufficentSwapAmount(message: String) : SwapException(message)
     class SwapRouteNotAvailable(message: String) : SwapException(message)
     class TimeOut(message: String) : SwapException(message)
+    class NetworkConnection(message: String) : SwapException(message)
 
 
     companion object {
@@ -22,6 +23,7 @@ sealed class SwapException(message: String) : Exception(message) {
                     contains("No available qoutes for the resquested") -> SwapRouteNotAvailable(error)
                     contains("trading is halted") -> SwapRouteNotAvailable(error)
                     contains("timeout") -> TimeOut(error)
+                    contains("unable to resolve host") -> NetworkConnection(error)
                     else -> UnkownSwapError(error)
                 }
             }

diff --git a/data/src/main/kotlin/com/vultisig/wallet/data/models/Chain.kt b/data/src/main/kotlin/com/vultisig/wallet/data/models/Chain.kt
@@ -1,5 +1,6 @@
 package com.vultisig.wallet.data.models
 
+import com.vultisig.wallet.data.api.errors.SwapException
 import com.vultisig.wallet.data.models.TokenStandard.COSMOS
 import com.vultisig.wallet.data.models.TokenStandard.EVM
 import com.vultisig.wallet.data.models.TokenStandard.SOL
@@ -143,7 +144,7 @@ fun Chain.oneInchChainId(): Int =
         Chain.BscChain -> 56
         // Chain.CronosChain -> 25
         Chain.ZkSync -> 324
-        else -> error("Chain $this is not supported by 1inch API")
+        else -> throw SwapException.SwapRouteNotAvailable("Chain $this is not supported by 1inch API")
     }
 
 fun Chain.swapAssetName(): String {

diff --git a/data/src/main/kotlin/com/vultisig/wallet/data/utils/Serializer.kt b/data/src/main/kotlin/com/vultisig/wallet/data/utils/Serializer.kt
@@ -1,6 +1,8 @@
 package com.vultisig.wallet.data.utils
 
 import com.vultisig.wallet.data.api.models.KeysignResponseSerializable
+import com.vultisig.wallet.data.api.models.OneInchSwapQuoteDeserialized
+import com.vultisig.wallet.data.api.models.OneInchSwapQuoteJson
 import com.vultisig.wallet.data.api.models.LiFiSwapQuoteError
 import com.vultisig.wallet.data.api.models.LiFiSwapQuoteJson
 import com.vultisig.wallet.data.api.models.LiFiSwapQuoteDeserialized