Merge branch 'develop'

Jeff Yanta · Jeff Yanta · commit 96c3ec9f4189 · 2024-02-16T10:38:49.000-05:00
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.cli.common.toBooleanLenient
 import java.util.Properties
 
 plugins {
@@ -8,21 +9,32 @@ plugins {
 }
 
 android {
-    namespace = "com.getcode.api"
+    namespace = "${Android.namespace}.api"
     compileSdk = Android.compileSdkVersion
     defaultConfig {
         minSdk = Android.minSdkVersion
         targetSdk = Android.targetSdkVersion
         buildToolsVersion = Android.buildToolsVersion
         testInstrumentationRunner = Android.testInstrumentationRunner
 
+        buildConfigField("Boolean", "NOTIFY_ERRORS", "false")
+
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments += mapOf("room.schemaLocation" to "$projectDir/schemas")
             }
         }
     }
 
+    buildTypes {
+        getByName("release") {
+            buildConfigField("Boolean", "NOTIFY_ERRORS", "true")
+        }
+        getByName("debug") {
+            buildConfigField("Boolean", "NOTIFY_ERRORS", (System.getenv("NOTIFY_ERRORS").toBooleanLenient() ?: false).toString())
+        }
+    }
+
     java {
         toolchain {
             languageVersion.set(JavaLanguageVersion.of(17))
diff --git a/api/src/main/java/com/getcode/network/repository/MessagingRepository.kt b/api/src/main/java/com/getcode/network/repository/MessagingRepository.kt
@@ -285,6 +285,7 @@ class MessagingRepository @Inject constructor(
                 }: result: ${it.result}"
             )
         }.onFailure {
+            ErrorUtils.handleError(it)
             Timber.e(t = it, message = "Failed to send rendezvous message.")
         }
     }
diff --git a/api/src/main/java/com/getcode/network/repository/PaymentRepository.kt b/api/src/main/java/com/getcode/network/repository/PaymentRepository.kt
@@ -14,6 +14,7 @@ import com.getcode.network.client.establishRelationship
 import com.getcode.network.client.fetchLimits
 import com.getcode.network.client.transferWithResult
 import com.getcode.network.exchange.Exchange
+import com.getcode.utils.ErrorUtils
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.reactivex.rxjava3.core.Completable
 import kotlinx.coroutines.CoroutineScope
@@ -48,7 +49,7 @@ class PaymentRepository @Inject constructor(
 
             codeScanned(payload.rendezvous)
             return payload to loginAttempt
-        }.getOrNull()
+        }.onFailure { ErrorUtils.handleError(it) }.getOrNull()
     }
 
     suspend fun rejectLogin(rendezvousKey: KeyPair) {
@@ -174,6 +175,7 @@ class PaymentRepository @Inject constructor(
                     amount = paymentAmount,
                     successful = false
                 )
+                ErrorUtils.handleError(error)
                 cont.resumeWithException(error)
             }
         }
diff --git a/api/src/main/java/com/getcode/utils/ErrorUtils.kt b/api/src/main/java/com/getcode/utils/ErrorUtils.kt
@@ -39,7 +39,7 @@ object ErrorUtils {
         }
 
         if (
-            !BuildConfig.DEBUG &&
+            BuildConfig.NOTIFY_ERRORS &&
             throwable !is UnknownHostException &&
             throwable !is TimeoutException &&
             throwable !is ConnectException
@@ -49,16 +49,18 @@ object ErrorUtils {
         }
     }
 
-    fun isNetworkError(throwable: Throwable): Boolean =
+    private fun isNetworkError(throwable: Throwable): Boolean =
         throwable is TimeoutException ||
                 throwable.cause is TimeoutException ||
                 throwable is UnknownHostException ||
                 throwable.cause is UnknownHostException
 
-    fun isRuntimeError(throwable: Throwable): Boolean =
+    private fun isRuntimeError(throwable: Throwable): Boolean =
         throwable is StatusRuntimeException ||
                 throwable.cause is StatusRuntimeException
 
