sora-xor · C4tWithShell · Oct 29, 2024 · Jul 20, 2023 · Jul 31, 2023 · Aug 28, 2023
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -0,0 +1,69 @@
+name: Bug Report
+description: A clear and concise description of what the bug is.
+title: "[Bug]: "
+labels: ["bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for helping us improve SORA!
+
+  - type: textarea
+    id: preconditions
+    attributes:
+      label: Preconditions
+      description: What are the preconditions to reproduce the bug ?
+
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: What are the steps to reproduce the bug ?
+      placeholder: |
+        (e.g.)
+        1. Go to 
+        2. Click on 
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual behavior
+      description: What is the actual behavior when encountering the bug ?
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Environment
+      description: In which environment did the bug occur ?
+      multiple: false
+      options:
+        - label: Development
+        - label: Test
+        - label: Stage
+        - label: Production
+    validations:
+      required: true
+
+  - type: input
+    id: os
+    attributes:
+      label: OS version
+      description: What version of the OS are you using when encountering the bug?
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here. If applicable, add screenshots to help explain your problem.
diff --git a/.github/ISSUE_TEMPLATE/TECH_TASK.yml b/.github/ISSUE_TEMPLATE/TECH_TASK.yml
@@ -0,0 +1,61 @@
+name: Technical-Task
+description: A clear and comprehensive description of the technical task that needs to be implemented.
+title: "[Tech]: "
+labels: ["tech"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Let us guide you through the creation of the issue that will best set the tech task up for success :)
+
+  - type: textarea
+    id: tech-problem
+    attributes:
+      label: Problem statement
+      description: What needs to be solved or optimized in the current system ?
+      placeholder: We don't account for X when using functions Y so we need to implement a value check in each of them.
+    validations:
+      required: true
+
+  - type: textarea
+    id: tech-description
+    attributes:
+      label: Description
+      description: Can you provide a clear and concise description of the context in which the problem statement happens?
+      placeholder: |
+        - As part of the work on bridge X we realized that Y was not implemented in the best way
+        - ...
+
+  - type: textarea
+    id: tech-ac
+    attributes:
+      label: Acceptance Criteria
+      description: What are the expected behavior ?
+      placeholder: |
+        1. Given ... when ..., ... happens
+        2. Given ... when ..., ... happens
+    validations:
+      required: true
+
+  - type: textarea
+    id: tech-dod
+    attributes:
+      label: Definition of Done
+      description: When do we consider the task done ?
+      placeholder: |        
+        1. Unit tests
+        2. Migration tests
+        3. Integration tests
+        4. Acceptance criteria 
+    validations:
+      required: true
+
+  - type: textarea
+    id: tech-requirements
+    attributes:
+      label: Requirements
+      description: Are there any additional requirements that the tech task implementation should comply with?
+      placeholder: |
+        - Make sure we use a certain set of good practices
+        - Use a specific programming paradigm
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -12,8 +12,9 @@ def pipeline = new org.android.AppPipeline(steps: this,
     testCmd: 'ktlintCheck clean testDevelopDebugUnitTest koverVerifyDevelopDebug',
     publishType: 'Bundle',
     jobParams: jobParams,
-    appPushNoti: true,
+    statusNotif: true,
     gitUpdateSubmodule: true,
     dockerImage: 'build-tools/android-build-box:jdk17',
-    gpgFiles: ['app/google-services.json'])
+    gpgFiles: ['app/google-services.json'],
+    dojoProductType: 'sora-mobile')
 pipeline.runPipeline('sora')
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -19,8 +19,8 @@ kotlin {
     jvmToolchain(17)
 }
 
