diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyAccountSelectionView.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyAccountSelectionView.kt index f86fd8f059..8db2714c88 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyAccountSelectionView.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyAccountSelectionView.kt @@ -133,14 +133,8 @@ fun SendMoneyAccountSelectionView( cornerRadius = 0.dp ) { Column(modifier = Modifier.background(NaviPayColor.bgAlt).weight(1f)) { - Spacer(modifier = Modifier.height(16.dp)) - if (bankAccountState is BankAccountsState.AccountList && isAddAccountEnabled) { - AddBankCard(modifier = Modifier, onAddAccountClicked = onAddAccountClicked) - } - ThemeRoundedButton( - modifier = - Modifier.fillMaxWidth().padding(start = 16.dp, end = 16.dp, bottom = 32.dp), + modifier = Modifier.fillMaxWidth().padding(16.dp), text = mainCtaState.ctaText, enabled = mainCtaState !is SendMoneyMainCtaState.Disabled ) { @@ -151,6 +145,12 @@ fun SendMoneyAccountSelectionView( else -> {} } } + + if (bankAccountState is BankAccountsState.AccountList && isAddAccountEnabled) { + AddBankCard(modifier = Modifier, onAddAccountClicked = onAddAccountClicked) + } + + Spacer(modifier = Modifier.height(16.dp)) } } } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyAccountSelectionViewV2.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyAccountSelectionViewV2.kt index 1c7440c80f..20d8a9cea7 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyAccountSelectionViewV2.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyAccountSelectionViewV2.kt @@ -118,12 +118,6 @@ fun SendMoneyAccountSelectionViewV2( } Column(modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 16.dp)) { - if (isAddAccountEnabled && mainCtaState !is SendMoneyMainCtaState.AddAccount) { - AddBankCardV2(modifier = Modifier, onAddAccountClicked = onAddAccountClicked) - } - - Spacer(modifier = Modifier.height(16.dp)) - LoaderRoundedButton( modifier = Modifier.fillMaxWidth(), text = mainCtaState.ctaText, @@ -140,6 +134,12 @@ fun SendMoneyAccountSelectionViewV2( else -> {} } } + + Spacer(modifier = Modifier.height(16.dp)) + + if (isAddAccountEnabled && mainCtaState !is SendMoneyMainCtaState.AddAccount) { + AddBankCardV2(modifier = Modifier, onAddAccountClicked = onAddAccountClicked) + } } Spacer(modifier = Modifier.height(32.dp)) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/AddBalanceModalContent.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/AddBalanceModalContent.kt index c342e0dc93..2a7c844c73 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/AddBalanceModalContent.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/AddBalanceModalContent.kt @@ -133,12 +133,6 @@ fun AddBalanceModalContent( Spacer(modifier = Modifier.height(16.dp)) Column(modifier = Modifier.padding(horizontal = 16.dp)) { - if (showAddBankButton) { - AddBankCardV2(modifier = Modifier, onAddAccountClicked = onAddAccountClicked) - } - - Spacer(modifier = Modifier.height(16.dp)) - LoaderRoundedButton( text = mainCtaState.ctaText, lottieFileName = NAVI_PAY_PRIMARY_CTA_LOADER_LOTTIE, @@ -161,6 +155,12 @@ fun AddBalanceModalContent( else -> {} } } + + if (showAddBankButton) { + AddBankCardV2(modifier = Modifier, onAddAccountClicked = onAddAccountClicked) + } + + Spacer(modifier = Modifier.height(16.dp)) } Spacer(modifier = Modifier.height(16.dp))