Skip to content

Commit c307b36

Browse files
PankraSergPankraSerg
authored
Merge pull request #1090 from soramitsu/staging
staging
2 parents 6732e4c + 4d75d3e commit c307b36

File tree

91 files changed

+1525
-522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1525
-522
lines changed

‎app/src/main/java/jp/co/soramitsu/app/root/domain/RootInteractor.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package jp.co.soramitsu.app.root.domain
22

3+
import com.walletconnect.web3.wallet.client.Web3Wallet
34
import jp.co.soramitsu.account.api.domain.PendulumPreInstalledAccountsScenario
45
import jp.co.soramitsu.common.data.storage.Preferences
56
import jp.co.soramitsu.common.data.storage.appConfig
@@ -48,4 +49,6 @@ class RootInteractor(
4849
fun chainRegistrySyncUp() = walletRepository.chainRegistrySyncUp()
4950

5051
suspend fun fetchFeatureToggle() = pendulumPreInstalledAccountsScenario.fetchFeatureToggle()
52+
53+
fun getPendingListOfSessionRequests(topic: String) = Web3Wallet.getPendingListOfSessionRequests(topic)
5154
}

‎app/src/main/java/jp/co/soramitsu/app/root/navigation/Navigator.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -955,8 +955,8 @@ class Navigator :
955955
navController?.navigate(R.id.action_mainFragment_to_filterFragment)
956956
}
957957

958-
override fun openSendConfirm(transferDraft: TransferDraft, phishingType: PhishingType?, overrides: Map<String, Any?>, transferComment: String?) {
959-
val bundle = ConfirmSendFragment.getBundle(transferDraft, phishingType, overrides, transferComment)
958+
override fun openSendConfirm(transferDraft: TransferDraft, phishingType: PhishingType?, overrides: Map<String, Any?>, transferComment: String?, skipEdValidation: Boolean) {
959+
val bundle = ConfirmSendFragment.getBundle(transferDraft, phishingType, overrides, transferComment, skipEdValidation)
960960

961961
navController?.navigate(R.id.confirmSendFragment, bundle)
962962
}
@@ -1102,8 +1102,8 @@ class Navigator :
11021102
navController?.navigate(R.id.backupWalletDialog, extras)
11031103
}
11041104