-// soralution 140 3.8.6.0 2024.10.21
-// sora dae 108 3.8.0.0 2023.12.04
+// soralution 141 3.8.6.1 2024.10.29
+// sora dae 118 3.8.5.3 2024.10.23
 
 android {
     namespace = "jp.co.soramitsu.sora"
@@ -30,8 +30,8 @@ android {
         applicationId = "jp.co.soramitsu.sora"
         minSdk = 26
         targetSdk = 34
-        versionCode = System.getenv("CI_BUILD_ID")?.toInt() ?: 140
-        versionName = "3.8.6.0"
+        versionCode = System.getenv("CI_BUILD_ID")?.toInt() ?: 141
+        versionName = "3.8.6.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true
         // resConfigs "en", "ru", "es", "fr", "de", "nb", "in", "tr", "ar"
@@ -172,7 +172,7 @@ play {
     serviceAccountCredentials = file(System.getenv("CI_PLAY_KEY") ?: "../key/fake.json")
     track = "internal"
     releaseStatus = ReleaseStatus.DRAFT
-    releaseName = "3.8.6.0 - SORA Card Improvements"
+    releaseName = "3.8.6.1 - SORA Card Improvements"
     defaultToAppBundles = true
 }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <queries>

diff --git a/common/src/production/assets/sora2_metadata b/common/src/production/assets/sora2_metadata
diff --git a/...ature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt b/...ature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt
@@ -209,7 +209,7 @@ internal fun AssetDetailsBalanceCard(
                         res = R.drawable.ic_buy_crypto,
                         text = stringResource(id = R.string.common_buy),
                         enabled = true,
-                        onClick = onBuyCryptoClick
+                        onClick = onBuyCryptoClick,
                     )
                 }
             }

diff --git a/.../soramitsu/feature_assets_impl/presentation/screens/assetdetails/AssetDetailsViewModel.kt b/.../soramitsu/feature_assets_impl/presentation/screens/assetdetails/AssetDetailsViewModel.kt
@@ -70,7 +70,9 @@ import jp.co.soramitsu.feature_blockexplorer_api.data.SoraConfigManager
 import jp.co.soramitsu.feature_blockexplorer_api.domain.TransactionHistoryHandler
 import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PoolsInteractor
 import jp.co.soramitsu.feature_polkaswap_api.launcher.PolkaswapRouter
+import jp.co.soramitsu.feature_sora_card_api.domain.SoraCardInteractor
 import jp.co.soramitsu.feature_sora_card_api.util.createSoraCardGateHubContract
+import jp.co.soramitsu.feature_sora_card_api.util.readyToStartGatehubOnboarding
 import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter
 import jp.co.soramitsu.oauth.base.sdk.contract.SoraCardContractData
 import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider
