Merge branch 'develop'

Author: Jeff Yanta

api/src/main/java/com/getcode/network/client/Client_Transaction.kt

@@ -16,6 +16,7 @@ import com.getcode.model.KinAmount
 import com.getcode.model.Rate
 import com.getcode.model.SendLimit
 import com.getcode.model.intents.IntentDeposit
+import com.getcode.model.intents.IntentEstablishRelationship
 import com.getcode.model.intents.IntentPrivateTransfer
 import com.getcode.model.intents.IntentPublicTransfer
 import com.getcode.model.intents.IntentRemoteSend
@@ -579,8 +580,8 @@ fun Client.receiveFromRelationships(organizer: Organizer, upTo: Kin? = null): Ki
 
 @SuppressLint("CheckResult")
 @Throws
-fun Client.establishRelationshipSingle(organizer: Organizer, domain: Domain) {
-    transactionRepository.establishRelationshipSingle(organizer, domain).ignoreElement()
+fun Client.establishRelationshipSingle(organizer: Organizer, domain: Domain): Single<IntentEstablishRelationship> {
+    return transactionRepository.establishRelationshipSingle(organizer, domain)
 }
 
 @Suppress("RedundantSuspendModifier")

api/src/main/java/com/getcode/network/repository/PaymentRepository.kt

@@ -133,14 +133,16 @@ class PaymentRepository @Inject constructor(
                 val organizer =
                     SessionManager.getOrganizer() ?: throw PaymentError.OrganizerNotFound()
 
-                /// 4. Establish a relationship if a domain is provided. If a verifier
+                // 4. Establish a relationship if a domain is provided. If a verifier
                 // is present that means the domain has been verified by the server.
                 val domain = receiveRequest.domain
-                if (domain != null &&
-                    receiveRequest.verifier != null &&
-                    organizer.relationshipFor(domain) != null
-                ) {
-                    client.establishRelationshipSingle(organizer, domain)
+                if (domain != null) {
+                    if (
+                        receiveRequest.verifier != null &&
+                        organizer.relationshipFor(domain) == null
+                    ) {
+                        client.establishRelationshipSingle(organizer, domain).blockingGet()
+                    }
                 }
 
                 // 5. Complete the transfer.

api/src/main/java/com/getcode/utils/FormatUtils.kt

@@ -1,5 +1,6 @@
 package com.getcode.utils
 
+import com.getcode.model.CurrencyCode
 import com.getcode.model.Kin
 import java.text.NumberFormat
 import java.util.*
@@ -21,4 +22,11 @@ object FormatUtils {
     fun formatCurrency(value: Double, locale: Locale): String =
         NumberFormat.getCurrencyInstance(locale).format(value)
 
+    fun formatCurrency(value: Double, currencyCode: CurrencyCode): String {
+        val locale = NumberFormat.getAvailableLocales().firstOrNull {
+            NumberFormat.getCurrencyInstance(it).currency?.currencyCode == currencyCode.name
+        } ?: Locale.getDefault()
+
+        return formatCurrency(value, locale)
+    }
 }

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

@@ -32,7 +32,7 @@ internal fun MessageContent.localizedText(resources: ResourceHelper, currencyUti
 
                 is GenericAmount.Partial -> {
                     Timber.d("partial")
-                    FormatUtils.formatCurrency(kinAmount.fiat.amount, Locale.getDefault()).let {
+                    FormatUtils.formatCurrency(kinAmount.fiat.amount, kinAmount.currencyCode).let {
                         "$it ${resources.getString(R.string.core_ofKin)}"
                     }
                 }
@@ -85,7 +85,7 @@ internal val MessageContent.localizedText: String
                     }
 
                     is GenericAmount.Partial -> {
-                        FormatUtils.formatCurrency(kinAmount.fiat.amount, Locale.getDefault()).let {
+                        FormatUtils.formatCurrency(kinAmount.fiat.amount, kinAmount.currencyCode).let {
                             "$it ${context.getString(R.string.core_ofKin)}"
                         }
                     }

app/src/main/java/com/getcode/view/main/home/components/LoginConfirmation.kt

@@ -26,6 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.unit.dp
 import com.getcode.R
 import com.getcode.model.KinAmount
@@ -39,12 +40,12 @@ import com.getcode.ui.components.ButtonState
 import com.getcode.ui.components.CodeButton
 import com.getcode.ui.components.SlideToConfirm
 import com.getcode.ui.components.SlideToConfirmDefaults
+import java.util.Locale
 
 @Composable
 internal fun LoginConfirmation(
     modifier: Modifier = Modifier,
     confirmation: LoginConfirmation?,
-    onAddKin: () -> Unit = { },
     onSend: () -> Unit,
     onCancel: () -> Unit,
 ) {
@@ -57,7 +58,11 @@ internal fun LoginConfirmation(
     }
 
     val domain by remember(confirmation?.domain) {
-        derivedStateOf { confirmation?.domain?.urlString }
+        derivedStateOf {
+            confirmation?.domain?.urlString?.replaceFirstChar {
+                if (it.isLowerCase()) it.titlecase() else it.toString()
+            }
+        }
     }
 
     Column(