Merge branch 'develop'

Author: jeffyanta

api/src/main/java/com/getcode/analytics/AnalyticsManager.kt

@@ -63,6 +63,11 @@ class AnalyticsManager @Inject constructor(
         )
     }
 
+    override fun unintentionalLogout() {
+        track(Name.UnintentionalLogout)
+    }
+
+
     override fun billTimeoutReached(
         kin: Kin,
         currencyCode: CurrencyCode,
@@ -238,6 +243,10 @@ class AnalyticsManager @Inject constructor(
         )
     }
 
+    override fun backgroundSwapInitiated() {
+        track(Name.BackgroundSwap)
+    }
+
     private fun track(event: Name, vararg properties: Pair<Property, String>) {
         if (BuildConfig.DEBUG) {
             Timber.d("debug track $event, ${properties.map { "${it.first.name}, ${it.second}" }}")
@@ -259,6 +268,7 @@ class AnalyticsManager @Inject constructor(
         Logout("Logout"),
         Login("Login"),
         CreateAccount("Create Account"),
+        UnintentionalLogout("Unintentional Logout"),
 
         //Bill
         Bill("Bill"),
@@ -276,6 +286,7 @@ class AnalyticsManager @Inject constructor(
         UpgradePrivacy("Upgrade Privacy"),
         ClaimGetFreeKin("Claim Get Free Kin"),
         PrivacyMigration("Privacy Migration"),
+        BackgroundSwap("Background Swap Initiated"),
 
         // Errors
         ErrorRequest("Error Request"),

api/src/main/java/com/getcode/analytics/AnalyticsService.kt

@@ -44,6 +44,9 @@ interface AnalyticsService {
     fun onBillReceived()
 
     fun tipCardShown(username: String)
+
+    fun backgroundSwapInitiated()
+    fun unintentionalLogout()
 }
 
 class AnalyticsServiceNull : AnalyticsService {
@@ -85,4 +88,6 @@ class AnalyticsServiceNull : AnalyticsService {
     override fun upgradePrivacy(successful: Boolean, intentId: PublicKey, actionCount: Int) = Unit
     override fun onBillReceived() = Unit
     override fun tipCardShown(username: String) = Unit
+    override fun backgroundSwapInitiated() = Unit
+    override fun unintentionalLogout() = Unit
 }

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

@@ -32,7 +32,7 @@ data class BetaOptions(
             buyModuleEnabled = true,
             establishCodeRelationship = false,
             chatUnsubEnabled = false,
-            tipsEnabled = false,
+            tipsEnabled = true,
             tipsChatEnabled = false,
             tipsChatCashEnabled = false,
             balanceCurrencySelectionEnabled = true

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

@@ -9,6 +9,7 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.Person
 import com.getcode.R
+import com.getcode.analytics.AnalyticsService
 import com.getcode.manager.AuthManager
 import com.getcode.manager.SessionManager
 import com.getcode.model.notifications.NotificationType
@@ -42,6 +43,9 @@ import javax.inject.Inject
 class CodePushMessagingService : FirebaseMessagingService(),
     CoroutineScope by CoroutineScope(Dispatchers.IO) {
 
+    @Inject
+    lateinit var analyticsService: AnalyticsService
+
     @Inject
     lateinit var pushRepository: PushRepository
 
@@ -102,12 +106,16 @@ class CodePushMessagingService : FirebaseMessagingService(),
                         launch { historyController.fetchChats() }
                         launch { balanceController.fetchBalanceSuspend() }
                     }
+
                     NotificationType.ExecuteSwap -> {
-                       updateOrganizerAndSwap()
+                        analyticsService.backgroundSwapInitiated()
+                        updateOrganizerAndSwap()
                     }
+
                     NotificationType.Twitter -> {
                         launch { tipController.checkForConnection() }
                     }
+
                     NotificationType.Unknown -> Unit
                 }
             } else {
@@ -164,7 +172,7 @@ class CodePushMessagingService : FirebaseMessagingService(),
             person
         )
 
-        val style =   notificationManager.getActiveNotification(title.hashCode())?.let {
+        val style = notificationManager.getActiveNotification(title.hashCode())?.let {
             NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification(it)
         } ?: NotificationCompat.MessagingStyle(person)
 
@@ -199,7 +207,6 @@ class CodePushMessagingService : FirebaseMessagingService(),
 }
 
 
-
 private fun NotificationManager.getActiveNotification(notificationId: Int): Notification? {
     val barNotifications = getActiveNotifications()
     for (notification in barNotifications) {

app/src/main/java/com/getcode/view/login/SeedInputViewModel.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import com.getcode.App
 import com.getcode.R
+import com.getcode.analytics.AnalyticsService
 import com.getcode.crypt.MnemonicPhrase
 import com.getcode.manager.AccountManager
 import com.getcode.manager.AuthManager
@@ -40,6 +41,7 @@ data class SeedInputUiModel(
 
 @HiltViewModel
 class SeedInputViewModel @Inject constructor(
+    private val analyticsService: AnalyticsService,
     private val authManager: AuthManager,
     private val resources: ResourceHelper,
     private val mnemonicManager: MnemonicManager,
@@ -52,6 +54,7 @@ class SeedInputViewModel @Inject constructor(
         viewModelScope.launch {
             val token = accountManager.getToken()
             if (token != null) {
+                analyticsService.unintentionalLogout()
                 ErrorUtils.handleError(
                     Throwable("We shouldn't be here. Login screen visible with associated account in AccountManager.")
                 )

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

@@ -110,15 +110,11 @@ class GiveKinSheetViewModel @Inject constructor(
         if (checkBalanceLimit() || checkSendLimit()) return null
 
         val amountFiat = uiModel.amountModel.amountDouble
-        val amountKin = uiModel.amountModel.amountKin
-
-        val currencyCode = CurrencyCode
-            .tryValueOf(uiModel.currencyModel.selectedCurrency?.code) ?: return null
 
         exchange.fetchRatesIfNeeded()
-        val rate = exchange.rateFor(currencyCode) ?: return null
+        val rate = exchange.entryRate
 
-        return KinAmount.fromFiatAmount(amountKin, amountFiat, rate.fx, currencyCode)
+        return KinAmount.fromFiatAmount(amountFiat, rate)
     }
 
     override fun onAmountChanged(lastPressedBackspace: Boolean) {