diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Vault/DepositsAndWithdrawals/dydxVaultDepositWithdrawViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Vault/DepositsAndWithdrawals/dydxVaultDepositWithdrawViewBuilder.swift index 9f0a9ab63..c34c337f2 100644 --- a/dydx/dydxPresenters/dydxPresenters/_v4/Vault/DepositsAndWithdrawals/dydxVaultDepositWithdrawViewBuilder.swift +++ b/dydx/dydxPresenters/dydxPresenters/_v4/Vault/DepositsAndWithdrawals/dydxVaultDepositWithdrawViewBuilder.swift @@ -16,6 +16,7 @@ import FloatingPanel import PlatformRouting import dydxFormatter import Combine +// import single class due to VaultTransferType collision import class Abacus.Subaccount public class dydxVaultDepositWithdrawViewBuilder: NSObject, ObjectBuilderProtocol { diff --git a/dydx/dydxViews/dydxViews/_v4/Vault/DepositAndWithdrawal/dydxVaultDepositWithdrawConfirmationViewModel.swift b/dydx/dydxViews/dydxViews/_v4/Vault/DepositAndWithdrawal/dydxVaultDepositWithdrawConfirmationViewModel.swift index 948b6dcb4..23e584447 100644 --- a/dydx/dydxViews/dydxViews/_v4/Vault/DepositAndWithdrawal/dydxVaultDepositWithdrawConfirmationViewModel.swift +++ b/dydx/dydxViews/dydxViews/_v4/Vault/DepositAndWithdrawal/dydxVaultDepositWithdrawConfirmationViewModel.swift @@ -239,25 +239,24 @@ private struct VaultDepositWithdrawConfirmationView: View { @ViewBuilder public var buttonContent: some View { if let transferType = viewModel.transferType { - switch viewModel.submitState { - case .enabled, .loading: - Text(viewModel.isFirstSubmission ? transferType.confirmTransferText : DataLocalizer.localize(path: "APP.ONBOARDING.TRY_AGAIN")) - .themeFont(fontType: .base, fontSize: .large) - case .submitting: - HStack { - Text(DataLocalizer.localize(path: "APP.TRADE.SUBMITTING")) - .themeFont(fontType: .base, fontSize: .large) - spinner - } - case .disabled: - if viewModel.requiresAcknowledgeHighSlippage && !viewModel.hasAcknowledgedHighSlippage { - Text(DataLocalizer.localize(path: "APP.VAULTS.ACKNOWLEDGE_HIGH_SLIPPAGE")) - .themeFont(fontType: .base, fontSize: .large) - } else { - Text(transferType.confirmTransferText) - .themeFont(fontType: .base, fontSize: .large) + Group { + switch viewModel.submitState { + case .enabled, .loading: + Text(viewModel.isFirstSubmission ? transferType.confirmTransferText : DataLocalizer.localize(path: "APP.ONBOARDING.TRY_AGAIN")) + case .submitting: + HStack { + Text(DataLocalizer.localize(path: "APP.TRADE.SUBMITTING")) + spinner + } + case .disabled: + if viewModel.requiresAcknowledgeHighSlippage && !viewModel.hasAcknowledgedHighSlippage { + Text(DataLocalizer.localize(path: "APP.VAULTS.ACKNOWLEDGE_HIGH_SLIPPAGE")) + } else { + Text(transferType.confirmTransferText) + } } } + .themeFont(fontType: .base, fontSize: .large) } }