Skip to content

Commit 615377d

Browse files
committed
refactor: remove duration
1 parent d4a02a0 commit 615377d

File tree

4 files changed

+6
-20
lines changed

4 files changed

+6
-20
lines changed

app/src/main/java/to/bitkit/models/Suggestion.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,22 @@ import androidx.annotation.StringRes
55
import androidx.compose.ui.graphics.Color
66
import to.bitkit.R
77
import to.bitkit.ui.theme.Colors
8-
import kotlin.time.Duration
9-
import kotlin.time.Duration.Companion.seconds
108

119
enum class Suggestion(
1210
@StringRes val title: Int,
1311
@StringRes val description: Int,
1412
@DrawableRes val icon: Int,
1513
val color: Color,
1614
val dismissible: Boolean = true,
17-
val duration: Duration? = null,
1815
) {
1916
BUY(
2017
title = R.string.cards__buyBitcoin__title,
2118
description = R.string.cards__buyBitcoin__description,
2219
color = Colors.Brand24,
2320
icon = R.drawable.b_emboss,
2421
),
25-
LIGHTNING( // Lightning ready from RN
22+
LIGHTNING(
23+
// Lightning ready from RN
2624
title = R.string.cards__lightning__title,
2725
description = R.string.cards__lightning__description,
2826
color = Colors.Purple24,
@@ -103,7 +101,6 @@ enum class Suggestion(
103101
color = Colors.Purple24,
104102
icon = R.drawable.transfer,
105103
dismissible = false,
106-
duration = 5.seconds
107104
),
108105
}
109106

app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,13 @@ class ActivityRepo @Inject constructor(
325325
cacheStore.data.first().inProgressTransfers.forEach { transfer ->
326326
getActivity(transfer.activityId).onSuccess { activity ->
327327
(activity as? Onchain)?.let { onChain ->
328+
Logger.debug("Transfer found! confirmed:${onChain.v1.confirmed} $onChain", context = TAG)
328329
if (onChain.v1.confirmed) {
329330
cacheStore.removeInProgressTransfer(transfer)
330331
}
331332
}
333+
}.onFailure { e ->
334+
Logger.debug("Couldn't find activity ${transfer.activityId}, ${e.stackTraceToString()}", context = TAG)
332335
}
333336
}
334337
}

app/src/main/java/to/bitkit/ui/components/SuggestionCard.kt

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import androidx.compose.material3.Icon
2323
import androidx.compose.material3.IconButton
2424
import androidx.compose.material3.ShapeDefaults
2525
import androidx.compose.runtime.Composable
26-
import androidx.compose.runtime.LaunchedEffect
2726
import androidx.compose.runtime.getValue
2827
import androidx.compose.ui.Modifier
2928
import androidx.compose.ui.draw.clip
@@ -35,15 +34,12 @@ import androidx.compose.ui.res.stringResource
3534
import androidx.compose.ui.text.AnnotatedString
3635
import androidx.compose.ui.tooling.preview.Preview
3736
import androidx.compose.ui.unit.dp
38-
import kotlinx.coroutines.delay
3937
import to.bitkit.R
4038
import to.bitkit.models.Suggestion
4139
import to.bitkit.ui.shared.util.clickableAlpha
4240
import to.bitkit.ui.shared.util.gradientLinearBackground
4341
import to.bitkit.ui.shared.util.gradientRadialBackground
4442
import to.bitkit.ui.theme.Colors
45-
import kotlin.time.Duration
46-
import kotlin.time.Duration.Companion.seconds
4743

4844
private const val GLOW_ANIMATION_MILLIS = 1100
4945
private const val MIN_ALPHA_GRADIENT = 0.24f
@@ -57,19 +53,11 @@ fun SuggestionCard(
5753
description: String,
5854
@DrawableRes icon: Int,
5955
onClose: (() -> Unit)? = null,
60-
duration: Duration? = null,
6156
size: Int = 152,
6257
disableGlow: Boolean = false,
6358
captionColor: Color = Colors.White64,
6459
onClick: () -> Unit,
6560
) {
66-
LaunchedEffect(Unit) {
67-
duration?.let {
68-
delay(it)
69-
onClose?.invoke()
70-
}
71-
}
72-
7361
val isDismissible = onClose != null
7462

7563
// Glow animation for non-dismissible cards
@@ -138,7 +126,7 @@ fun SuggestionCard(
138126
modifier = Modifier.weight(1f)
139127
)
140128

141-
if (duration == null && onClose != null) {
129+
if (onClose != null) {
142130
IconButton(
143131
onClick = onClose,
144132
modifier = Modifier
@@ -184,7 +172,6 @@ private fun Preview() {
184172
icon = item.icon,
185173
onClose = {},
186174
onClick = {}, // All cards are clickable
187-
duration = 5.seconds.takeIf { item == Suggestion.LIGHTNING_READY }
188175
)
189176
}
190177
}

app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,6 @@ private fun Content(
390390
icon = item.icon,
391391
onClose = { onRemoveSuggestion(item) }.takeIf { item.dismissible },
392392
onClick = { onClickSuggestion(item) },
393-
duration = item.duration,
394393
modifier = Modifier.testTag("Suggestion-${item.name.lowercase()}")
395394
)
396395
}

0 commit comments

Comments
 (0)