Clean code

app/src/main/java/io/horizontalsystems/bankwallet/modules/nft/send/SendNftFragment.kt

@@ -9,7 +9,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.fragment.app.viewModels
 import androidx.navigation.NavController
-import androidx.navigation.navGraphViewModels
 import io.horizontalsystems.bankwallet.R
 import io.horizontalsystems.bankwallet.core.App
 import io.horizontalsystems.bankwallet.core.BaseComposeFragment
@@ -21,7 +20,6 @@ import io.horizontalsystems.bankwallet.modules.address.AddressInputModule
 import io.horizontalsystems.bankwallet.modules.address.AddressParserViewModel
 import io.horizontalsystems.bankwallet.modules.address.AddressViewModel
 import io.horizontalsystems.bankwallet.modules.send.evm.SendEvmAddressService
-import io.horizontalsystems.bankwallet.modules.send.evm.confirmation.EvmKitWrapperHoldingViewModel
 import io.horizontalsystems.bankwallet.ui.compose.ComposeAppTheme
 import io.horizontalsystems.bankwallet.ui.compose.TranslatableString
 import io.horizontalsystems.bankwallet.ui.compose.components.AppBar
@@ -41,12 +39,6 @@ class SendNftFragment : BaseComposeFragment() {
 
         when (factory?.evmNftRecord?.nftType) {
             NftType.Eip721 -> {
-                val evmKitWrapperViewModel by navGraphViewModels<EvmKitWrapperHoldingViewModel>(
-                    R.id.nftSendFragment
-                ) { factory }
-                val initiateLazyViewModel =
-                    evmKitWrapperViewModel //needed in SendEvmConfirmationFragment
-
                 val eip721ViewModel by viewModels<SendEip721ViewModel> { factory }
                 val addressViewModel by viewModels<AddressViewModel> {
                     AddressInputModule.FactoryNft(factory.nftUid.blockchainType)
@@ -62,12 +54,6 @@ class SendNftFragment : BaseComposeFragment() {
             }
 
             NftType.Eip1155 -> {
-                val evmKitWrapperViewModel by navGraphViewModels<EvmKitWrapperHoldingViewModel>(
-                    R.id.nftSendFragment
-                ) { factory }
-                val initiateLazyViewModel =
-                    evmKitWrapperViewModel //needed in SendEvmConfirmationFragment
-
                 val eip1155ViewModel by viewModels<SendEip1155ViewModel> { factory }
                 val addressViewModel by viewModels<AddressViewModel> {
                     AddressInputModule.FactoryNft(factory.nftUid.blockchainType)

app/src/main/java/io/horizontalsystems/bankwallet/modules/nft/send/SendNftModule.kt

@@ -11,7 +11,6 @@ import io.horizontalsystems.bankwallet.entities.nft.EvmNftRecord
 import io.horizontalsystems.bankwallet.entities.nft.NftUid
 import io.horizontalsystems.bankwallet.modules.address.AddressParserViewModel
 import io.horizontalsystems.bankwallet.modules.send.evm.SendEvmAddressService
-import io.horizontalsystems.bankwallet.modules.send.evm.confirmation.EvmKitWrapperHoldingViewModel
 
 object SendNftModule {
 
@@ -45,9 +44,6 @@ object SendNftModule {
                         nftMetadataManager
                     ) as T
                 }
-                EvmKitWrapperHoldingViewModel::class.java -> {
-                    EvmKitWrapperHoldingViewModel(evmKitWrapper) as T
-                }
                 AddressParserViewModel::class.java -> {
                     AddressParserViewModel(AddressUriParser(nftUid.blockchainType, null), null) as T
                 }

app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendFragment.kt

@@ -20,10 +20,7 @@ import io.horizontalsystems.bankwallet.modules.send.binance.SendBinanceViewModel
 import io.horizontalsystems.bankwallet.modules.send.bitcoin.SendBitcoinModule
 import io.horizontalsystems.bankwallet.modules.send.bitcoin.SendBitcoinNavHost
 import io.horizontalsystems.bankwallet.modules.send.bitcoin.SendBitcoinViewModel
-import io.horizontalsystems.bankwallet.modules.send.evm.SendEvmModule
 import io.horizontalsystems.bankwallet.modules.send.evm.SendEvmScreen
-import io.horizontalsystems.bankwallet.modules.send.evm.SendEvmViewModel
-import io.horizontalsystems.bankwallet.modules.send.evm.confirmation.EvmKitWrapperHoldingViewModel
 import io.horizontalsystems.bankwallet.modules.send.solana.SendSolanaModule
 import io.horizontalsystems.bankwallet.modules.send.solana.SendSolanaScreen
 import io.horizontalsystems.bankwallet.modules.send.solana.SendSolanaViewModel
@@ -129,20 +126,14 @@ class SendFragment : BaseFragment() {
                     BlockchainType.Gnosis,
                     BlockchainType.Fantom,
                     BlockchainType.ArbitrumOne -> {
-                        val factory = SendEvmModule.Factory(wallet, predefinedAddress)
-                        val evmKitWrapperViewModel by navGraphViewModels<EvmKitWrapperHoldingViewModel>(
-                            R.id.sendXFragment
-                        ) { factory }
-                        @Suppress("UNUSED_VARIABLE")
-                        val initiateLazyViewModel = evmKitWrapperViewModel //needed in SendEvmConfirmationFragment
-                        val sendEvmViewModel by navGraphViewModels<SendEvmViewModel>(R.id.sendXFragment) { factory }
                         setContent {
                             SendEvmScreen(
                                 title,
                                 findNavController(),
-                                sendEvmViewModel,
                                 amountInputModeViewModel,
                                 prefilledData,
+                                wallet,
+                                predefinedAddress
                             )
                         }
                     }

app/src/main/java/io/horizontalsystems/bankwallet/modules/send/evm/SendEvmModule.kt

@@ -9,7 +9,6 @@ import io.horizontalsystems.bankwallet.core.isNative
 import io.horizontalsystems.bankwallet.entities.Wallet
 import io.horizontalsystems.bankwallet.modules.amount.AmountValidator
 import io.horizontalsystems.bankwallet.modules.amount.SendAmountService
-import io.horizontalsystems.bankwallet.modules.send.evm.confirmation.EvmKitWrapperHoldingViewModel
 import io.horizontalsystems.bankwallet.modules.xrate.XRateService
 import io.horizontalsystems.ethereumkit.models.TransactionData
 import kotlinx.parcelize.Parcelize
@@ -63,9 +62,6 @@ object SendEvmModule {
         @Suppress("UNCHECKED_CAST")
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
             return when (modelClass) {
-                EvmKitWrapperHoldingViewModel::class.java -> {
-                    EvmKitWrapperHoldingViewModel(adapter.evmKitWrapper) as T
-                }
                 SendEvmViewModel::class.java -> {
                     val amountValidator = AmountValidator()
                     val coinMaxAllowedDecimals = wallet.token.decimals

app/src/main/java/io/horizontalsystems/bankwallet/modules/send/evm/SendEvmScreen.kt

@@ -17,6 +17,7 @@ import androidx.navigation.NavController
 import io.horizontalsystems.bankwallet.R
 import io.horizontalsystems.bankwallet.core.slideFromRightForResult
 import io.horizontalsystems.bankwallet.entities.Address
+import io.horizontalsystems.bankwallet.entities.Wallet
 import io.horizontalsystems.bankwallet.modules.address.AddressParserModule
 import io.horizontalsystems.bankwallet.modules.address.AddressParserViewModel
 import io.horizontalsystems.bankwallet.modules.address.HSAddressInput
@@ -34,11 +35,12 @@ import io.horizontalsystems.core.helpers.HudHelper
 fun SendEvmScreen(
     title: String,
     navController: NavController,
-    viewModel: SendEvmViewModel,
     amountInputModeViewModel: AmountInputModeViewModel,
     prefilledData: PrefilledData?,
+    wallet: Wallet,
+    predefinedAddress: String?,
 ) {
-    val wallet = viewModel.wallet
+    val viewModel = viewModel<SendEvmViewModel>(factory = SendEvmModule.Factory(wallet, predefinedAddress))
     val uiState = viewModel.uiState
 
     val availableBalance = uiState.availableBalance

app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/request/sendtransaction/WCSendEthScreen.kt

@@ -15,11 +15,9 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import io.horizontalsystems.bankwallet.R
 import io.horizontalsystems.bankwallet.core.AppLogger
-import io.horizontalsystems.bankwallet.core.setNavigationResultX
 import io.horizontalsystems.bankwallet.core.slideFromBottom
 import io.horizontalsystems.bankwallet.core.stats.StatPage
 import io.horizontalsystems.bankwallet.modules.confirm.ConfirmTransactionScreen
-import io.horizontalsystems.bankwallet.modules.send.evm.confirmation.SendEvmConfirmationFragment
 import io.horizontalsystems.bankwallet.modules.sendevmtransaction.SendEvmTransactionView
 import io.horizontalsystems.bankwallet.ui.compose.components.ButtonPrimaryDefault
 import io.horizontalsystems.bankwallet.ui.compose.components.ButtonPrimaryYellow
@@ -72,22 +70,19 @@ fun WCSendEthRequestScreen(
                         buttonEnabled = false
                         HudHelper.showInProcessMessage(view, R.string.Send_Sending, SnackbarDuration.INDEFINITE)
 
-                        val result = try {
+                        try {
                             logger.info("click confirm button")
                             viewModel.confirm()
                             logger.info("success")
 
                             HudHelper.showSuccessMessage(view, R.string.Hud_Text_Done)
                             delay(1200)
-                            SendEvmConfirmationFragment.Result(true)
                         } catch (t: Throwable) {
                             logger.warning("failed", t)
                             HudHelper.showErrorMessage(view, t.javaClass.simpleName)
-                            SendEvmConfirmationFragment.Result(false)
                         }
 
                         buttonEnabled = true
-                        navController.setNavigationResultX(result)
                         navController.popBackStack()
                     }
                 }