@@ -92,6 +94,7 @@ class AssetDetailsViewModel @AssistedInject constructor(
     private val resourceManager: ResourceManager,
     private val soraConfigManager: SoraConfigManager,
     private val coroutineManager: CoroutineManager,
+    private val soraCardInteractor: SoraCardInteractor,
 ) : BaseViewModel() {
 
     @AssistedFactory
@@ -157,7 +160,8 @@ class AssetDetailsViewModel @AssistedInject constructor(
                         tokenName = asset.token.name,
                         tokenIcon = asset.token.iconUri(),
                         tokenSymbol = asset.token.symbol,
-                        poolsCardTitle = resourceManager.getString(R.string.asset_details_your_pools).format(asset.token.symbol),
+                        poolsCardTitle = resourceManager.getString(R.string.asset_details_your_pools)
+                            .format(asset.token.symbol),
                         price = asset.token.formatFiatOrEmpty(
                             asset.token.fiatPrice,
                             numbersFormatter,
@@ -176,12 +180,19 @@ class AssetDetailsViewModel @AssistedInject constructor(
                             numbersFormatter,
                         ),
                         frozenBalance = if (assetId == SubstrateOptionsProvider.feeAssetId) {
-                            asset.token.printBalance(xorAssetBalance?.frozen ?: BigDecimal.ZERO, numbersFormatter, AssetHolder.ROUNDING)
+                            asset.token.printBalance(
+                                xorAssetBalance?.frozen ?: BigDecimal.ZERO,
+                                numbersFormatter,
+                                AssetHolder.ROUNDING
+                            )
                         } else {
                             null
                         },
                         frozenBalanceFiat = if (assetId == SubstrateOptionsProvider.feeAssetId) {
-                            asset.token.printFiat(xorAssetBalance?.frozen ?: BigDecimal.ZERO, numbersFormatter)
+                            asset.token.printFiat(
+                                xorAssetBalance?.frozen ?: BigDecimal.ZERO,
+                                numbersFormatter
+                            )
                         } else {
                             null
                         },
@@ -257,17 +268,41 @@ class AssetDetailsViewModel @AssistedInject constructor(
                     state = curState.copy(
                         state = curState.state.copy(
                             xorBalance = FrozenXorDetailsModel(
-                                token.printBalance(xorBalance.frozen, numbersFormatter, AssetHolder.ROUNDING),
+                                token.printBalance(
+                                    xorBalance.frozen,
+                                    numbersFormatter,
+                                    AssetHolder.ROUNDING,
+                                ),
                                 token.printFiat(xorBalance.frozen, numbersFormatter),
-                                token.printBalance(xorBalance.bonded, numbersFormatter, AssetHolder.ROUNDING),
+                                token.printBalance(
+                                    xorBalance.bonded,
+                                    numbersFormatter,
+                                    AssetHolder.ROUNDING,
+                                ),
                                 token.printFiat(xorBalance.bonded, numbersFormatter),
-                                token.printBalance(xorBalance.locked, numbersFormatter, AssetHolder.ROUNDING),
+                                token.printBalance(
+                                    xorBalance.locked,
+                                    numbersFormatter,
+                                    AssetHolder.ROUNDING,
+                                ),
                                 token.printFiat(xorBalance.locked, numbersFormatter),
-                                token.printBalance(xorBalance.reserved, numbersFormatter, AssetHolder.ROUNDING),
+                                token.printBalance(
+                                    xorBalance.reserved,
+                                    numbersFormatter,
+                                    AssetHolder.ROUNDING,
+                                ),
                                 token.printFiat(xorBalance.reserved, numbersFormatter),
-                                token.printBalance(xorBalance.redeemable, numbersFormatter, AssetHolder.ROUNDING),
+                                token.printBalance(
+                                    xorBalance.redeemable,
+                                    numbersFormatter,
+                                    AssetHolder.ROUNDING,
+                                ),
                                 token.printFiat(xorBalance.redeemable, numbersFormatter),
-                                token.printBalance(xorBalance.unbonding, numbersFormatter, AssetHolder.ROUNDING),
+                                token.printBalance(
+                                    xorBalance.unbonding,
+                                    numbersFormatter,
+                                    AssetHolder.ROUNDING,
+                                ),
                                 token.printFiat(xorBalance.unbonding, numbersFormatter),
                             )
                         )
@@ -284,6 +319,7 @@ class AssetDetailsViewModel @AssistedInject constructor(
     }
 
     fun onBuyCrypto() {
-        _launchSoraCardSignIn.value = createSoraCardGateHubContract()
+        if (soraCardInteractor.basicStatus.value.ibanInfo?.ibanStatus.readyToStartGatehubOnboarding())
+            _launchSoraCardSignIn.value = createSoraCardGateHubContract()
     }
 }
diff --git a/.../src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModel.kt b/.../src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModel.kt
@@ -50,6 +50,7 @@ import jp.co.soramitsu.feature_select_node_api.SelectNodeRouter
 import jp.co.soramitsu.feature_sora_card_api.domain.SoraCardInteractor
 import jp.co.soramitsu.feature_sora_card_api.util.createSoraCardContract
 import jp.co.soramitsu.feature_sora_card_api.util.createSoraCardGateHubContract
+import jp.co.soramitsu.feature_sora_card_api.util.readyToStartGatehubOnboarding
 import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter
 import jp.co.soramitsu.oauth.base.sdk.contract.IbanStatus
 import jp.co.soramitsu.oauth.base.sdk.contract.OutwardsScreen
@@ -200,7 +201,9 @@ class ProfileViewModel @Inject constructor(
     }
 
     fun showBuyCrypto() {
-        _launchSoraCardSignIn.value = createSoraCardGateHubContract()
+        if (soraCardInteractor.basicStatus.value.ibanInfo?.ibanStatus.readyToStartGatehubOnboarding()) {
+            _launchSoraCardSignIn.value = createSoraCardGateHubContract()
+        }
     }
 
     fun showSelectNode() {

diff --git a/.../test/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModelTest.kt b/.../test/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModelTest.kt
@@ -55,6 +55,8 @@ import jp.co.soramitsu.feature_select_node_api.SelectNodeRouter
 import jp.co.soramitsu.feature_sora_card_api.domain.SoraCardAvailabilityInfo
 import jp.co.soramitsu.feature_sora_card_api.domain.SoraCardInteractor
 import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter
+import jp.co.soramitsu.oauth.base.sdk.contract.IbanInfo
+import jp.co.soramitsu.oauth.base.sdk.contract.IbanStatus
 import jp.co.soramitsu.oauth.base.sdk.contract.SoraCardCommonVerification
 import jp.co.soramitsu.oauth.base.sdk.contract.SoraCardFlow
 import jp.co.soramitsu.test_data.SoraCardTestData.soraCardBasicStatusTest
@@ -195,6 +197,14 @@ class ProfileViewModelTest {
 
     @Test
     fun `call showBuyCrypto EXPECT navigate to buy crypto screen`() {
+        every { soraCardInteractor.basicStatus } returns
+            MutableStateFlow(
+                soraCardBasicStatusTest.copy(
+                    initialized = true,
+                    verification = SoraCardCommonVerification.Pending,
+                    ibanInfo = IbanInfo("", IbanStatus.ACTIVE, "", "")
+                )
+            )
         initViewModel()
         profileViewModel.showBuyCrypto()
         val launch = profileViewModel.launchSoraCardSignIn.getOrAwaitValue()

diff --git a/...p_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorImpl.kt b/...p_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorImpl.kt
@@ -399,7 +399,7 @@ class PoolsInteractorImpl(
             tokenTo.id,
             tokenTo.precision,
             enabled,
-            presented
+            presented,
         )
     }
 

diff --git a/...card_api/src/main/java/jp/co/soramitsu/feature_sora_card_api/util/SoraCardContractUtil.kt b/...card_api/src/main/java/jp/co/soramitsu/feature_sora_card_api/util/SoraCardContractUtil.kt
@@ -40,10 +40,15 @@ import jp.co.soramitsu.common.util.BuildUtils
 import jp.co.soramitsu.common.util.Flavor
 import jp.co.soramitsu.oauth.base.sdk.SoraCardEnvironmentType
 import jp.co.soramitsu.oauth.base.sdk.SoraCardKycCredentials
+import jp.co.soramitsu.oauth.base.sdk.contract.IbanStatus
 import jp.co.soramitsu.oauth.base.sdk.contract.SoraCardBasicContractData
 import jp.co.soramitsu.oauth.base.sdk.contract.SoraCardContractData
 import jp.co.soramitsu.oauth.base.sdk.contract.SoraCardFlow
 
+fun IbanStatus?.readyToStartGatehubOnboarding(): Boolean {
+    return (this != null) && (this == IbanStatus.ACTIVE)
+}
+
 fun createSoraCardBasicContract() = SoraCardBasicContractData(
     apiKey = BuildConfig.SORA_CARD_API_KEY,
     domain = BuildConfig.SORA_CARD_DOMAIN,

diff --git a/...a/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardDetailsViewModel.kt b/...a/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardDetailsViewModel.kt
@@ -46,6 +46,7 @@ import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel
 import jp.co.soramitsu.common.util.BuildUtils
 import jp.co.soramitsu.feature_sora_card_api.domain.SoraCardInteractor
 import jp.co.soramitsu.feature_sora_card_api.util.createSoraCardGateHubContract
+import jp.co.soramitsu.feature_sora_card_api.util.readyToStartGatehubOnboarding
 import jp.co.soramitsu.oauth.base.sdk.contract.IbanInfo
 import jp.co.soramitsu.oauth.base.sdk.contract.IbanStatus
 import jp.co.soramitsu.oauth.base.sdk.contract.SoraCardContractData
@@ -165,7 +166,9 @@ class SoraCardDetailsViewModel @Inject constructor(
     }
 
     fun onExchangeXorClick() {
-        _launchSoraCard.value = createSoraCardGateHubContract()
+        if (soraCardInteractor.basicStatus.value.ibanInfo?.ibanStatus.readyToStartGatehubOnboarding()) {
+            _launchSoraCard.value = createSoraCardGateHubContract()
+        }
     }
 
     fun onSettingsOptionClick(position: Int, context: Context?) {

diff --git a/feature_wallet_impl/src/main/AndroidManifest.xml b/feature_wallet_impl/src/main/AndroidManifest.xml
@@ -1 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+</manifest>