Skip to content

Commit 222667c

Browse files
committed
Merge remote-tracking branch 'origin/develop' into chore/integrate-appcheck-for-device-token-validation
* origin/develop: (30 commits) chore: fetch chats when needed fix(home): dont reprocess request payloads fix(mnemomic): use DerivePath password if provided fix: prevent camera from starting inadvertently after stopping chore: hoist management button height padding down to bill to prevent clip chore: add strings for buy module support chore: more handling of currencies when no symbol available chore: align raw kin amount in AmountArea chore: drop button style to 14.sp chore(bill): only render waves on bottom half chore: improve ux in currency selection sheet chore: sync up airdrop toast and badge animations more chore(chat): improve wording of message content for returns chore(accesskey): improve layout spacing to reduce crowding chore(chat): set date separator to caption textstyle build: revert gradle changes to address deprecation warnings for Gradle 9 chore(phone/confirm): move loading state for resend code to text container fix: tweak proto setup to fix model generation chore: revert model proto dependency change Prep v1.1.302 ...
2 parents 35de152 + f80a2c7 commit 222667c

37 files changed

Lines changed: 413 additions & 240 deletions

CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
.github/ @jeffyanta
2-
.github/ @bmc08gt

api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ dependencies {
8484
androidTestImplementation(Libs.androidx_test_runner)
8585
implementation(Libs.hilt)
8686

87-
implementation("org.kin.sdk.android:base:1.0.1")
87+
implementation(Libs.kin_sdk)
8888

8989
implementation(Libs.timber)
9090
implementation(Libs.bugsnag)

api/src/main/java/com/getcode/crypt/MnemonicPhrase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class MnemonicPhrase(val kind: Kind, val words: List<String>) {
1616

1717
fun getSolanaKeyPair(context: Context, path: DerivePath = DerivePath.primary): Ed25519.KeyPair {
1818
val mnemonicCode = MnemonicCode(context.resources)
19-
val mnemonicSeed = MnemonicCode.toSeed(words, "")
19+
val mnemonicSeed = MnemonicCode.toSeed(words, path.password.orEmpty())
2020
mnemonicCode.check(words)
2121

2222
return Derive.path(mnemonicSeed, path)

api/src/main/java/com/getcode/network/HistoryController.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ class HistoryController @Inject constructor(
9494

9595
_chats.value = updatedWithMessages.sortedByDescending { it.lastMessageMillis }
9696

97-
pagerMap.entries.onEach { (id, pagingSource) ->
98-
pagingSource.invalidate()
99-
}
97+
pagerMap.clear()
10098
}
10199

102100
suspend fun advanceReadPointer(chatId: ID) {

api/src/main/java/com/getcode/network/appcheck/AppCheck.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ data class DeviceTokenResult(
2424
object AppCheck {
2525

2626
fun register() {
27-
// if (BuildConfig.DEBUG) {
27+
if (BuildConfig.DEBUG) {
2828
Firebase.appCheck.installAppCheckProviderFactory(
2929
DebugAppCheckProviderFactory.getInstance()
3030
)
31-
// } else {
32-
// Firebase.appCheck.installAppCheckProviderFactory(
33-
// PlayIntegrityAppCheckProviderFactory.getInstance()
34-
// )
35-
// }
31+
} else {
32+
Firebase.appCheck.installAppCheckProviderFactory(
33+
PlayIntegrityAppCheckProviderFactory.getInstance()
34+
)
35+
}
3636
}
3737

3838
private fun handleAppCheckError(error: Exception): Boolean {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ suspend fun Client.receiveRemoteSuspend(giftCard: GiftCardAccount): KinAmount =
185185
)
186186

187187
balanceController.fetchBalanceSuspend()
188-
// TODO: fetch chats here somehow?
189188

190189
return@withContext kinAmount
191190
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ import javax.inject.Inject
2525
import kotlin.coroutines.resume
2626
import kotlin.coroutines.resumeWithException
2727

28-
data class Request(
29-
val amount: KinAmount,
30-
val payload: CodePayload,
31-
)
3228

3329
class PaymentRepository @Inject constructor(
3430
@ApplicationContext private val context: Context,

app/build.gradle.kts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ android {
2323

2424
defaultConfig {
2525
applicationId = "com.getcode"
26-
versionCode = 299
26+
versionCode = 302
2727
versionName = "1.1.$versionCode"
2828

2929
minSdk = Android.minSdkVersion
@@ -136,6 +136,7 @@ dependencies {
136136
implementation(Libs.compose_ui)
137137
debugImplementation(Libs.compose_ui_tools)
138138
implementation(Libs.compose_ui_tools_preview)
139+
implementation(Libs.compose_accompanist)
139140
implementation(Libs.compose_foundation)
140141
implementation(Libs.compose_material)
141142
implementation(Libs.compose_materialIconsExtended)
@@ -144,34 +145,31 @@ dependencies {
144145
implementation(Libs.compose_livedata)
145146
implementation(Libs.compose_navigation)
146147
implementation(Libs.compose_paging)
147-
148-
implementation(Libs.androidx_constraint_layout_compose)
149-
150148
implementation(Libs.compose_voyager_navigation)
151149
implementation(Libs.compose_voyager_navigation_transitions)
152150
implementation(Libs.compose_voyager_navigation_bottomsheet)
153151
implementation(Libs.compose_voyager_navigation_hilt)
154152

153+
implementation(Libs.androidx_browser)
154+
implementation(Libs.androidx_constraint_layout_compose)
155+
155156
implementation(Libs.rxjava)
156157
implementation(Libs.rxandroid)
157158

158-
implementation(Libs.compose_accompanist)
159159
implementation(Libs.slf4j)
160160
implementation(Libs.grpc_android)
161161
implementation(Libs.kin_sdk)
162162

163163
implementation(platform(Libs.firebase_bom))
164164
implementation(Libs.firebase_analytics)
165+
implementation(Libs.firebase_crashlytics)
166+
implementation(Libs.firebase_messaging)
165167

166168
implementation(Libs.hilt_nav_compose)
167169
implementation(Libs.lib_phone_number_port)
168170
implementation(Libs.mp_android_chart)
169171
implementation(Libs.qr_generator)
170172
implementation(Libs.zxing)
171-
172-
implementation(Libs.androidx_browser)
173-
implementation(Libs.firebase_crashlytics)
174-
implementation(Libs.firebase_messaging)
175173
implementation(Libs.mixpanel)
176174

177175
implementation(Libs.cloudy)

app/proguard-rules.pro

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,8 @@
5555
public static int e(...);
5656
}
5757

58-
-keep public class * extends java.lang.Exception
58+
-keep public class * extends java.lang.Exception
59+
60+
# https://github.com/firebase/firebase-android-sdk/issues/3688
61+
-keep class org.json.** { *; }
62+
-keepclassmembers class org.json.** { *; }

app/src/main/java/com/getcode/navigation/screens/ModalScreens.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ data object CurrencySelectionModal: MainGraph, ModalRoot {
301301
override fun Content() {
302302
val navigator = LocalCodeNavigator.current
303303
ModalContainer(
304-
closeButton = {
304+
backButton = {
305305
if (navigator.isVisible) {
306306
it is CurrencySelectionModal
307307
} else {

0 commit comments

Comments
 (0)