Merge branch 'develop'

Author: jeffyanta

api/src/main/java/com/getcode/solana/organizer/Organizer.kt

@@ -59,7 +59,8 @@ class Organizer(
 
     fun getAccountInfo() = accountInfos
 
-    val buckets: List<AccountInfo> = accountInfos.values.toList().sortedBy { it.accountType.sortOrder() }
+    val buckets: List<AccountInfo>
+        get() = accountInfos.values.toList().sortedBy { it.accountType.sortOrder() }
 
     fun propagateBalances() {
         val balances = mutableMapOf<AccountType, Kin>()

app/src/main/java/com/getcode/notifications/CodePushMessagingService.kt

@@ -51,7 +51,7 @@ class CodePushMessagingService : FirebaseMessagingService(),
 
             if (notification != null) {
                 val (type, titleKey, messageContent) = notification
-                val title = titleKey.localizedStringByKey(resources)
+                val title = titleKey.localizedStringByKey(resources) ?: titleKey
                 val body = messageContent.localizedText(resources, currencyUtils)
                 notify(type, title, body)
             } else {
@@ -134,12 +134,12 @@ private fun NotificationManager.getActiveNotification(notificationId: Int): Noti
     }
     return null
 }
-private fun String.localizedStringByKey(resources: ResourceHelper): String {
+private fun String.localizedStringByKey(resources: ResourceHelper): String? {
     val name = this.replace(".", "_")
     val resId = resources.getIdentifier(
         name,
         ResourceType.String,
     ).let { if (it == 0) null else it }
 
-    return resId?.let { resources.getString(it) }.orEmpty()
+    return resId?.let { resources.getString(it) }
 }

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

@@ -17,19 +17,24 @@ import com.getcode.util.formatted
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.util.resources.ResourceType
 import com.getcode.utils.FormatUtils
+import timber.log.Timber
 import java.util.Locale
 
 internal fun MessageContent.localizedText(resources: ResourceHelper, currencyUtils: CurrencyUtils,): String {
     return when (val content = this) {
         is MessageContent.Exchange -> {
             val amount = when (val kinAmount = content.amount) {
                 is GenericAmount.Exact -> {
+                    Timber.d("exact")
                     val currency = currencyUtils.getCurrency(kinAmount.currencyCode.name)
                     kinAmount.amount.formatted(resources = resources, currency = currency ?: Currency.Kin)
                 }
 
                 is GenericAmount.Partial -> {
-                    FormatUtils.formatCurrency(kinAmount.fiat.amount, Locale.getDefault())
+                    Timber.d("partial")
+                    FormatUtils.formatCurrency(kinAmount.fiat.amount, Locale.getDefault()).let {
+                        "$it ${resources.getString(R.string.core_ofKin)}"
+                    }
                 }
             }
 
@@ -69,6 +74,7 @@ internal fun MessageContent.localizedText(resources: ResourceHelper, currencyUti
 
 internal val MessageContent.localizedText: String
     @Composable get() {
+        val context = LocalContext.current
         return when (val content = this) {
             is MessageContent.Exchange -> {
                 val amount = when (val kinAmount = content.amount) {
@@ -79,7 +85,9 @@ internal val MessageContent.localizedText: String
                     }
 
                     is GenericAmount.Partial -> {
-                        FormatUtils.formatCurrency(kinAmount.fiat.amount, Locale.getDefault())
+                        FormatUtils.formatCurrency(kinAmount.fiat.amount, Locale.getDefault()).let {
+                            "$it ${context.getString(R.string.core_ofKin)}"
+                        }
                     }
                 }