Skip to content

Commit 8dc9e5f

Browse files
authored
Merge pull request #691 from code-payments/style/update-no-balance-modal-to-info
style(scanner): update no balance alert to info modal
2 parents dddc2ae + b207387 commit 8dc9e5f

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

  • apps/flipcash
    • core/src/main/res/values
    • features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal

‎apps/flipcash/core/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
<string name="title_tapAboveToAddCashToWallet">Tap above to Add Cash to your wallet</string>
223223
<string name="title_tapBelowToAddCashWallet">You don\'t have any cash yet.\nTap below to add cash to your wallet</string>
224224
<string name="title_noBalanceYet">No Balance Yet</string>
225-
<string name="description_noBalanceYet">Get another Flipcash user to give you some cash to get a balance</string>
225+
<string name="description_noBalanceYet">Buy a currency to get started, or get another Flipcash user to give you some cash</string>
226226
<string name="description_noBalanceYetDiscover">Buy your first currency to get started</string>
227227
<string name="action_dismiss">Dismiss</string>
228228
<string name="title_success">Success</string>

‎apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/Scanner.kt‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import androidx.compose.ui.platform.LocalContext
1414
import androidx.compose.ui.platform.LocalFocusManager
1515
import androidx.lifecycle.Lifecycle
1616
import com.flipcash.app.analytics.rememberAnalytics
17+
import com.flipcash.app.core.AppRoute
1718
import com.flipcash.app.router.LocalRouter
1819
import com.flipcash.app.scanner.internal.bills.BillContainer
1920
import com.flipcash.app.session.LocalSessionController
@@ -34,6 +35,7 @@ import dev.theolm.rinku.DeepLink
3435
import timber.log.Timber
3536
import com.flipcash.app.core.extensions.navigateTo
3637
import com.flipcash.app.core.navigation.DeeplinkType
38+
import com.getcode.manager.BottomBarAction
3739

3840
@Composable
3941
internal fun Scanner() {
@@ -86,9 +88,17 @@ internal fun Scanner() {
8688
// only allow navigation to give when there is something to give
8789
val hasBalance = state.giveableBalance.orZero().isPositive
8890
if (!hasBalance) {
89-
BottomBarManager.showAlert(
91+
BottomBarManager.showInfo(
9092
title = context.getString(R.string.title_noBalanceYet),
9193
message = context.getString(R.string.description_noBalanceYet),
94+
actions = listOf(
95+
BottomBarAction(
96+
text = context.getString(R.string.action_discoverCurrencies)
97+
) {
98+
navigator.navigateTo(AppRoute.Sheets.TokenDiscovery)
99+
},
100+
),
101+
showCancel = true,
92102
)
93103
return@BillContainer
94104
}

0 commit comments

Comments
 (0)