Merge remote-tracking branch 'origin/master' into version/0.38

# Conflicts: # app/build.gradle
horizontalsystems · Jan 5, 2024 · 8ed400d · 8ed400d
2 parents 82232ad + ac88f82
commit 8ed400d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ android {
         compileSdk compile_sdk_version
         minSdkVersion min_sdk_version
         targetSdkVersion compile_sdk_version
-        versionCode 94
+        versionCode 95
         versionName "0.38.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/TonAdapter.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/TonAdapter.kt
@@ -64,7 +64,11 @@ class TonAdapter(
             is AccountType.Mnemonic -> {
                 val hdWallet = HDWallet(accountType.seed, 607, HDWallet.Purpose.BIP44, Curve.Ed25519)
                 val privateKey = hdWallet.privateKey(0)
-                tonKitFactory.create(privateKey.privKeyBytes, wallet.account.id)
+                var privateKeyBytes = privateKey.privKeyBytes
+                if (privateKeyBytes.size > 32) {
+                    privateKeyBytes = privateKeyBytes.copyOfRange(1, privateKeyBytes.size)
+                }
+                tonKitFactory.create(privateKeyBytes, wallet.account.id)
             }
 
             is AccountType.TonAddress -> {

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/utils/AddressUriParser.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/utils/AddressUriParser.kt
@@ -113,7 +113,11 @@ class AddressUriParser(private val blockchainType: BlockchainType?, private val
             uriBuilder.appendQueryParameter(key, value)
         }
 
-        return uriBuilder.build().toString().replace("/", "")
+        return uriBuilder
+            .build()
+            .toString()
+            .replace("/", "")
+            .replace("%3A", ":")
     }
 
     companion object {

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/address/HSAddressInput.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/address/HSAddressInput.kt
@@ -66,7 +66,7 @@ fun HSAddressInput(
     FormsInputAddress(
         modifier = modifier,
         value = viewModel.value,
-        hint = stringResource(id = R.string.Watch_Address_Hint),
+        hint = stringResource(id = R.string.Send_Hint_Address),
         state = viewModel.inputState,
         textPreprocessor = textPreprocessor,
         navController = navController,

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ui/ReceiveAddressScreen.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ui/ReceiveAddressScreen.kt
@@ -339,8 +339,10 @@ private fun ActionButtonsRow(
             .padding(horizontal = 48.dp),
         horizontalArrangement = if (watchAccount) Arrangement.Center else Arrangement.SpaceBetween,
     ) {
+        val itemModifier = if(watchAccount) Modifier else Modifier.weight(1f)
         if (!watchAccount) {
             ReceiveActionButton(
+                modifier = itemModifier,
                 icon = R.drawable.ic_edit_24px,
                 buttonText = stringResource(R.string.Button_SetAmount),
                 onClick = {
@@ -349,6 +351,7 @@ private fun ActionButtonsRow(
             )
         }
         ReceiveActionButton(
+            modifier = itemModifier,
             icon = R.drawable.ic_share_24px,
             buttonText = stringResource(R.string.Button_Share),
             onClick = {
@@ -359,6 +362,7 @@ private fun ActionButtonsRow(
             HSpacer(64.dp)
         }
         ReceiveActionButton(
+            modifier = itemModifier,
             icon = R.drawable.ic_copy_24px,
             buttonText = stringResource(R.string.Button_Copy),
             onClick = {
@@ -456,13 +460,16 @@ private fun AdditionalDataSection(
     }
 }
 
+
 @Composable
 private fun ReceiveActionButton(
+    modifier: Modifier,
     icon: Int,
     buttonText: String,
     onClick: () -> Unit,
 ) {
     Column(
+        modifier = modifier,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         ButtonPrimaryCircle(
@@ -472,6 +479,7 @@ private fun ReceiveActionButton(
         caption_grey(
             modifier = Modifier.padding(top = 8.dp),
             text = buttonText,
+            textAlign = TextAlign.Center,
         )
     }
 }

diff --git a/...ava/io/horizontalsystems/bankwallet/modules/receive/viewmodels/ReceiveAddressViewModel.kt b/...ava/io/horizontalsystems/bankwallet/modules/receive/viewmodels/ReceiveAddressViewModel.kt
@@ -122,7 +122,9 @@ class ReceiveAddressViewModel(
             addressUri.address = newUri
             addressUri.parameters[AddressUri.Field.amountField(wallet.token.blockchainType)] = it.toString()
             addressUri.parameters[AddressUri.Field.BlockchainUid] = wallet.token.blockchainType.uid
-            addressUri.parameters[AddressUri.Field.TokenUid] = wallet.token.type.id
+            if (wallet.token.type !is TokenType.Derived && wallet.token.type !is TokenType.AddressTyped) {
+                addressUri.parameters[AddressUri.Field.TokenUid] = wallet.token.type.id
+            }
             newUri = parser.uri(addressUri)
         }