Merge branch 'develop'

Author: Jeff Yanta

api/src/androidTest/java/com/getcode/util/UUIDTests.kt

@@ -12,7 +12,7 @@ class UUIDTests {
         val memo = uuid.blockchainMemo
 
         assertEquals(
-            "AQAAAAAAwko78q1PR1aUToGUj/EIgg==",
+            "Gk2Yb7W6BypLsdRoJqMAqXHDoV2jT",
             memo
         )
     }

api/src/main/java/com/getcode/model/intents/IntentPrivateTransfer.kt

@@ -39,7 +39,7 @@ class IntentPrivateTransfer(
             .setSendPrivatePayment(
                 TransactionService.SendPrivatePaymentMetadata.newBuilder().apply {
                     setDestination(this@IntentPrivateTransfer.destination.bytes.toSolanaAccount())
-                    setIsWithdrawal(isWithdrawal)
+                    setIsWithdrawal(this@IntentPrivateTransfer.isWithdrawal)
                     setExchangeData(
                         TransactionService.ExchangeData.newBuilder()
                             .setQuarks(grossAmount.kin.quarks)

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

@@ -116,8 +116,16 @@ fun Client.transferWithResult(
     isWithdrawal: Boolean,
     tippedUsername: String? = null,
 ): Result<Unit> {
-    return transferWithResultSingle(amount, fee, additionalFees, organizer, rendezvousKey, destination, isWithdrawal, tippedUsername)
-        .blockingGet()
+    return transferWithResultSingle(
+        amount = amount,
+        fee = fee,
+        additionalFees = additionalFees,
+        organizer = organizer,
+        rendezvousKey = rendezvousKey,
+        destination = destination,
+        isWithdrawal = isWithdrawal,
+        tippedUsername = tippedUsername
+    ).blockingGet()
 }
 
 

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

@@ -1,6 +1,6 @@
 package com.getcode.utils
 
-import android.util.Base64
+import com.getcode.vendor.Base58
 import org.kin.sdk.base.tools.intToByteArray
 import java.nio.ByteBuffer
 import java.util.UUID
@@ -29,7 +29,7 @@ val UUID.blockchainMemo: String
 
         data.addAll(this.bytes.toList())
 
-        return Base64.encodeToString(data.toByteArray(), Base64.NO_WRAP)
+        return Base58.encode(data.toByteArray())
     }
 
 val List<Byte>.toUuid: UUID

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

@@ -13,6 +13,7 @@ import com.getcode.manager.AuthManager
 import com.getcode.manager.SessionManager
 import com.getcode.model.notifications.NotificationType
 import com.getcode.model.notifications.parse
+import com.getcode.network.BalanceController
 import com.getcode.network.HistoryController
 import com.getcode.network.TipController
 import com.getcode.network.repository.PushRepository
@@ -52,6 +53,9 @@ class CodePushMessagingService : FirebaseMessagingService(),
     @Inject
     lateinit var authManager: AuthManager
 
+    @Inject
+    lateinit var balanceController: BalanceController
+
     @Inject
     lateinit var historyController: HistoryController
 
@@ -86,6 +90,7 @@ class CodePushMessagingService : FirebaseMessagingService(),
 
                 if (type == NotificationType.ChatMessage) {
                     launch { historyController.fetchChats() }
+                    launch { balanceController.fetchBalanceSuspend() }
                     launch { tipController.checkForConnection() }
                 }
             } else {

app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt

@@ -221,7 +221,7 @@ class HomeViewModel @Inject constructor(
             }.launchIn(viewModelScope)
 
         tipController.showTwitterSplat
-            .onEach {  show ->
+            .onEach { show ->
                 uiFlow.update {
                     it.copy(showTwitterSplat = show)
                 }
@@ -498,6 +498,7 @@ class HomeViewModel @Inject constructor(
             }
 
             historyController.fetchChats()
+            balanceController.fetchBalanceSuspend()
 
             if (shown) {
                 delay(300)
@@ -1197,7 +1198,9 @@ class HomeViewModel @Inject constructor(
                     client.fetchLimits(isForce = true),
                 )
             }
-            .subscribe({ viewModelScope.launch { historyController.fetchChats() } }, {
+            .subscribe({
+                viewModelScope.launch { historyController.fetchChats() }
+            }, {
                 scannedRendezvous.remove(payload.rendezvous.publicKey)
                 ErrorUtils.handleError(it)
             })

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

@@ -38,4 +38,6 @@
 
     <string name="subtitle_youReceivedTip">Someone tipped you $1$s</string>
     <string name="subtitle_youSentTip">You tipped someone $1$s</string>
+
+    <string name="title_chat_tips">Tips</string>
 </resources>