rc/9.1.0

.gitignore

@@ -25,5 +25,4 @@ app/*.apk
 !/core-db/schemas/io.novafoundation.nova.core_db.AppDatabase/8.json
 !/core-db/schemas/io.novafoundation.nova.core_db.AppDatabase/9.json
 
-google-services.json
-/bindings
+google-services.json

app/src/androidTest/java/io/novafoundation/nova/BlockParsingIntegrationTest.kt

@@ -50,7 +50,7 @@ class BlockParsingIntegrationTest {
             keyBuilder = { it.metadata.system().storage("Events").storageKey() },
             binding = { scale, runtime ->
                 Log.d(logTag, scale!!)
-                bindEventRecords(scale, runtime)
+                bindEventRecords(scale)
             }
         )
 

app/src/androidTest/java/io/novafoundation/nova/MoonbaseSendIntagrationTest.kt

@@ -89,7 +89,7 @@ class MoonbaseSendIntagrationTest {
 
         val extrinsic = extrinsicBuilderFactory.create(chain, signer, accountId)
             .nativeTransfer(accountId, chain.utilityAsset.planksFromAmount(BigDecimal.ONE), keepAlive = true)
-            .buildExtrinsic().extrinsicHex
+            .buildExtrinsic()
 
         val hash = rpcCalls.submitExtrinsic(chain.id, extrinsic)
 

app/src/main/java/io/novafoundation/nova/app/di/deps/ComponentHolderModule.kt

@@ -51,8 +51,8 @@ import io.novafoundation.nova.feature_settings_impl.di.SettingsFeatureHolder
 import io.novafoundation.nova.feature_staking_api.di.StakingFeatureApi
 import io.novafoundation.nova.feature_staking_impl.di.StakingFeatureHolder
 import io.novafoundation.nova.feature_swap_api.di.SwapFeatureApi
-import io.novafoundation.nova.feature_swap_core.di.SwapCoreApi
 import io.novafoundation.nova.feature_swap_core.di.SwapCoreHolder
+import io.novafoundation.nova.feature_swap_core_api.di.SwapCoreApi
 import io.novafoundation.nova.feature_swap_impl.di.SwapFeatureHolder
 import io.novafoundation.nova.feature_versions_api.di.VersionsFeatureApi
 import io.novafoundation.nova.feature_versions_impl.di.VersionsFeatureHolder

app/src/main/java/io/novafoundation/nova/app/root/navigation/Navigator.kt

@@ -399,14 +399,14 @@ class Navigator(
         navController?.navigate(R.id.action_selectAssetSwapFlowFragment_to_swapFlowNetworkFragment, NetworkSwapFlowFragment.createPayload(payload))
     }
 
-    override fun openBuyNetworks(payload: NetworkFlowPayload) {
-        navController?.navigate(R.id.action_buyFlow_to_buyFlowNetwork, NetworkFlowFragment.createPayload(payload))
-    }
-
     override fun returnToMainSwapScreen() {
         navController?.navigate(R.id.action_return_to_swap_settings)
     }
 
+    override fun openBuyNetworks(payload: NetworkFlowPayload) {
+        navController?.navigate(R.id.action_buyFlow_to_buyFlowNetwork, NetworkFlowFragment.createPayload(payload))
+    }
+
     override fun openSwapFlow() {
         val payload = SwapFlowPayload.InitialSelecting
         navController?.navigate(R.id.action_mainFragment_to_swapFlow, AssetSwapFlowFragment.getBundle(payload))
@@ -416,6 +416,10 @@ class Navigator(
         navController?.navigate(R.id.action_open_swapSetupAmount, SwapMainSettingsFragment.getBundle(swapSettingsPayload))
     }
 
+    override fun finishSelectAndOpenSwapSetupAmount(swapSettingsPayload: SwapSettingsPayload) {
+        navController?.navigate(R.id.action_finish_and_open_swap_settings, SwapMainSettingsFragment.getBundle(swapSettingsPayload))
+    }
+
     override fun openNfts() {
         navController?.navigate(R.id.action_mainFragment_to_nfts_nav_graph)
     }

app/src/main/java/io/novafoundation/nova/app/root/navigation/swap/SwapNavigator.kt

@@ -4,31 +4,39 @@ import io.novafoundation.nova.app.R
 import io.novafoundation.nova.app.root.navigation.BaseNavigator
 import io.novafoundation.nova.app.root.navigation.NavigationHolder
 import io.novafoundation.nova.app.root.navigation.Navigator
-import io.novafoundation.nova.feature_assets.presentation.send.amount.SendPayload
 import io.novafoundation.nova.feature_assets.presentation.balance.detail.BalanceDetailFragment
+import io.novafoundation.nova.feature_assets.presentation.send.amount.SendPayload
 import io.novafoundation.nova.feature_assets.presentation.swap.asset.AssetSwapFlowFragment
 import io.novafoundation.nova.feature_assets.presentation.swap.asset.SwapFlowPayload
+import io.novafoundation.nova.feature_swap_api.presentation.model.SwapSettingsPayload
 import io.novafoundation.nova.feature_swap_impl.presentation.SwapRouter
-import io.novafoundation.nova.feature_swap_impl.presentation.confirmation.SwapConfirmationFragment
-import io.novafoundation.nova.feature_swap_impl.presentation.confirmation.payload.SwapConfirmationPayload
+import io.novafoundation.nova.feature_swap_impl.presentation.main.SwapMainSettingsFragment
 import io.novafoundation.nova.feature_wallet_api.presentation.model.AssetPayload
 
 class SwapNavigator(
     private val navigationHolder: NavigationHolder,
     private val commonDelegate: Navigator
 ) : BaseNavigator(navigationHolder), SwapRouter {
 
-    override fun openSwapConfirmation(payload: SwapConfirmationPayload) {
-        val bundle = SwapConfirmationFragment.getBundle(payload)
-        navigationHolder.navController?.navigate(R.id.action_swapMainSettingsFragment_to_swapConfirmationFragment, bundle)
-    }
+    override fun openSwapConfirmation() = performNavigation(R.id.action_swapMainSettingsFragment_to_swapConfirmationFragment)
+
+    override fun openSwapRoute() = performNavigation(R.id.action_open_swapRouteFragment)
+
+    override fun openSwapFee() = performNavigation(R.id.action_open_swapFeeFragment)
+
+    override fun openSwapExecution() = performNavigation(R.id.action_swapConfirmationFragment_to_swapExecutionFragment)
 
     override fun openSwapOptions() {
         navigationHolder.navController?.navigate(R.id.action_swapMainSettingsFragment_to_swapOptionsFragment)
     }
 
+    override fun openRetrySwap(payload: SwapSettingsPayload) = performNavigation(
+        actionId = R.id.action_swapExecutionFragment_to_swapSettingsFragment,
+        args = SwapMainSettingsFragment.getBundle(payload)
+    )
+
     override fun openBalanceDetails(assetPayload: AssetPayload) {
-        navigationHolder.navController?.navigate(R.id.action_swapConfirmationFragment_to_assetDetails, BalanceDetailFragment.getBundle(assetPayload))
+        navigationHolder.navController?.navigate(R.id.action_swapExecutionFragment_to_assetDetails, BalanceDetailFragment.getBundle(assetPayload))
     }
 
     override fun selectAssetIn(selectedAsset: AssetPayload?) {

app/src/main/res/navigation/main_nav_graph.xml

@@ -937,6 +937,7 @@
 
     </fragment>
 
+
     <fragment
         android:id="@+id/sendFlowNetworkFragment"
         android:name="io.novafoundation.nova.feature_assets.presentation.send.flow.network.NetworkSendFlowFragment"
@@ -1004,6 +1005,8 @@
 
     <include app:graph="@navigation/start_swap_nav_graph" />
 
+    <include app:graph="@navigation/select_swap_token_nav_graph" />
+
     <include app:graph="@navigation/manage_tokens_graph" />
 
     <include app:graph="@navigation/sign_parity_signer_graph" />

app/src/main/res/navigation/select_swap_token_nav_graph.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:startDestination="@id/selectAssetSwapFlowFragment"
-    android:id="@+id/select_swap_token_nav_graph">
+    android:id="@+id/select_swap_token_nav_graph"
+    app:startDestination="@id/selectAssetSwapFlowFragment">
 
     <fragment
         android:id="@+id/selectAssetSwapFlowFragment"
@@ -25,9 +25,19 @@
 
     <action
         android:id="@+id/action_return_to_swap_settings"
-        app:popUpTo="@id/swapSettingsFragment"
         app:enterAnim="@anim/fragment_close_enter"
         app:exitAnim="@anim/fragment_close_exit"
         app:popEnterAnim="@anim/fragment_open_enter"
-        app:popExitAnim="@anim/fragment_open_exit" />
+        app:popExitAnim="@anim/fragment_open_exit"
+        app:popUpTo="@id/swapSettingsFragment" />
+
+    <action
+        android:id="@+id/action_finish_and_open_swap_settings"
+        app:destination="@+id/start_swap_nav_graph"
+        app:enterAnim="@anim/fragment_open_enter"
+        app:exitAnim="@anim/fragment_open_exit"
+        app:popEnterAnim="@anim/fragment_close_enter"
+        app:popExitAnim="@anim/fragment_close_exit"
+        app:popUpToInclusive="true"
+        app:popUpTo="@id/select_swap_token_nav_graph" />
 </navigation>