varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

TP-2080 | cta placement ordering (#12657)

Browse Source
This commit is contained in:
Akshita Singh
2024-09-20 14:40:12 +05:30
committed by GitHub
parent af1bc2c11c
commit 81b1a739d6
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyAccountSelectionView.kt
View File

@@ -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))
}
}
}

12
android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyAccountSelectionViewV2.kt
View File

@@ -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))

12
android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/AddBalanceModalContent.kt
View File

@@ -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))