Merge pull request #287 from sora-xor/dev_to_master

Dev to master
sora-xor · Nov 9, 2023 · 7e453b0 · 7e453b0
2 parents 52779b6 + a5845f3
commit 7e453b0
Show file tree

Hide file tree

Showing 64 changed files with 319 additions and 896 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -142,7 +142,7 @@ play {
     serviceAccountCredentials = file(System.env.CI_PLAY_KEY ?: "../key/fake.json")
     track = "internal"
     releaseStatus = ReleaseStatus.DRAFT
-    releaseName = "3.6.0.0 - Improvements on SORA Card Hub"
+    releaseName = "3.7.0.0 - Night Mode"
 }
 
 dependencies {
@@ -213,8 +213,6 @@ dependencies {
     implementation zXingCoreDep
     implementation zXingEmbeddedDep
 
-    implementation gsonDep
-
     // Tests
     testImplementation project(":test_shared")
 }

diff --git a/build.gradle b/build.gradle
@@ -5,13 +5,13 @@ buildscript {
             coroutines             : '1.7.3',
             dagger                 : '2.48',
             hiltWorkManager        : '1.0.0',
-            hiltCompose            : '1.0.0',
+            hiltCompose            : '1.1.0',
             timber                 : '5.0.1',
             gson                   : '2.10.1',
-            googleFirebaseBom      : '31.1.1',
-            googlePlayCore         : '1.10.3',
+            googleFirebaseBom      : '32.5.0',
             googleApiServicesDrive : 'v3-rev136-1.25.0',
-            googlePlayServiceAuth  : '20.5.0',
+            googlePlayServiceAuth  : '20.7.0',
+            googleInAppUpdate      : '2.1.0',
             constraint             : '2.2.0-alpha05',
             soraSdk                : '0.3.10',
             iroha                  : '5.1.2',
@@ -43,8 +43,8 @@ buildscript {
             compose                : '1.5.4',
             composeCompiler        : '1.5.3',
             composeConstraintLayout: '1.1.0-alpha05',
-            uiCore                 : '0.2.12',
-            soraCard               : '0.1.64',
+            uiCore                 : '0.2.13',
+            soraCard               : '0.1.67',
             lazySodium             : '5.0.2',
             jna                    : '5.8.0',
             xserializationjson     : '1.5.1',
@@ -55,11 +55,11 @@ buildscript {
     ]
 
     ext {
-//        soralution 117 3.7.0.1 2023.10.28
-//        sora dae 106 3.6.0.0 2023.10.28
+//        soralution 119 3.7.0.3 2023.11.08
+//        sora dae 107 3.7.0.0 2023.11.09
 //        appVersionCode = Integer.valueOf(System.env.BUILD_NUMBER ?: 96)
-        appVersionCode = Integer.valueOf(System.env.CI_BUILD_ID ?: 106)
-        appVersionName = '3.6.0.0'
+        appVersionCode = Integer.valueOf(System.env.CI_BUILD_ID ?: 107)
+        appVersionName = '3.7.0.0'
 
         compileVersion = 34
         minVersion = 24
@@ -75,7 +75,7 @@ buildscript {
         materialDep = "com.google.android.material:material:1.10.0"
         constraintDep = "androidx.constraintlayout:constraintlayout:$versions.constraint"
         activityKtxDep = "androidx.activity:activity-ktx:1.7.1"
-        fragmentKtxDep = "androidx.fragment:fragment-ktx:1.6.1"
+        fragmentKtxDep = "androidx.fragment:fragment-ktx:1.6.2"
         coreKtxDep = "androidx.core:core-ktx:1.12.0"
 
         workManagerDep = "androidx.work:work-runtime-ktx:$versions.workManager"
@@ -124,8 +124,9 @@ buildscript {
 
         gsonDep = "com.google.code.gson:gson:$versions.gson"
 
+        googleInAppUpdateDep = "com.google.android.play:app-update:$versions.googleInAppUpdate"
+        googleInAppUpdateKtxDep = "com.google.android.play:app-update-ktx:$versions.googleInAppUpdate"
         googleCrashlyticsDep = "com.google.firebase:firebase-crashlytics-ktx"
-        googlePlayCoreDep = "com.google.android.play:core:$versions.googlePlayCore"
         googleFirebaseBomDep = "com.google.firebase:firebase-bom:$versions.googleFirebaseBom"
         googlePlayServiceAuth = "com.google.android.gms:play-services-auth:$versions.googlePlayServiceAuth"
         googleApiServicesDrive = "com.google.apis:google-api-services-drive:$versions.googleApiServicesDrive"
@@ -135,7 +136,7 @@ buildscript {
 
         navigationFragmentDep = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
         navigationUiDep = "androidx.navigation:navigation-ui-ktx:$versions.navigation"
-        navigationComposeDep = "androidx.navigation:navigation-compose:2.7.4"
+        navigationComposeDep = "androidx.navigation:navigation-compose:2.7.5"
 
         zXingCoreDep = "com.google.zxing:core:$versions.zXing"
         zXingEmbeddedDep = "com.journeyapps:zxing-android-embedded:$versions.zXingEmbedded"
@@ -218,7 +219,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.kotlin:kotlin-serialization:${versions.kotlin}"
-        classpath 'com.android.tools.build:gradle:8.2.0-rc01'
+        classpath 'com.android.tools.build:gradle:8.2.0-rc02'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-appdistribution-gradle:3.2.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'

diff --git a/common/build.gradle b/common/build.gradle
@@ -115,6 +115,9 @@ dependencies {
     implementation project(":soracrypro")
     implementation project(":network")
 
+    implementation googleInAppUpdateDep
+    implementation googleInAppUpdateKtxDep
+
     implementation activityKtxDep
     implementation coreKtxDep
     implementation androidDep
@@ -129,7 +132,6 @@ dependencies {
 
     implementation kotlinxSerializationJsonDep
 
-    implementation googlePlayCoreDep
     implementation coilSvgDep
 
     implementation webSocketLibDep

diff --git a/...rc/main/java/jp/co/soramitsu/common/presentation/compose/components/AlertDialogContent.kt b/...rc/main/java/jp/co/soramitsu/common/presentation/compose/components/AlertDialogContent.kt
@@ -51,9 +51,9 @@ fun AlertDialogContent(openAlertDialog: MutableState<AlertDialogData>) {
         val message = openAlertDialog.value.message.message()
         if (title != null && message != null) {
             AlertDialog(
-                backgroundColor = MaterialTheme.customColors.bgPage,
-                title = { Text(text = title) },
-                text = { Text(text = message) },
+                backgroundColor = MaterialTheme.customColors.bgSurfaceVariant,
+                title = { Text(color = MaterialTheme.customColors.fgPrimary, text = title) },
+                text = { Text(color = MaterialTheme.customColors.fgPrimary, text = message) },
                 onDismissRequest = {
                     openAlertDialog.value = AlertDialogData()
                 },

diff --git a/...work/response/EthRegisterStateResponse.kt → ...n/compose/components/TextWithDelimiter.kt b/...work/response/EthRegisterStateResponse.kt → ...n/compose/components/TextWithDelimiter.kt
@@ -30,21 +30,46 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package jp.co.soramitsu.feature_ethereum_impl.data.network.response
-
-import com.google.gson.annotations.SerializedName
-import jp.co.soramitsu.sora.substrate.response.StatusDto
-
-data class EthRegisterStateResponse(
-    @SerializedName("status") val status: StatusDto,
-    @SerializedName("address") val address: String?,
-    @SerializedName("state") val state: State,
-    @SerializedName("reason") val reason: String?
-) {
-
-    enum class State {
-        INPROGRESS,
-        COMPLETED,
-        FAILED
+package jp.co.soramitsu.common.presentation.compose.components
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextOverflow
+
+@Composable
+fun TextWithDelimiter(text1: String, text2: String, delimiter: String, color: Color, style: TextStyle) {
+    Row {
+        Text(
+            modifier = Modifier
+                .wrapContentSize(),
+            text = text1,
+            style = style,
+            overflow = TextOverflow.Ellipsis,
+            color = color,
+            maxLines = 1,
+        )
+        Text(
+            modifier = Modifier
+                .wrapContentSize(),
+            text = delimiter,
+            style = style,
+            overflow = TextOverflow.Ellipsis,
+            color = color,
+            maxLines = 1,
+        )
+        Text(
+            modifier = Modifier
+                .wrapContentSize(),
+            text = text2,
+            style = style,
+            overflow = TextOverflow.Ellipsis,
+            color = color,
+            maxLines = 1,
+        )
     }
 }
diff --git a/common/src/main/res/values-az/strings.xml b/common/src/main/res/values-az/strings.xml
@@ -283,7 +283,7 @@
   <string name="invoice_scan_error_no_info">QR kodunu açmaq olmur</string>
   <string name="invoice_scan_error_user_not_found">QR-dən istifadəçi tapa bilinmir</string>
   <string name="launch_screen_loading_title">It\'s loading for a little longer this time</string>
-  <string name="liquid_assets">Liquid assets</string>
+  <string name="liquid_assets">Aktivlər</string>
   <string name="logout_dialog_body">Bu əməliyyat hesabın bu cihazdan silinməsi ilə nəticələnəcəkdir. Davam etmədən əvvəl parol keçidinizi yedəklədiyinizə əmin olun.</string>
   <string name="logout_remove_nodes_body">\n\nBütün fərdi qovşaqlarınız da silinəcək</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
@@ -283,7 +283,7 @@
   <string name="invoice_scan_error_no_info">QR-Code kann nicht entziffert werden</string>
   <string name="invoice_scan_error_user_not_found">Keinen Benutzer vom QR-Code gefunden</string>
   <string name="launch_screen_loading_title">It\'s loading for a little longer this time</string>
-  <string name="liquid_assets">Liquid assets</string>
+  <string name="liquid_assets">Assets</string>
   <string name="logout_dialog_body">Diese Aktion führt zum Löschen des Kontos von diesem Gerät. Stell sicher, dass du deine Passphrase sicher hinterlegt hast, bevor du fortfährst.</string>
   <string name="logout_remove_nodes_body">\n\nAll your custom nodes will be removed as well</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common/src/main/res/values-fa/strings.xml b/common/src/main/res/values-fa/strings.xml
@@ -283,7 +283,7 @@
   <string name="invoice_scan_error_no_info">کد QR قابل رمزگشایی نیست</string>
   <string name="invoice_scan_error_user_not_found">کاربری با QR پیدا نمی شود</string>
   <string name="launch_screen_loading_title">It\'s loading for a little longer this time</string>
-  <string name="liquid_assets">Liquid assets</string>
+  <string name="liquid_assets">Assets</string>
   <string name="logout_dialog_body">این عملکرد منجر به حذف حساب از این دستگاه می‌شود. قبل از ادامه مطمئن شوید که از کلمات بازیابی والت خود پشتیبان تهیه کرده اید.</string>
   <string name="logout_remove_nodes_body">\n\nAll your custom nodes will be removed as well</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common/src/main/res/values-fi/strings.xml b/common/src/main/res/values-fi/strings.xml
@@ -283,7 +283,7 @@
   <string name="invoice_scan_error_no_info">QR-koodia ei voi dekoodata</string>
   <string name="invoice_scan_error_user_not_found">Käyttäjää ei löydy QR:stä</string>
   <string name="launch_screen_loading_title">It\'s loading for a little longer this time</string>
-  <string name="liquid_assets">Liquid assets</string>
+  <string name="liquid_assets">Assets</string>
   <string name="logout_dialog_body">Tämä toiminto johtaa tilin poistamiseen tältä laitteelta. Varmista, että olet varmuuskopioinut salasanasi, ennen kuin jatkat.</string>
   <string name="logout_remove_nodes_body">\n\nAll your custom nodes will be removed as well</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common/src/main/res/values-in/strings.xml b/common/src/main/res/values-in/strings.xml
@@ -282,7 +282,7 @@
   <string name="invoice_scan_error_no_info">QR tidak dapat diterjemahkan</string>
   <string name="invoice_scan_error_user_not_found">Tidak dapat menemukan pengguna dari QR</string>
   <string name="launch_screen_loading_title">It\'s loading for a little longer this time</string>
-  <string name="liquid_assets">Liquid assets</string>
+  <string name="liquid_assets">Assets</string>
   <string name="logout_dialog_body">Tindakan ini akan mengakibatkan penghapusan akun dari perangkat ini. Pastikan Anda telah membuat cadangan frasa sandi Anda sebelum melanjutkan.</string>
   <string name="logout_remove_nodes_body">\n\nAll your custom nodes will be removed as well</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common/src/main/res/values-nb/strings.xml b/common/src/main/res/values-nb/strings.xml
@@ -283,7 +283,7 @@
   <string name="invoice_scan_error_no_info">QR kan ikke dekodes</string>
   <string name="invoice_scan_error_user_not_found">Finner ikke bruker fra QR</string>
   <string name="launch_screen_loading_title">It\'s loading for a little longer this time</string>
-  <string name="liquid_assets">Liquid assets</string>
+  <string name="liquid_assets">Assets</string>
   <string name="logout_dialog_body">Denne handlingen vil føre til at kontoen slettes fra denne enheten. Forsikre deg om at du har sikkerhetskopiert passordfrasen din før du fortsetter.</string>
   <string name="logout_remove_nodes_body">\n\nAll your custom nodes will be removed as well</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common/src/main/res/values-nl/strings.xml b/common/src/main/res/values-nl/strings.xml
@@ -283,7 +283,7 @@
   <string name="invoice_scan_error_no_info">QR kan niet worden gedecodeerd</string>
   <string name="invoice_scan_error_user_not_found">Kan geen gebruiker vinden via QR</string>
   <string name="launch_screen_loading_title">It\'s loading for a little longer this time</string>
-  <string name="liquid_assets">Liquid assets</string>
+  <string name="liquid_assets">Assets</string>
   <string name="logout_dialog_body">Deze actie zal resulteren in het verwijderen van een account van dit apparaat. Zorg ervoor dat u een back-up hebt gemaakt van uw passphrase voordat u verder gaat.</string>
   <string name="logout_remove_nodes_body">\n\nAlle aangepaste noden worden ook verwijderd</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
@@ -283,7 +283,7 @@
   <string name="invoice_scan_error_no_info">O código QR não pode ser descodificado</string>
   <string name="invoice_scan_error_user_not_found">Não foi encontrado um utilizador através do código QR</string>
   <string name="launch_screen_loading_title">It\'s loading for a little longer this time</string>
-  <string name="liquid_assets">Liquid assets</string>
+  <string name="liquid_assets">Assets</string>
   <string name="logout_dialog_body">Esta ação resultará na exclusão da sua conta deste dispositivo. Certifique-se de ter guardado a sua passphrase antes de continuar.</string>
   <string name="logout_remove_nodes_body">\n\nAll your custom nodes will be removed as well</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common/src/main/res/values-ru/strings.xml b/common/src/main/res/values-ru/strings.xml
@@ -34,7 +34,7 @@
   <string name="appearance_title">Внешний вид</string>
   <string name="ask_biometry_message">Хотите ли Вы использовать биометрию для входа в приложение?</string>
   <string name="asset_details_asset_id">Asset ID</string>
-  <string name="asset_details_liquid_balance">Liquid balance</string>
+  <string name="asset_details_liquid_balance">Ликвидный баланс</string>
   <string name="asset_details_recent_activity">Recent activity</string>
   <string name="asset_details_token_price">Token price</string>
   <string name="asset_details_your_pools">Your %s pools</string>
@@ -286,7 +286,7 @@
   <string name="invoice_scan_error_no_info">Не удается декодировать QR</string>
   <string name="invoice_scan_error_user_not_found">Не удается найти пользователя</string>
   <string name="launch_screen_loading_title">На этот раз загружается немного дольше</string>
-  <string name="liquid_assets">Ликвидные активы</string>
+  <string name="liquid_assets">Активы</string>
   <string name="logout_dialog_body">Это действие приведет к удалению учетной записи с этого устройства. Перед продолжением убедитесь, что вы создали резервную копию своей ключевой фразы.</string>
   <string name="logout_remove_nodes_body">\n\nВсе добавленные ноды также будут удалены</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
@@ -283,7 +283,7 @@
   <string name="invoice_scan_error_no_info">QR kodu çözülemiyor</string>
   <string name="invoice_scan_error_user_not_found">QR\'dan bir kullanıcı bulunamadı</string>
   <string name="launch_screen_loading_title">It\'s loading for a little longer this time</string>
-  <string name="liquid_assets">Liquid assets</string>
+  <string name="liquid_assets">Assets</string>
   <string name="logout_dialog_body">Bu işlem, hesabın bu cihazdan silinmesine neden olur. Devam etmeden önce Anımsatıcı Dizi\'nizi yedeklediğinizden emin olun.</string>
   <string name="logout_remove_nodes_body">\n\nAll your custom nodes will be removed as well</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -283,7 +283,7 @@
   <string name="invoice_scan_error_no_info">QR can\'t be decoded</string>
   <string name="invoice_scan_error_user_not_found">Can\'t find a user from QR</string>
   <string name="launch_screen_loading_title">It\'s loading for a little longer this time</string>
-  <string name="liquid_assets">Liquid assets</string>
+  <string name="liquid_assets">Assets</string>
   <string name="logout_dialog_body">This action will result in deleting account from this device. Make sure you have backed up your passphrase before proceeding.</string>
   <string name="logout_remove_nodes_body">\n\nAll your custom nodes will be removed as well</string>
   <string name="mnemonic_confirmation_select_word_2">from the list you have written down</string>

diff --git a/common_wallet/build.gradle b/common_wallet/build.gradle
@@ -73,7 +73,6 @@ dependencies {
 
     implementation uiCoreDep
 
-    implementation googlePlayCoreDep
     implementation coilSvgDep
 
     implementation webSocketLibDep
@@ -91,8 +90,6 @@ dependencies {
 
     implementation datastoreDep
 
-    implementation gsonDep
-
     implementation platform(googleFirebaseBomDep)
     implementation googleCrashlyticsDep
 

diff --git a/common_wallet/src/main/java/jp/co/soramitsu/common_wallet/data/AssetLocalToAssetMapper.kt b/common_wallet/src/main/java/jp/co/soramitsu/common_wallet/data/AssetLocalToAssetMapper.kt
@@ -70,9 +70,8 @@ class AssetLocalToAssetMapper @Inject constructor(
     }
 
     @Throws(IllegalArgumentException::class)
-    suspend fun map(asset: AssetTokenWithFiatLocal): Asset {
-        val assetLocal = asset.assetLocal
-        requireNotNull(assetLocal)
+    suspend fun map(asset: AssetTokenWithFiatLocal): Asset? {
+        val assetLocal = asset.assetLocal ?: return null
         return Asset(
             token = map(TokenWithFiatLocal(asset.token, asset.price)),
             balance = BalanceWrapper.mapLocalBalance(assetLocal),