Merge pull request #179 from code-payments/chore/currency-glitch-fix

fix: prevent remeasuring of cells

Author: bmc08gt

app/src/main/java/com/getcode/ui/components/chat/ChatNode.kt

@@ -1,6 +1,5 @@
 package com.getcode.ui.components.chat
 
-import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -20,21 +19,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextOverflow
 import com.getcode.BuildConfig
-import com.getcode.LocalCurrencyUtils
 import com.getcode.model.Chat
-import com.getcode.model.Currency
-import com.getcode.model.GenericAmount
 import com.getcode.model.MessageContent
 import com.getcode.model.Title
-import com.getcode.model.Verb
 import com.getcode.theme.BrandLight
 import com.getcode.theme.CodeTheme
-import com.getcode.util.DateUtils
-import com.getcode.util.Kin
-import com.getcode.util.formatted
-import com.getcode.utils.FormatUtils
 import com.getcode.ui.components.Badge
 import com.getcode.ui.components.chat.utils.localizedText
+import com.getcode.util.DateUtils
 import java.util.Locale
 
 object ChatNodeDefaults {

app/src/main/java/com/getcode/util/DateUtils.kt

@@ -6,11 +6,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.daysUntil
-import timber.log.Timber
-import java.util.*
-import kotlin.math.abs
+import java.util.Calendar
+import java.util.Locale
 import kotlin.time.Duration.Companion.days
 
 object DateUtils {

app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt

@@ -149,7 +149,7 @@ fun CurrencySelectionSheet(
             modifier = Modifier
                 .fillMaxWidth()
                 .background(Brand)
-                .wrapContentHeight()
+                .weight(1f)
         ) {
             if (state.loading) {
                 item {
@@ -172,13 +172,6 @@ fun CurrencySelectionSheet(
                         .fillMaxWidth()
                         .height(if (listItem !is CurrencyListItem.TitleItem) 70.dp else 60.dp)
                 ) {
-                    Divider(
-                        color = White05,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(1.dp)
-                            .align(Alignment.BottomCenter)
-                    )
 
                     when (listItem) {
                         is CurrencyListItem.TitleItem -> {
@@ -203,18 +196,13 @@ fun CurrencySelectionSheet(
                                 mutableStateOf(false)
                             }
 
-                            var height by remember {
-                                mutableStateOf(0.dp)
-                            }
-
-                            val animatedHeight by animateDpAsState(targetValue = if (!isSwipedAway) height else 0.dp)
+                            val animatedHeight by animateDpAsState(
+                                targetValue = if (!isSwipedAway) 70.dp else 0.dp,
+                                label = "height animation"
+                            )
 
                             SwipeableView(
-                                modifier = Modifier.measured {
-                                    if (height == 0.dp) {
-                                        height = it.height
-                                    }
-                                }.addIf(height != 0.dp) { Modifier.height(animatedHeight) },
+                                modifier = Modifier.height(animatedHeight),
                                 isSwipeEnabled = listItem.isRecent,
                                 leftSwiped = {
                                     isSwipedAway = true
@@ -247,14 +235,6 @@ fun CurrencySelectionSheet(
                                         )
                                     )
                                 }
-
-                                Divider(
-                                    color = White05,
-                                    modifier = Modifier
-                                        .fillMaxWidth()
-                                        .height(1.dp)
-                                        .align(Alignment.BottomCenter)
-                                )
                             }
                         }
                     }

app/src/main/res/values-en-rGB/strings.xml

@@ -247,6 +247,9 @@
   <string name="sdk_payments_insufficient_funds_description">Please get more Kin and then try paying again.</string>
   <string name="button_get_more_kin">Get More Kin</string>
 
+  <string name="today">Today</string>
+  <string name="yesterday">Yesterday</string>
+
   <string name="title_badge_no_connection">No Connection</string>
   <string name="subtitle_youHaveInvitesSingular">You Have %d Invite</string>
   <string name="withdraw_address_invalid_destination">Invalid destination account</string>

app/src/main/res/values/strings.xml

@@ -290,6 +290,9 @@
     <string name="withdraw_address_valid_owner_account">Valid owner account</string>
     <string name="withdraw_address_valid_token_account">Valid token account</string>
 
+    <string name="today">Today</string>
+    <string name="yesterday">Yesterday</string>
+
     <string name="beta_bucket_debugger_description">If enabled, you\'ll gain the ability to tap the balance on the Balance screen to inspect individual bucket balances.</string>
     <string name="beta_network_connectivity_description">If enabled, a \"No Connection\" badge will show on the scan screen when no internet is detected.</string>
     <string name="beta_vibrate_on_scan_description">If enabled, the device will vibrate once to indicate that the camera has registered the code on the bill.</string>