Skip to content

Commit 067cb2a

Browse files
committed
Merge remote-tracking branch 'origin/develop' into HEAD
* origin/develop: fix(home): dont reopen cash link after handled fix: vibrate when sending giftcards
2 parents c8718c8 + 9560e79 commit 067cb2a

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

app/src/main/java/com/getcode/view/main/home/HomeScan.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,16 @@ private fun HomeScan(
153153
}
154154
}
155155

156-
LaunchedEffect(kikCodeScannerView?.previewing, dataState.balance, deepLink, requestPayload) {
156+
var deepLinkSaved by remember(deepLink) {
157+
mutableStateOf(deepLink)
158+
}
159+
160+
LaunchedEffect(kikCodeScannerView?.previewing, dataState.balance, deepLinkSaved, requestPayload) {
157161
if (kikCodeScannerView?.previewing == true) {
158-
if (!deepLink.isNullOrBlank()) {
162+
if (!deepLinkSaved.isNullOrBlank()) {
159163
delay(500)
160164
homeViewModel.openCashLink(deepLink)
165+
deepLinkSaved = null
161166
}
162167

163168
if (!requestPayload.isNullOrBlank() && dataState.balance != null) {

app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,7 @@ class HomeViewModel @Inject constructor(
990990
loadingIndicatorTimer = Timer().schedule(1000) {
991991
uiFlow.update { it.copy(isRemoteSendLoading = false) }
992992
}
993+
993994
analytics.remoteSendOutgoing(
994995
kin = amount.kin,
995996
currencyCode = amount.rate.currency
@@ -1051,7 +1052,10 @@ class HomeViewModel @Inject constructor(
10511052
positiveText = getString(R.string.action_yes),
10521053
negativeText = getString(R.string.action_noTryAgain),
10531054
tertiaryText = getString(R.string.action_cancelSend),
1054-
onPositive = { cancelSend(style = PresentationStyle.Pop) },
1055+
onPositive = {
1056+
cancelSend(style = PresentationStyle.Pop)
1057+
vibrator.vibrate()
1058+
},
10551059
onNegative = { showRemoteSendDialog(context, giftCard, amount) },
10561060
onTertiary = {
10571061
cancelRemoteSend(giftCard, amount)

0 commit comments

Comments
 (0)