Merge branch 'develop'

Author: Jeff Yanta

app/src/main/java/com/getcode/navigation/screens/ModalScreens.kt

@@ -301,7 +301,7 @@ data object CurrencySelectionModal: MainGraph, ModalRoot {
     override fun Content() {
         val navigator = LocalCodeNavigator.current
         ModalContainer(
-            closeButton = {
+            backButton = {
                 if (navigator.isVisible) {
                     it is CurrencySelectionModal
                 } else {

app/src/main/java/com/getcode/ui/components/Badge.kt

@@ -13,6 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.chat.ChatNodeDefaults
@@ -42,7 +43,7 @@ fun Badge(
                         color = color,
                         radius = this.size.maxDimension / 2f
                     )
-                }.padding(2.dp)
+                }.padding(1.dp)
         )
     }
 }

app/src/main/java/com/getcode/view/main/account/withdraw/AccountWithdrawAmount.kt

@@ -64,7 +64,7 @@ fun AccountWithdrawAmount(
                 isAnimated = true,
                 textStyle = CodeTheme.typography.displayLarge,
                 ) {
-                navigator.show(CurrencySelectionModal)
+                navigator.push(CurrencySelectionModal)
             }
         }
 

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

@@ -97,7 +97,7 @@ fun CurrencySelectionSheet(
                 composeScope.launch {
                     keyboardController?.hide()
                     delay(500)
-                    navigator.hideWithResult(it)
+                    navigator.popWithResult(it)
                 }
             }.launchIn(this)
     }

app/src/main/java/com/getcode/view/main/giveKin/BaseAmountCurrencyViewModel.kt

@@ -205,7 +205,7 @@ abstract class BaseAmountCurrencyViewModel(
             amountText = formatAmount(amountText, selectedCurrency),
             amountDouble = amount,
             amountKin = amountKin,
-            amountPrefix = formatPrefix(selectedCurrency),
+            amountPrefix = formatPrefix(selectedCurrency).takeIf { it != selectedCurrency.code }.orEmpty(),
             amountSuffix = formatSuffix(selectedCurrency),
             captionText = formatCaption(
                 selectedCurrency,

app/src/main/java/com/getcode/view/main/giveKin/GiveKinSheet.kt

@@ -70,7 +70,7 @@ fun GiveKinSheet(
                 modifier = Modifier
                     .align(Alignment.Center)
             ) {
-                navigator.show(CurrencySelectionModal)
+                navigator.push(CurrencySelectionModal)
             }
         }
 

buildSrc/src/main/java/Dependencies.kt

@@ -44,7 +44,7 @@ object Versions {
     const val kin_sdk: String = "1.0.1"
     const val grpc_android: String = "1.33.1"
     const val slf4j: String = "1.7.25"
-    const val firebase_bom: String = "29.1.0"
+    const val firebase_bom: String = "32.7.1"
     const val crashlytics_gradle: String = "2.8.1"
     const val play_service_auth = "20.4.0"
     const val play_service_auth_phone = "18.0.1"