Merge branch 'develop'

Author: Jeff Yanta

api/src/main/java/com/getcode/model/Kin.kt

@@ -3,6 +3,7 @@ package com.getcode.model
 import java.math.BigDecimal
 import java.math.RoundingMode
 import kotlin.math.floor
+import kotlin.math.min
 
 data class Kin(val quarks: Long): Value {
     init {
@@ -27,6 +28,7 @@ data class Kin(val quarks: Long): Value {
         if (this <= other) return fromKin(0)
         return Kin(this.quarks - other.quarks)
     }
+
     operator fun div(other: Kin): Kin = Kin(this.quarks / other.quarks)
     operator fun div(other: Int): Kin = this / fromQuarks(other.toLong())
     operator fun times(other: Kin): Kin = Kin(this.quarks * other.quarks)
@@ -59,4 +61,12 @@ data class Kin(val quarks: Long): Value {
         fun fromQuarks(quarks: Long) = Kin(quarks)
         fun fromFiat(fiat: Double, fx: Double) = fromKin(fiat / fx)
     }
+}
+
+fun min(a: Kin, b: Kin): Kin {
+    if (a.quarks > b.quarks) {
+        return b
+    }
+
+    return a
 }

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

@@ -23,12 +23,15 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import io.reactivex.rxjava3.core.Completable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import timber.log.Timber
 import javax.inject.Inject
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
+import kotlin.time.Duration.Companion.milliseconds
 
 
 class PaymentRepository @Inject constructor(
@@ -185,6 +188,48 @@ class PaymentRepository @Inject constructor(
     suspend fun rejectPayment(payload: CodePayload) {
         messagingRepository.rejectPayment(payload.rendezvous)
     }
+
+    suspend fun completeTipPayment(metadata: TwitterUser, amount: KinAmount) {
+        return suspendCancellableCoroutine { cont ->
+            val organizer = SessionManager.getOrganizer() ?: throw PaymentError.OrganizerNotFound()
+
+            // Generally, we would use the rendezvous key that
+            // was generated from the scan code payload, however,
+            // tip codes are inherently deterministic and won't
+            // change so we need a unique rendezvous for every tx.
+            val rendezvous = PublicKey.generate()
+
+            runCatching {
+                val transferResult = client.transferWithResult(
+                    amount = amount,
+                    organizer = organizer,
+                    fee = Kin.fromKin(0),
+                    additionalFees = emptyList(),
+                    rendezvousKey = rendezvous,
+                    destination = metadata.tipAddress,
+                    isWithdrawal = true,
+                    tippedUsername = metadata.username
+                )
+
+                if (transferResult.isSuccess) {
+                    Completable.concatArray(
+                        balanceController.fetchBalance(),
+                        client.fetchLimits(isForce = true)
+                    ).doOnComplete {
+                        analytics.transferForTip(amount = amount, successful = true)
+                        cont.resume(Unit)
+                    }.subscribe()
+                } else {
+                    // pass exception down to onFailure for isolated handling
+                    throw transferResult.exceptionOrNull()
+                        ?: Throwable("Unable to complete payment")
+                }
+            }.onFailure { error ->
+                ErrorUtils.handleError(error)
+                cont.resumeWithException(error)
+            }
+        }
+    }
 }
 
 sealed interface PaymentError {

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

@@ -87,6 +87,14 @@ class TransactionRepository @Inject constructor(
         return limits?.sendLimitFor(currencyCode)
     }
 
+    fun hasAvailableTransactionLimit(amount: KinAmount): Boolean {
+        return (sendLimitFor(amount.rate.currency)?.nextTransaction ?: 0.0) >= amount.fiat
+    }
+
+    fun hasAvailableDailyLimit(): Boolean {
+        return (sendLimitFor(currencyCode = CurrencyCode.USD)?.nextTransaction ?: 0.0) > 0
+    }
+
     private fun setLimits(limits: Limits) {
         this.limits = limits
     }

…va/com/getcode/ui/components/Scaffold.kt …om/getcode/ui/components/CodeScaffold.ktapp/src/main/java/com/getcode/ui/components/Scaffold.kt renamed to app/src/main/java/com/getcode/ui/components/CodeScaffold.kt app/src/main/java/com/getcode/ui/components/Scaffold.kt renamed to app/src/main/java/com/getcode/ui/components/CodeScaffold.kt

@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.material.DrawerDefaults
 import androidx.compose.material.FabPosition
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.ScaffoldState
 import androidx.compose.material.SnackbarHost
@@ -18,18 +17,22 @@ import androidx.compose.ui.unit.Dp
 import com.getcode.theme.CodeTheme
 import com.getcode.theme.extraLarge
 
-
 @Composable
 fun CodeScaffold(
     modifier: Modifier = Modifier,
     scaffoldState: ScaffoldState = rememberScaffoldState(),
-    topBar: @Composable (() -> Unit) = {},
-    bottomBar: @Composable (() -> Unit) = {},
-    snackbarHost: @Composable (SnackbarHostState) -> Unit = { SnackbarHost(it) },
-    floatingActionButton: @Composable (() -> Unit) = {},
+    topBar: @Composable () -> Unit = {},
+    bottomBar: @Composable () -> Unit = {},
+    snackbarHost: @Composable (SnackbarHostState) -> Unit = {
+        SnackbarHost(it) { data ->
+            CodeSnackbar(snackbarData = data)
+        }
+    },
+    floatingActionButton: @Composable () -> Unit = {},
     floatingActionButtonPosition: FabPosition = FabPosition.End,
     isFloatingActionButtonDocked: Boolean = false,
     drawerContent: @Composable (ColumnScope.() -> Unit)? = null,
+    drawerGesturesEnabled: Boolean = true,
     drawerShape: Shape = CodeTheme.shapes.extraLarge,
     drawerElevation: Dp = DrawerDefaults.Elevation,
     drawerBackgroundColor: Color = CodeTheme.colors.background,
@@ -49,6 +52,7 @@ fun CodeScaffold(
         floatingActionButtonPosition = floatingActionButtonPosition,
         isFloatingActionButtonDocked = isFloatingActionButtonDocked,
         drawerContent = drawerContent,
+        drawerGesturesEnabled = drawerGesturesEnabled,
         drawerShape = drawerShape,
         drawerElevation = drawerElevation,
         drawerBackgroundColor = drawerBackgroundColor,
@@ -58,4 +62,4 @@ fun CodeScaffold(
         contentColor = contentColor,
         content = content
     )
-}
+}

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

@@ -0,0 +1,36 @@
+package com.getcode.ui.components
+
+import androidx.compose.material.Snackbar
+import androidx.compose.material.SnackbarData
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.getcode.theme.BrandMuted
+import com.getcode.theme.CodeTheme
+import com.getcode.theme.green
+
+@Composable
+fun CodeSnackbar(
+    snackbarData: SnackbarData,
+    modifier: Modifier = Modifier,
+    actionOnNewLine: Boolean = false,
+    shape: Shape = CodeTheme.shapes.small,
+    backgroundColor: Color = BrandMuted,
+    contentColor: Color = CodeTheme.colors.onBackground,
+    actionColor: Color = green,
+    elevation: Dp = 6.dp
+) {
+    Snackbar(
+        snackbarData = snackbarData,
+        modifier = modifier,
+        actionOnNewLine = actionOnNewLine,
+        shape = shape,
+        backgroundColor = backgroundColor,
+        contentColor = contentColor,
+        actionColor = actionColor,
+        elevation = elevation
+    )
+}

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

@@ -0,0 +1,19 @@
+package com.getcode.ui.components
+
+import androidx.compose.material.SnackbarDuration
+import androidx.compose.material.SnackbarHostState
+import androidx.compose.material.SnackbarResult
+
+data class SnackData(
+    val message: String,
+    val actionLabel: String? = null,
+    val duration: SnackbarDuration = SnackbarDuration.Short
+)
+
+suspend fun SnackbarHostState.showSnackbar(data: SnackData): SnackbarResult {
+    return showSnackbar(
+        message = data.message,
+        actionLabel = data.actionLabel,
+        duration = data.duration
+    )
+}