1105-
override fun openRenameWallet(metaAccountId: Long) {
1106-
val extras = RenameAccountDialog.getBundle(metaAccountId)
1105+
override fun openRenameWallet(metaAccountId: Long, name: String?) {
1106+
val extras = RenameAccountDialog.getBundle(metaAccountId, name)
11071107

11081108
navController?.navigate(R.id.renameAccountDialog, extras)
11091109
}

‎app/src/main/java/jp/co/soramitsu/app/root/presentation/RootViewModel.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,14 @@ class RootViewModel @Inject constructor(
194194
}
195195

196196
private fun handleSessionRequest(sessionRequest: Wallet.Model.SessionRequest) {
197-
return rootRouter.openWalletConnectSessionRequest(sessionRequest.topic)
197+
val pendingListOfSessionRequests = interactor.getPendingListOfSessionRequests(sessionRequest.topic)
198+
if (pendingListOfSessionRequests.isEmpty()) {
199+
return
200+
}
201+
rootRouter.openWalletConnectSessionRequest(sessionRequest.topic)
198202
}
199203

200204
private fun handleSessionProposal(sessionProposal: Wallet.Model.SessionProposal) {
201-
return rootRouter.openWalletConnectSessionProposal(sessionProposal.pairingTopic)
205+
rootRouter.openWalletConnectSessionProposal(sessionProposal.pairingTopic)
202206
}
203207
}

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ apply plugin: "org.sonarqube"
55
buildscript {
66
ext {
77
// App version
8-
versionName = '3.2.1'
9-
versionCode = 140
8+
versionName = '3.2.2'
9+
versionCode = 152
1010

1111
// SDK and tools
1212
compileSdkVersion = 34
@@ -83,7 +83,7 @@ buildscript {
8383
minifyRelease = true
8484
beaconVersion = "3.2.4"
8585

86-
sharedFeaturesVersion = "1.1.1.17-FLW"
86+
sharedFeaturesVersion = "1.1.1.20-FLW"
8787

8888
coilDep = "io.coil-kt:coil:$coilVersion"
8989
coilSvg = "io.coil-kt:coil-svg:$coilVersion"

‎common/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ android {
5454
buildConfigField "String", "ETHERSCAN_API_KEY", readSecretInQuotes("FL_ANDROID_ETHERSCAN_API_KEY")
5555
buildConfigField "String", "BSCSCAN_API_KEY", readSecretInQuotes("FL_ANDROID_BSCSCAN_API_KEY")
5656
buildConfigField "String", "POLYGONSCAN_API_KEY", readSecretInQuotes("FL_ANDROID_POLYGONSCAN_API_KEY")
57+
buildConfigField "String", "OKLINK_API_KEY", readSecretInQuotes("FL_ANDROID_OKLINK_API_KEY")
58+
buildConfigField "String", "OPMAINNET_API_KEY", readSecretInQuotes("FL_ANDROID_OPMAINNET_API_KEY")
5759
buildConfigField "String", "WALLET_CONNECT_PROJECT_ID", readSecretInQuotes("FL_WALLET_CONNECT_PROJECT_ID")
5860
}
5961

‎common/src/main/java/jp/co/soramitsu/common/base/errors/ValidationException.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ open class ValidationWarning(
1414
message: String,
1515
explanation: String,
1616
val positiveButtonText: String,
17-
val negativeButtonText: String
17+
val negativeButtonText: String,
18+
val secondPositiveButtonText: String?
1819
) : ValidationException(message, explanation) {
1920
operator fun component3() = positiveButtonText
2021
operator fun component4() = negativeButtonText
22+
operator fun component5() = secondPositiveButtonText
2123
}

‎common/src/main/java/jp/co/soramitsu/common/compose/component/AssetListItem.kt‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ package jp.co.soramitsu.common.compose.component
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.clickable
5+
import androidx.compose.foundation.layout.Arrangement
56
import androidx.compose.foundation.layout.Box
67
import androidx.compose.foundation.layout.Column
8+
import androidx.compose.foundation.layout.ExperimentalLayoutApi
9+
import androidx.compose.foundation.layout.FlowRow
710
import androidx.compose.foundation.layout.IntrinsicSize
811
import androidx.compose.foundation.layout.Row
912
import androidx.compose.foundation.layout.Spacer
@@ -12,6 +15,7 @@ import androidx.compose.foundation.layout.height
1215
import androidx.compose.foundation.layout.padding
1316
import androidx.compose.foundation.layout.size
1417
import androidx.compose.foundation.layout.width
18+
import androidx.compose.foundation.layout.wrapContentWidth
1519
import androidx.compose.material.Card
1620
import androidx.compose.material.Divider
1721
import androidx.compose.material.Icon
@@ -43,6 +47,7 @@ import jp.co.soramitsu.common.compose.theme.white64
4347
import jp.co.soramitsu.common.compose.viewstate.AssetListItemShimmerViewState
4448
import jp.co.soramitsu.common.compose.viewstate.AssetListItemViewState
4549

50+
@OptIn(ExperimentalLayoutApi::class)
4651
@Composable
4752
fun AssetListItem(
4853
state: AssetListItemViewState,
@@ -147,32 +152,38 @@ fun AssetListItem(
147152
)
148153
}
149154
}
150-
Row {
151-
Text(
152-
text = state.assetTokenFiat.orEmpty(),
153-
style = MaterialTheme.customTypography.body1,
154-
modifier = Modifier
155-
.alpha(0.64f)
156-
.testTag("AssetListItem_${state.assetSymbol}_change_fiat")
157-
)
158-
Text(
159-
text = state.assetTokenRate.orEmpty(),
160-
style = MaterialTheme.customTypography.body1.copy(
161-
color = assetRateColor
162-
),
155+
Row(
156+
modifier = Modifier
157+
.fillMaxWidth(),
158+
horizontalArrangement = Arrangement.SpaceAround
159+
) {
160+
FlowRow(
163161
modifier = Modifier
164-
.padding(start = 4.dp)
165-
.testTag("AssetListItem_${state.assetSymbol}_change_percent")
166-
)
167-
Spacer(
168-
modifier = Modifier
169-
.height(1.dp)
170-
.weight(1.0f)
171-
)
162+
.weight(1f)
163+
) {
164+
Text(
165+
text = state.assetTokenFiat.orEmpty(),
166+
style = MaterialTheme.customTypography.body1,
167+
modifier = Modifier
168+
.alpha(0.64f)
169+
.testTag("AssetListItem_${state.assetSymbol}_change_fiat")
170+
)
171+
172+
Text(
173+
text = state.assetTokenRate.orEmpty(),
174+
style = MaterialTheme.customTypography.body1.copy(
175+
color = assetRateColor
176+
),
177+
modifier = Modifier
178+
.padding(start = 4.dp)
179+
.testTag("AssetListItem_${state.assetSymbol}_change_percent")
180+
)
181+
}
172182
Text(
173183
text = state.assetTransferableBalanceFiat.orEmpty(),
174-
style = MaterialTheme.customTypography.body1,
184+
style = MaterialTheme.customTypography.body1.copy(textAlign = TextAlign.End),
175185
modifier = Modifier
186+
.wrapContentWidth()
176187
.alpha(0.64f)
177188
.padding(start = 4.dp)
178189
.testTag("AssetListItem_${state.assetSymbol}_transferable_fiat")
@@ -326,14 +337,15 @@ private fun PreviewAssetListItem() {
326337
)
327338

328339
val state = AssetListItemViewState(
340+
index = 0,
329341
assetIconUrl = assetIconUrl,
330342
assetName = "Karura asset",
331343
assetChainName = "Karura",
332344
assetSymbol = "KSM",
333-
assetTokenFiat = "$73.22",
345+
assetTokenFiat = "$73.22000003242342",
334346
assetTokenRate = "+5.67%",
335-
assetTransferableBalance = "444.3",
336-
assetTransferableBalanceFiat = "$2345.32",
347+
assetTransferableBalance = "444.30",
348+
assetTransferableBalanceFiat = "$2345.3233434334",
337349
assetChainUrls = assetChainUrlsMap,
338350
chainId = "",
339351
chainAssetId = "",

‎common/src/main/java/jp/co/soramitsu/common/compose/component/Button.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ import jp.co.soramitsu.common.compose.theme.white64
4848
import jp.co.soramitsu.common.utils.onSingleClick
4949
import jp.co.soramitsu.common.utils.rememberLastClickTime
5050

51-
private const val DISABLE_CLICK_TIME = 1000L
52-
5351
data class ButtonViewState(
5452
val text: String,
5553
val enabled: Boolean = true
@@ -60,7 +58,7 @@ fun AccentButton(state: ButtonViewState, modifier: Modifier = Modifier, onClick:
6058
TextButton(
6159
text = state.text,
6260
enabled = state.enabled,
63-
colors = accentButtonColors,
61+
colors = accentDarkButtonColors,
6462
modifier = modifier,
6563
onClick = onClick
6664
)

‎common/src/main/java/jp/co/soramitsu/common/compose/component/SwipeBox.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,15 @@ private fun AssetItemSwipeBoxPreview() {
161161
)
162162

163163
val assetListItemViewState = AssetListItemViewState(
164+
index = 0,
164165
assetIconUrl = "https://raw.githubusercontent.com/soramitsu/fearless-utils/master/icons/chains/white/Polkadot.svg",
165166
assetChainName = "Karura",
166167
assetName = "Karura asset",
167168
assetSymbol = "KSM",
168-
assetTokenFiat = "$73.22",
169+
assetTokenFiat = "$73.2200000003",
169170
assetTokenRate = "+5.67%",
170171
assetTransferableBalance = "444.3",
171-
assetTransferableBalanceFiat = "$2345.32",
172+
assetTransferableBalanceFiat = "$2345.30000002",
172173
assetChainUrls = assetChainUrlsMap,
173174
chainId = "",
174175
chainAssetId = "",

‎common/src/main/java/jp/co/soramitsu/common/compose/theme/Color.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ val accentDarkButtonColors = object : ButtonColors {
105105
val accentDarkDisabledButtonColors = object : ButtonColors {
106106
@Composable
107107
override fun backgroundColor(enabled: Boolean): State<Color> {
108-
return rememberUpdatedState(if (enabled) colorAccent else white08)
108+
return rememberUpdatedState(if (enabled) colorAccentDark else white08)
109109
}
110110

111111
@Composable

0 commit comments

Comments
 (0)