fix: repair various issues and eliminate crashes (#1393)

* chore: update to dashj 21.1.8 and dpp 1.7.5

* fix: use v3 explore database

* fix: allow for coinjoin mixed as inputs for assetlocks which require higher fees

* chore: update translations

* Revert "fix: use v3 explore database"

This reverts commit fac77cb.

* Revert "Revert "fix: use v3 explore database""

This reverts commit b52a1af.

* fix: correctly format the fiat value

* fix: prevent race condition that crashes the app

* fix: use the spendable balance

* fix: download explore-v3.db

* fix: add missing item from sort_by_options

* fix: fix edge case near username fee

* fix: catch time change exceptions

* fix: receive fragment limits

Author: HashEngineering

build.gradle

@@ -3,8 +3,8 @@ buildscript {
         kotlin_version = '2.1.0'
         coroutinesVersion = '1.6.4'
         ok_http_version = '4.9.1'
-        dashjVersion = '21.1.8-SNAPSHOT'
-        dppVersion = "1.7.5-OPT-SNAPSHOT"
+        dashjVersion = '21.1.8'
+        dppVersion = "1.7.5"
         hiltVersion = '2.53'
         hiltCompilerVersion = '1.2.0'
         hiltWorkVersion = '1.2.0'

fastlane/Fastfile

@@ -173,7 +173,7 @@ platform :android do
     project_id = "dash-wallet-firebase"
     key_file = "#{ENV['PWD']}/.deploy/gc-storage-service-account.json"
     bucket_name = "dash-wallet-firebase.appspot.com"
-    file_name = "explore/explore-v2.db"
+    file_name = "explore/explore-v3.db"
     if flavor == "prod" || flavor.nil?
       puts "Downloading the production database"
     else

features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt

@@ -126,7 +126,7 @@ class CTXSpendViewModel @Inject constructor(
 
             val response = repository.purchaseGiftCard(
                 merchantId = it,
-                fiatAmount = amountValue.toBigDecimal().toDouble().toString(),
+                fiatAmount = MonetaryFormat.FIAT.noCode().format(amountValue).toString(),
                 fiatCurrency = "USD",
                 cryptoCurrency = Constants.DASH_CURRENCY
             )

features/exploredash/src/main/res/values-ar/strings-explore-dash.xml

@@ -93,7 +93,6 @@
     <string name="explore_filtered_by">تمت تصفيتها بواسطة:</string>
     <string name="explore_pay_gift_card">ادفع ببطاقة الهدايا</string>
     <string name="explore_sort_by">ترتيب حسب</string>
-
     <string-array name="merchants_filter_options">
         <item>عبر الانترنت</item>
         <item>قريب</item>

features/exploredash/src/main/res/values-cs/strings-explore-dash.xml

@@ -85,7 +85,6 @@
     <string name="explore_filtered_by">Filtrováno:</string>
     <string name="explore_pay_gift_card">Platba dárkovým poukazem</string>
     <string name="explore_sort_by">Řadit podle</string>
-
     <string-array name="merchants_filter_options">
         <item>Online</item>
         <item>Nejbližší</item>

features/exploredash/src/main/res/values-de/strings-explore-dash.xml

@@ -86,7 +86,6 @@
     <string name="explore_filtered_by">Gefiltert nach:</string>
     <string name="explore_pay_gift_card">Mit Gutscheinkarte bezahlen</string>
     <string name="explore_sort_by">Sortieren nach</string>
-
     <string-array name="merchants_filter_options">
         <item>Online</item>
         <item>In der Nähe</item>
@@ -117,7 +116,7 @@
     <string-array name="sort_by_options_names">
         <item>Name</item>
         <item>Entfernung</item>
-        <item>Discount</item>
+        <item>Rabatt</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -202,7 +201,6 @@
     <string name="send_coins_error_msg">Problem beim Versenden der Dash!</string>
     <string name="gift_card_barcode_failed">Der Strichcode konnte nicht geladen werden.</string>
     <string name="gift_card_tx_title">Geschenkkarte · %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">Verifizierungscode eingeben</string>
     <string name="verification_check_email">Kontrolliere deine E-Mail und deinen Verifizierungscode</string>

features/exploredash/src/main/res/values-el/strings-explore-dash.xml

@@ -85,7 +85,6 @@
     <string name="explore_filtered_by">Φιλτράρεται από:</string>
     <string name="explore_pay_gift_card">Πληρώστε με δωροκάρτα</string>
     <string name="explore_sort_by">Ταξινόμηση κατά</string>
-
     <string-array name="merchants_filter_options">
         <item>Online</item>
         <item>Κοντινή τοποθεσία</item>
@@ -116,7 +115,7 @@
     <string-array name="sort_by_options_names">
         <item>Όνομα</item>
         <item>Απόσταση</item>
-        <item>Discount</item>
+        <item>Έκπτωση</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -201,7 +200,6 @@
     <string name="send_coins_error_msg">Πρόβλημα στην αποστολή νομισμάτων!</string>
     <string name="gift_card_barcode_failed">Απέτυχε η φόρτωση του barcode</string>
     <string name="gift_card_tx_title">Δωροκάρτα · %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">Πληκτρολογήστε τον κωδικό επαλήθευσης</string>
     <string name="verification_check_email">Ελέγξτε το email σας και πληκτρολογήστε τον κωδικό επαλήθευσης</string>

features/exploredash/src/main/res/values-es/strings-explore-dash.xml

@@ -63,6 +63,7 @@
     <string name="explore_back_to_nearest">Volver a la ubicación más cercana</string>
     <string name="explore_select_location">Seleccionar ubicación</string>
     <string name="explore_pay_with_dash">Pagar con Dash</string>
+    <string name="explore_pay_with_dash_save">Salvar %.2f%%</string>
     <string name="explore_buy_gift_card">Comprar una Tarjeta de regalo</string>
     <string name="explore_buy_dash">Comprar Dash</string>
     <string name="explore_sell_dash">Vender Dash</string>
@@ -87,7 +88,6 @@
     <string name="explore_filtered_by">Filtrado por:</string>
     <string name="explore_pay_gift_card">Pagar con tarjeta de regalo</string>
     <string name="explore_sort_by">Ordenar por</string>
-
     <string-array name="merchants_filter_options">
         <item>En línea</item>
         <item>Cercano</item>
@@ -118,7 +118,7 @@
     <string-array name="sort_by_options_names">
         <item>Nombre</item>
         <item>Distancia</item>
-        <item>Discount</item>
+        <item>Descuento</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -205,12 +205,13 @@
     <string name="send_coins_error_msg">¡Problema enviando monedas!</string>
     <string name="gift_card_barcode_failed">No se pudo cargar el código de barras</string>
     <string name="gift_card_tx_title">Tarjeta de regalo · %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">Ingresar código de verificación</string>
     <string name="verification_check_email">Revisa tu correo electrónico e ingresa el código de verificación</string>
     <string name="buy_gift_card">Compra una tarjeta de regalo con tu cuenta DashSpend</string>
+    <string name="dashspend_create_account">Crea una cuenta o inicia sesión en una cuenta existente</string>
     <string name="create_new_account">Crear una cuenta nueva</string>
+    <string name="login">Iniciar sesión</string>
     <string name="password">Contraseña</string>
     <string name="logged_in_as">Registrado como %s</string>
     <string name="log_out">Cerrar sesión</string>
@@ -225,9 +226,16 @@
     <string name="gift_card_unknown_error">Por alguna razón no pudimos comprar una tarjeta de regalo. Por favor contacta a soporte con el txid %s.</string>
     <string name="gift_card_rejected">El pago ha sido rechazado. Comunícate con CTX con la identificación de la tarjeta de regalo. %s y la identificación de pago %s y la identificación de transacción%s.</string>
     <string name="gift_card_redeem_url_not_supported">El pago se realizó para el comerciante que proporciona una URL de canje, pero eso no es compatible actualmente. Comunícate con CTX con la identificación de la tarjeta de regalo. %s y la identificación de pago %s e identificación de transacción%s.</string>
+    <string name="dashspend_terms_conditions">Aceptar términos y condiciones</string>
     <string name="accept_terms_conditions">Acepto los términos y condiciones de DashSpend</string>
     <string name="tap_link_to_proceed">Para crear una cuenta en DashSpend, debes tocar el enlace a continuación para continuar</string>
     <string name="accept_to_proceed">Para crear una cuenta en DashSpend debes aceptar los términos y condiciones de DashSpend.</string>
+    <string name="view_terms_conditions">Términos y condiciones</string>
+    <string name="barcode_placeholder">Tan pronto como tu código sea generado, será mostrado aqui.</string>
+
+    <!-- ctx spend login-->
+    <string name="create_ctx_spend_account">Crear cuenta</string>
+    <string name="log_in_to_ctxspend_account">Inicia sesión en tu cuenta</string>
     <string name="log_in_to_ctxspend_account_desc">Tu correo electrónico sólo se utiliza para enviar una contraseña de un solo uso.</string>
     <string name="buy_a_gift_card_with_your_ctx_spend_account">Compra una tarjeta de regalo con tu cuenta DashSpend</string>
     <string name="create_an_account_at_ctx_spend_or_log_in_to_the_existing_one">Crea una cuenta DashSpend o inicie sesión en la existente</string>

features/exploredash/src/main/res/values-fa/strings-explore-dash.xml

@@ -85,7 +85,6 @@
     <string name="explore_filtered_by">فیلتر بر اساس: </string>
     <string name="explore_pay_gift_card">پرداخت با کارت اعتباری</string>
     <string name="explore_sort_by">مرتب کردن بر اساس</string>
-
     <string-array name="merchants_filter_options">
         <item>آنلاین</item>
         <item>نزدیک‌ترین</item>
@@ -116,7 +115,7 @@
     <string-array name="sort_by_options_names">
         <item>نام</item>
         <item>فاصله</item>
-        <item>Discount</item>
+        <item>تخفیف</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -201,7 +200,6 @@
     <string name="send_coins_error_msg">مشکل در ارسال مبلغ مورد نظر!</string>
     <string name="gift_card_barcode_failed">بارکد بارگذاری نشد</string>
     <string name="gift_card_tx_title">کارت هدیه. %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">شماره تائید را وارد کنید</string>
     <string name="verification_check_email">ایمیل‌تان را چک کنید و کد تائید را وارد کنید</string>

features/exploredash/src/main/res/values-fil/strings-explore-dash.xml

@@ -85,7 +85,6 @@
     <string name="explore_filtered_by">Na-filter ni:</string>
     <string name="explore_pay_gift_card">Magbayad gamit ang gift card</string>
     <string name="explore_sort_by">Pag-uri-uriin ayon</string>
-
     <string-array name="merchants_filter_options">
         <item>Online</item>
         <item>Sa malapit</item>
@@ -116,7 +115,7 @@
     <string-array name="sort_by_options_names">
         <item>Pangalan</item>
         <item>Distansya</item>
-        <item>Discount</item>
+        <item>Diskwento</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -201,7 +200,6 @@
     <string name="send_coins_error_msg">Nagkaproblema sa pagpapadala ng barya!</string>
     <string name="gift_card_barcode_failed">Nabigong i-load ang barcode</string>
     <string name="gift_card_tx_title">Gift card · %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">Ilagay ang verification code</string>
     <string name="verification_check_email">Suriin ang iyong email at ilagay ang verification code</string>

features/exploredash/src/main/res/values-fr/strings-explore-dash.xml

@@ -88,7 +88,6 @@
     <string name="explore_filtered_by">Filtré par :</string>
     <string name="explore_pay_gift_card">Payer avec une carte-cadeau</string>
     <string name="explore_sort_by">Trier par</string>
-
     <string-array name="merchants_filter_options">
         <item>En ligne</item>
         <item>À proximité</item>
@@ -119,7 +118,7 @@
     <string-array name="sort_by_options_names">
         <item>Nom</item>
         <item>Distance</item>
-        <item>Discount</item>
+        <item>Réduction</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -206,7 +205,6 @@
     <string name="send_coins_error_msg">Problème durant l\'envoi  des fonds !</string>
     <string name="gift_card_barcode_failed">Erreur de lecture du code-barres</string>
     <string name="gift_card_tx_title">Carte-cadeau · %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">Entrez le code de vérification</string>
     <string name="verification_check_email">Consultez votre e-mail et entrez le code de vérification</string>

features/exploredash/src/main/res/values-id/strings-explore-dash.xml

@@ -83,7 +83,6 @@
     <string name="explore_filtered_by">Difilter oleh:</string>
     <string name="explore_pay_gift_card">Bayar dengan kartu hadiah</string>
     <string name="explore_sort_by">Urutkan dengan</string>
-
     <string-array name="merchants_filter_options">
         <item>Online</item>
         <item>Terdekat</item>
@@ -114,7 +113,7 @@
     <string-array name="sort_by_options_names">
         <item>Nama</item>
         <item>Jarak</item>
-        <item>Discount</item>
+        <item>Diskon</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -197,7 +196,6 @@
     <string name="send_coins_error_msg">Gagal mengirim koin!</string>
     <string name="gift_card_barcode_failed">Gagal memuat barcode</string>
     <string name="gift_card_tx_title">Kartu hadiah · %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">Masukkan Kode verifikasi</string>
     <string name="verification_check_email">Periksa email anda dan masukkan kode verifikasi</string>

features/exploredash/src/main/res/values-it/strings-explore-dash.xml

@@ -88,6 +88,9 @@
     <string name="explore_filtered_by">Filtra per:</string>
     <string name="explore_pay_gift_card">Paga con carta regalo</string>
     <string name="explore_sort_by">Ordina per</string>
+    <string name="gift_card_types">Tipologie di gift card</string>
+    <string name="flexible_amount_option">Importi flessibili</string>
+    <string name="fixed_denom_option">Importi denominati in maniera fissa</string>
 
     <string-array name="merchants_filter_options">
         <item>Online</item>
@@ -119,7 +122,7 @@
     <string-array name="sort_by_options_names">
         <item>Nome</item>
         <item>Distanza</item>
-        <item>Discount</item>
+        <item>Sconto</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -206,6 +209,8 @@
     <string name="send_coins_error_msg">Problemi durante l\'invio dei Dash!</string>
     <string name="gift_card_barcode_failed">Impossibile caricare il codice a barre</string>
     <string name="gift_card_tx_title">Carta regalo · %s</string>
+    <string name="select_amount">Seleziona l\'importo</string>
+    <string name="select_fixed_amount">Questo commerciante vende carte regalo a prezzi fissi</string>
 
     <!-- dash spend login-->
     <string name="enter_verification_code">Inserisci il codice di verifica</string>
@@ -241,4 +246,5 @@
     <string name="log_in_to_ctxspend_account_desc">La tua email viene utilizzata solo per inviare una password monouso.</string>
     <string name="buy_a_gift_card_with_your_ctx_spend_account">Acquista una carta regalo con il tuo account DashSpend</string>
     <string name="create_an_account_at_ctx_spend_or_log_in_to_the_existing_one">Crea un account DashSpend o accedi a quello esistente</string>
-    </resources>
+    <string name="temporarily_unavailable">Temporaneamente non disponibile</string>
+</resources>

features/exploredash/src/main/res/values-ja/strings-explore-dash.xml

@@ -83,7 +83,6 @@
     <string name="explore_filtered_by">でフィルターをかける</string>
     <string name="explore_pay_gift_card">ギフトカード支払い</string>
     <string name="explore_sort_by">で並び替え</string>
-
     <string-array name="merchants_filter_options">
         <item>オンライン</item>
         <item>周辺環境</item>
@@ -114,7 +113,7 @@
     <string-array name="sort_by_options_names">
         <item>名前</item>
         <item>距離</item>
-        <item>Discount</item>
+        <item>割引</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -197,7 +196,6 @@
     <string name="send_coins_error_msg">送金に問題が発生しました！</string>
     <string name="gift_card_barcode_failed">バーコードのロードに失敗しました</string>
     <string name="gift_card_tx_title">ギフトカード · %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">認証コードを入力</string>
     <string name="verification_check_email">メールを確認して認証コードを入力する</string>

features/exploredash/src/main/res/values-ko/strings-explore-dash.xml

@@ -83,7 +83,6 @@
     <string name="explore_filtered_by">다음으로 필터:</string>
     <string name="explore_pay_gift_card">기프트 카드로 지불</string>
     <string name="explore_sort_by">분류</string>
-
     <string-array name="merchants_filter_options">
         <item>온라인</item>
         <item>근처</item>
@@ -114,7 +113,7 @@
     <string-array name="sort_by_options_names">
         <item>이름</item>
         <item>거리</item>
-        <item>Discount</item>
+        <item>할인</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -197,7 +196,6 @@
     <string name="send_coins_error_msg">송금 중 알 수 없는 문제가 발생했습니다!</string>
     <string name="gift_card_barcode_failed">바코드 로딩 실패</string>
     <string name="gift_card_tx_title">기프트 카드 · %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">인증 코드 입력</string>
     <string name="verification_check_email">이메일을 확인하셔서 인증 코드를 입력하세요</string>

features/exploredash/src/main/res/values-nl/strings-explore-dash.xml

@@ -85,7 +85,6 @@
     <string name="explore_filtered_by">Gefilterd op:</string>
     <string name="explore_pay_gift_card">Betaal met geschenkbon</string>
     <string name="explore_sort_by">Sorteer op</string>
-
     <string-array name="merchants_filter_options">
         <item>Online</item>
         <item>Dichtbij</item>
@@ -116,7 +115,7 @@
     <string-array name="sort_by_options_names">
         <item>Naam</item>
         <item>Afstand</item>
-        <item>Discount</item>
+        <item>Korting</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -201,7 +200,6 @@
     <string name="send_coins_error_msg">Er is een probleem opgetreden bij het versturen van munten!</string>
     <string name="gift_card_barcode_failed">Kan de streepjescode niet laden</string>
     <string name="gift_card_tx_title">Cadeaukaart · %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">Voer verificatiecode in</string>
     <string name="verification_check_email">Controleer je e-mail en voer de verificatiecode in</string>

features/exploredash/src/main/res/values-pl/strings-explore-dash.xml

@@ -90,7 +90,6 @@
     <string name="explore_filtered_by">Od filtrowane pod względem:</string>
     <string name="explore_pay_gift_card">Płać za pomocą karty podarunkowej</string>
     <string name="explore_sort_by">Sortuj według</string>
-
     <string-array name="merchants_filter_options">
         <item>Online</item>
         <item>W pobliżu</item>
@@ -121,7 +120,7 @@
     <string-array name="sort_by_options_names">
         <item>Imię</item>
         <item>Dystans</item>
-        <item>Discount</item>
+        <item>Zniżka</item>
     </string-array>
 
     <plurals name="radius_miles">
@@ -210,7 +209,6 @@
     <string name="send_coins_error_msg">Problem z wysłaniem monet!</string>
     <string name="gift_card_barcode_failed">Nie udało się załadować kodu kreskowego</string>
     <string name="gift_card_tx_title">Karta podarunkowa · %s</string>
-
     <!-- dash spend login-->
     <string name="enter_verification_code">Wprowadź kod weryfikacyjny</string>
     <string name="verification_check_email">Sprawdź swoją pocztę e-mail i wprowadź kod weryfikacyjny</string>