-    fun isSuppressibleError(throwable: Throwable): Boolean =
-        throwable is SQLException || throwable is net.sqlcipher.SQLException
-}
+    private fun isSuppressibleError(throwable: Throwable): Boolean =
+        throwable is SQLException || throwable is net.sqlcipher.SQLException || throwable is SuppressibleException
+}
+
+data class SuppressibleException(override val message: String): Throwable(message)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,11 +18,11 @@ plugins {
 val contributorsSigningConfig = ContributorsSignatory(rootProject)
 
 android {
-    namespace = "com.getcode"
+    namespace = Android.namespace
     compileSdk = Android.compileSdkVersion
 
     defaultConfig {
-        applicationId = "com.getcode"
+        applicationId = Android.namespace
         versionCode = 304
         versionName = "1.1.$versionCode"
 
@@ -35,6 +35,7 @@ android {
         val properties = Properties()
         properties.load(propertiesFile.inputStream())
         buildConfigField("String", "MIXPANEL_API_KEY", "\"${properties.getProperty("MIXPANEL_API_KEY")}\"")
+        buildConfigField("Boolean", "NOTIFY_ERRORS", "false")
     }
 
     signingConfigs {
@@ -80,7 +81,7 @@ android {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
+            languageVersion.set(JavaLanguageVersion.of(Versions.java))
         }
     }
 
diff --git a/app/src/main/java/com/getcode/models/DeepLinkPaymentRequest.kt b/app/src/main/java/com/getcode/models/DeepLinkPaymentRequest.kt
@@ -4,6 +4,7 @@ import com.getcode.model.CurrencyCode
 import com.getcode.model.Fiat
 import com.getcode.network.repository.decodeBase64
 import com.getcode.solana.keys.PublicKey
+import com.getcode.utils.ErrorUtils
 import com.getcode.vendor.Base58
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -75,6 +76,7 @@ data class DeepLinkPaymentRequest(
             val destination = runCatching { PublicKey.fromBase58(destinationString) }
                 .getOrNull()
             if (destination == null) {
+                ErrorUtils.handleError(Throwable())
                 Timber.e("Invalid destination address")
                 return null
             }
diff --git a/app/src/main/java/com/getcode/navigation/core/BottomSheetNavigator.kt b/app/src/main/java/com/getcode/navigation/core/BottomSheetNavigator.kt
@@ -5,6 +5,7 @@ import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.shape.ZeroCornerSize
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.ModalBottomSheetDefaults
 import androidx.compose.material.ModalBottomSheetLayout
@@ -51,7 +52,9 @@ fun BottomSheetNavigator(
     modifier: Modifier = Modifier,
     hideOnBackPress: Boolean = true,
     scrimColor: Color = CodeTheme.colors.surface.copy(alpha = 0.32f),
-    sheetShape: Shape = CodeTheme.shapes.extraLarge,
+    sheetShape: Shape = CodeTheme.shapes.extraLarge.copy(
+        bottomStart = ZeroCornerSize, bottomEnd = ZeroCornerSize
+    ),
     sheetElevation: Dp = ModalBottomSheetDefaults.Elevation,
     sheetBackgroundColor: Color = CodeTheme.colors.surface,
     sheetContentColor: Color = CodeTheme.colors.onSurface,
diff --git a/app/src/main/java/com/getcode/theme/Type.kt b/app/src/main/java/com/getcode/theme/Type.kt
@@ -102,13 +102,6 @@ internal val typography = Typography(
         textAlign = TextAlign.Center
     ),
     caption = TextStyle(
-        fontFamily = Avenir,
-        fontSize = 16.sp,
-        fontWeight = FontWeight.SemiBold,
-        lineHeight = 19.sp,
-        //letterSpacing = 0.4.sp
-    ),
-    overline = TextStyle(
         fontFamily = Avenir,
         fontSize = 12.sp,
         fontWeight = FontWeight.SemiBold,
diff --git a/app/src/main/java/com/getcode/ui/components/TextSection.kt b/app/src/main/java/com/getcode/ui/components/TextSection.kt
@@ -14,13 +14,11 @@ fun TextSection(title: String, description: String) {
     Column(verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2)) {
         Text(
             text = title,
-            style = CodeTheme.typography.h6.copy(
-                fontWeight = FontWeight.Bold,
-            )
+            style = CodeTheme.typography.subtitle1
         )
         Text(
             text = description,
-            style = CodeTheme.typography.subtitle2
+            style = CodeTheme.typography.body2
         )
     }
 }
diff --git a/app/src/main/java/com/getcode/ui/components/chat/MessageNode.kt b/app/src/main/java/com/getcode/ui/components/chat/MessageNode.kt
@@ -172,7 +172,7 @@ private fun MessageText(modifier: Modifier = Modifier, text: String, date: Insta
         Text(
             modifier = Modifier.align(Alignment.End),
             text = date.formatTimeRelatively(),
-            style = CodeTheme.typography.overline,
+            style = CodeTheme.typography.caption,
             color = BrandLight,
         )
     }
diff --git a/app/src/main/java/com/getcode/view/login/LoginHome.kt b/app/src/main/java/com/getcode/view/login/LoginHome.kt
@@ -138,7 +138,7 @@ fun LoginHome() {
 
             ClickableText(
                 text = bottomString,
-                style = CodeTheme.typography.overline.copy(
+                style = CodeTheme.typography.caption.copy(
                     textAlign = TextAlign.Center,
                     color = BrandLight
                 ),
diff --git a/app/src/main/java/com/getcode/view/main/account/AccountHome.kt b/app/src/main/java/com/getcode/view/main/account/AccountHome.kt
@@ -171,7 +171,7 @@ fun ListItem(item: AccountMainItem, onClick: () -> Unit) {
                     text = if (isPhoneLinked) stringResource(id = R.string.title_linked)
                     else stringResource(id = R.string.title_notLinked),
                     color = BrandLight,
-                    style = CodeTheme.typography.caption.copy(
+                    style = CodeTheme.typography.body1.copy(
                         fontSize = 12.sp
                     ),
                 )
diff --git a/app/src/main/java/com/getcode/view/main/account/BetaFlagsScreen.kt b/app/src/main/java/com/getcode/view/main/account/BetaFlagsScreen.kt
@@ -96,7 +96,7 @@ fun BetaFlagsScreen(
                             modifier = Modifier
                                 .padding(vertical = CodeTheme.dimens.grid.x1),
                             text = option.subtitleText,
-                            style = CodeTheme.typography.overline,
+                            style = CodeTheme.typography.caption,
                             color = BrandLight
                         )
                     }
diff --git a/app/src/main/java/com/getcode/view/main/account/ConfirmDeleteAccount.kt b/app/src/main/java/com/getcode/view/main/account/ConfirmDeleteAccount.kt
@@ -40,7 +40,7 @@ fun ConfirmDeleteAccount(
     ) {
         Text(
             text = stringResource(id = R.string.subtitle_deleteAccountDescription),
-            style = CodeTheme.typography.subtitle2
+            style = CodeTheme.typography.body2
         )
         TextField(
             modifier = Modifier
@@ -49,14 +49,14 @@ fun ConfirmDeleteAccount(
             placeholder = {
                 Text(
                     stringResource(id = R.string.subtitle_typeDelete).format(viewModel.requiredPhrase),
-                    style = CodeTheme.typography.caption
+                    style = CodeTheme.typography.body1
                 )
             },
             value = viewModel.typedText.collectAsState().value,
             onValueChange = {
                 viewModel.onTextUpdated(it)
             },
-            textStyle = CodeTheme.typography.caption,
+            textStyle = CodeTheme.typography.body1,
             singleLine = true,
             colors = inputColors(),
             shape = CodeTheme.shapes.extraSmall
diff --git a/app/src/main/java/com/getcode/view/main/account/withdraw/AccountWithdrawAddress.kt b/app/src/main/java/com/getcode/view/main/account/withdraw/AccountWithdrawAddress.kt
@@ -95,9 +95,7 @@ fun AccountWithdrawAddress(
                         .padding(start = CodeTheme.dimens.grid.x2),
                     text = text,
                     color = if (isValid) green else Color.Red,
-                    style = CodeTheme.typography.caption.copy(
-                        fontSize = 12.sp
-                    )
+                    style = CodeTheme.typography.caption
                 )
             }
         }
diff --git a/app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt b/app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt
@@ -182,9 +182,7 @@ fun CurrencySelectionSheet(
                             ) {
                                 Text(
                                     modifier = Modifier.padding(bottom = 10.dp),
-                                    style = CodeTheme.typography.caption.copy(
-                                        fontSize = 14.sp,
-                                    ),
+                                    style = CodeTheme.typography.body2,
                                     color = BrandLight,
                                     text = listItem.text
                                 )
diff --git a/app/src/main/java/com/getcode/view/main/getKin/GetKinSheet.kt b/app/src/main/java/com/getcode/view/main/getKin/GetKinSheet.kt
@@ -219,8 +219,7 @@ fun GetKinSheet(
                                 Text(
                                     modifier = Modifier.padding(top = CodeTheme.dimens.grid.x1),
                                     text = stringResource(it),
-                                    style = CodeTheme.typography.caption,
-                                    fontSize = 13.sp,
+                                    style = CodeTheme.typography.body2,
                                     color = colorResource(R.color.code_brand_light),
                                 )
                             }
diff --git a/app/src/main/java/com/getcode/view/main/home/DecorView.kt b/app/src/main/java/com/getcode/view/main/home/DecorView.kt
@@ -137,7 +137,7 @@ internal fun DecorView(
                     Text(
                         text = stringResource(id = R.string.title_badge_no_connection),
                         color = Color.White,
-                        style = CodeTheme.typography.overline
+                        style = CodeTheme.typography.caption
                     )
                 }
             }
diff --git a/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt b/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt
@@ -218,7 +218,7 @@ class HomeViewModel @Inject constructor(
                     historyController.fetchChats()
                 },
                 onFailure = {
-                    Timber.e(t = it, message = "Auto airdrop failed")
+                    ErrorUtils.handleError(it)
                     prefRepository.set(PrefsBool.IS_ELIGIBLE_GET_FIRST_KIN_AIRDROP, false)
                 }
             )
@@ -670,8 +670,6 @@ class HomeViewModel @Inject constructor(
         }.onSuccess {
             historyController.fetchChats()
 
-            showToast(paymentConfirmation.localAmount, false)
-
             withContext(Dispatchers.Main) {
                 uiFlow.update {
                     val billState = it.billState
@@ -688,11 +686,12 @@ class HomeViewModel @Inject constructor(
             delay(1.seconds)
             cancelPayment(false)
         }.onFailure { error ->
-            error.printStackTrace()
             TopBarManager.showMessage(
                 resources.getString(R.string.error_title_payment_failed),
                 resources.getString(R.string.error_description_payment_failed),
             )
+
+            ErrorUtils.handleError(error)
             uiFlow.update { uiModel ->
                 uiModel.copy(
                     presentationStyle = PresentationStyle.Hidden,
diff --git a/app/src/main/java/com/getcode/view/main/home/components/ReceivedKinConfirmation.kt b/app/src/main/java/com/getcode/view/main/home/components/ReceivedKinConfirmation.kt
@@ -20,6 +20,7 @@ import com.getcode.R
 import com.getcode.models.Bill
 import com.getcode.theme.Brand
 import com.getcode.theme.CodeTheme
+import com.getcode.theme.White
 import com.getcode.util.flagResId
 import com.getcode.util.formatted
 import com.getcode.ui.components.ButtonState
@@ -52,6 +53,7 @@ internal fun ReceivedKinConfirmation(
             style = CodeTheme.typography.subtitle1.copy(
                 fontWeight = FontWeight.Bold
             ),
+            color = White,
             text = stringResource(id = R.string.subtitle_youReceived)
         )
 
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -1,6 +1,7 @@
 @file:Suppress("ConstPropertyName")
 
 object Android {
+    const val namespace = "com.getcode"
     const val compileSdkVersion = 34
     const val minSdkVersion = 22
     const val targetSdkVersion = 33
diff --git a/ed25519/build.gradle.kts b/ed25519/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.getcode.ed25519"
+    namespace = "${Android.namespace}.ed25519"
     compileSdk = Android.compileSdkVersion
     defaultConfig {
         minSdk = Android.minSdkVersion
diff --git a/scripts/internal-testing-build.sh b/scripts/internal-testing-build.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+date="$(date '+%m.%d.%y')"
+
+export NOTIFY_ERRORS=true
+./gradlew assembleDebug
+
+outputDir="$(pwd)/app/build/outputs/apk/debug"
+mv "${outputDir}/app-debug.apk" "${outputDir}/app-${date}-debug.apk"
+
+unset NOTIFY_ERRORS

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ class MessagingRepository @Inject constructor(`
`285`	`285`	`}: result: ${it.result}"`
`286`	`286`	`)`
`287`	`287`	`}.onFailure {`
	`288`	`+ ErrorUtils.handleError(it)`
`288`	`289`	`Timber.e(t = it, message = "Failed to send rendezvous message.")`
`289`	`290`	`}`
`290`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import com.getcode.network.client.establishRelationship`
`14`	`14`	`import com.getcode.network.client.fetchLimits`
`15`	`15`	`import com.getcode.network.client.transferWithResult`
`16`	`16`	`import com.getcode.network.exchange.Exchange`
	`17`	`+import com.getcode.utils.ErrorUtils`
`17`	`18`	`import dagger.hilt.android.qualifiers.ApplicationContext`
`18`	`19`	`import io.reactivex.rxjava3.core.Completable`
`19`	`20`	`import kotlinx.coroutines.CoroutineScope`
`@@ -48,7 +49,7 @@ class PaymentRepository @Inject constructor(`
`48`	`49`
`49`	`50`	`codeScanned(payload.rendezvous)`
`50`	`51`	`return payload to loginAttempt`
`51`		`- }.getOrNull()`
	`52`	`+ }.onFailure { ErrorUtils.handleError(it) }.getOrNull()`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`suspend fun rejectLogin(rendezvousKey: KeyPair) {`
`@@ -174,6 +175,7 @@ class PaymentRepository @Inject constructor(`
`174`	`175`	`amount = paymentAmount,`
`175`	`176`	`successful = false`
`176`	`177`	`)`
	`178`	`+ ErrorUtils.handleError(error)`
`177`	`179`	`cont.resumeWithException(error)`
`178`	`180`	`}`
`179`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,11 @@ fun TextSection(title: String, description: String) {`
`14`	`14`	`Column(verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2)) {`
`15`	`15`	`Text(`
`16`	`16`	`text = title,`
`17`		`- style = CodeTheme.typography.h6.copy(`
`18`		`- fontWeight = FontWeight.Bold,`
`19`		`- )`
	`17`	`+ style = CodeTheme.typography.subtitle1`
`20`	`18`	`)`
`21`	`19`	`Text(`
`22`	`20`	`text = description,`
`23`		`- style = CodeTheme.typography.subtitle2`
	`21`	`+ style = CodeTheme.typography.body2`
`24`	`22`	`)`
`25`	`23`	`}`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ private fun MessageText(modifier: Modifier = Modifier, text: String, date: Insta`
`172`	`172`	`Text(`
`173`	`173`	`modifier = Modifier.align(Alignment.End),`
`174`	`174`	`text = date.formatTimeRelatively(),`
`175`		`- style = CodeTheme.typography.overline,`
	`175`	`+ style = CodeTheme.typography.caption,`
`176`	`176`	`color = BrandLight,`
`177`	`177`	`)`
`178`	`178`	`}`