Skip to content

Commit

Permalink
Merge pull request #1314 from dashpay/build-v10.3.2
Browse files Browse the repository at this point in the history
v10.3.2 changes
  • Loading branch information
HashEngineering authored Oct 14, 2024
2 parents 3bb0fbb + a6b8dfa commit a659621
Show file tree
Hide file tree
Showing 145 changed files with 2,037 additions and 374 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ service.properties
wallet/assets/explore/*.db
.deploy/*.json
*.keystore
.java-version # used by jenv for choosing java version at the command line
.bundle/config
3 changes: 2 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,12 @@ GEM
PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
x86_64-linux

DEPENDENCIES
fastlane (~> 2.216.0)
fastlane-plugin-firebase_app_distribution

BUNDLED WITH
2.4.20
2.4.22
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
kotlin_version = '1.9.23'
coroutinesVersion = '1.6.4'
ok_http_version = '4.9.1'
dashjVersion = '21.1.1-SNAPSHOT'
dashjVersion = '21.1.1'
hiltVersion = '2.51'
hiltCompilerVersion = '1.2.0'
hiltWorkVersion = '1.0.0'
Expand Down
6 changes: 3 additions & 3 deletions common/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<string name="transfer_dash">تحويل داش</string>
<string name="login_error_title">غير قادر على تسجيل الدخول إلى حسابك %s</string>
<string name="login_error_message">حدث خطأ أثناء تسجيل الدخول إلى حسابك %s.</string>
<string name="dash_address">عنوان داش</string>
<string name="balance">الرصيد:</string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">جيرنزي جنيه</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +55,11 @@
<string name="button_understand">أفهم</string>
<string name="button_okay">اوك</string>
<string name="button_share">مشاركة</string>
<string name="button_skip">تخطي</string>
<string name="share_address">شارك العنوان</string>
<string name="verify">تحقق</string>
<string name="receive_enter_amount_button">حدد المبلغ</string>
<string name="account_create">إنشاء حساب</string>

<!-- Design system UI elements -->
<string name="search_hint">بحث</string>
<string name="permission_allow">السماح</string>
Expand Down Expand Up @@ -101,4 +101,4 @@

<string name="chain_syncing">السلسلة قيد المزامنة ...</string>

</resources>
</resources>
2 changes: 1 addition & 1 deletion common/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
<string name="button_understand">Rozumím</string>
<string name="button_okay">Dobře</string>
<string name="button_share">Sdílet</string>
<string name="button_skip">Přeskočit</string>
<string name="verify">Ověřit</string>
<string name="receive_enter_amount_button">Uvést částku</string>
<string name="account_create">Vytvořit účet</string>

<!-- Design system UI elements -->
<string name="search_hint">Vyhledávání</string>
<string name="permission_allow">Povolit</string>
Expand Down
7 changes: 4 additions & 3 deletions common/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
<string name="transfer_dash">Dash übertragen</string>
<string name="login_error_title">Du kannst dich nicht in dein %s Konto einloggen.</string>
<string name="login_error_message">Beim Einloggen in dein %s Konto ist ein Fehler aufgetreten.</string>
<string name="dash_address">Dash Adresse</string>
<string name="username">Nutzername</string>
<string name="balance">Guthaben:</string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">Guernsey Pfund</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +56,11 @@
<string name="button_understand">Ich verstehe</string>
<string name="button_okay">OK</string>
<string name="button_share">Teilen</string>
<string name="button_skip">Überspringen</string>
<string name="share_address">Adresse teilen</string>
<string name="verify">Verifizieren</string>
<string name="receive_enter_amount_button">Betrag festsetzen</string>
<string name="account_create">Konto erstellen</string>

<!-- Design system UI elements -->
<string name="search_hint">Suchen</string>
<string name="permission_allow">Erlauben</string>
Expand Down Expand Up @@ -101,4 +102,4 @@

<string name="chain_syncing">Die Chain synchronisiert...</string>

</resources>
</resources>
7 changes: 4 additions & 3 deletions common/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
<string name="transfer_dash">Μεταφορά Dash</string>
<string name="login_error_title">Αδυναμία σύνδεσης στο λογαριασμό σας %s</string>
<string name="login_error_message">Προέκυψε σφάλμα κατά τη σύνδεση σας στο %s λογαριασμό</string>
<string name="dash_address">Διεύθυνση Dash</string>
<string name="username">Όνομα Χρήστη:</string>
<string name="balance">Υπόλοιπο:</string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">Γκέρνσεϊ Λίρα</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +56,11 @@
<string name="button_understand">Καταλαβαίνω</string>
<string name="button_okay">Εντάξει</string>
<string name="button_share">Μοιραστείτε</string>
<string name="button_skip">Παράλειψη</string>
<string name="share_address">Διαμοιρασμός διεύθυνσης</string>
<string name="verify">Επιβεβαίωση</string>
<string name="receive_enter_amount_button">Καθορίστε το ποσό</string>
<string name="account_create">Δημιουργία λογαριασμού</string>

<!-- Design system UI elements -->
<string name="search_hint">Αναζήτηση</string>
<string name="permission_allow">Επιτρέπετε</string>
Expand Down Expand Up @@ -101,4 +102,4 @@

<string name="chain_syncing">Το blockchain συγχρονίζεται...</string>

</resources>
</resources>
7 changes: 4 additions & 3 deletions common/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
<string name="transfer_dash">Transferir Dash</string>
<string name="login_error_title">No puedes iniciar sesión en tu %s cuenta</string>
<string name="login_error_message">Ocurrió un error al iniciar sesión en tu %s cuenta.</string>
<string name="dash_address">Dirección de Dash</string>
<string name="username">Nombre de usuario</string>
<string name="balance">Balance:</string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">Libra de Guernsey</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +56,11 @@
<string name="button_understand">Yo entiendo</string>
<string name="button_okay">¡Listo!</string>
<string name="button_share">Compartir</string>
<string name="button_skip">Salta</string>
<string name="share_address">Compartir Dirección </string>
<string name="verify">Verificar</string>
<string name="receive_enter_amount_button">Especificar Monto</string>
<string name="account_create">Crear una cuenta</string>

<!-- Design system UI elements -->
<string name="search_hint">Buscar</string>
<string name="permission_allow">Permitir</string>
Expand Down Expand Up @@ -101,4 +102,4 @@

<string name="chain_syncing">La cadena esta sincronizando...</string>

</resources>
</resources>
6 changes: 3 additions & 3 deletions common/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<string name="transfer_dash">انتقال دش</string>
<string name="login_error_title">ورود به حساب %s شما ناموفق بود</string>
<string name="login_error_message">در هنگام تلاش برای ورود به حساب %s شما، خطایی روی داد. </string>
<string name="dash_address">نشانی دش</string>
<string name="balance">موجودی: </string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">گرنزی پاوند</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +55,11 @@
<string name="button_understand">متوجه شدم</string>
<string name="button_okay">باشه</string>
<string name="button_share">به اشتراک گذاری</string>
<string name="button_skip">رد کردن</string>
<string name="share_address">به اشتراک‌گذاری نشانی</string>
<string name="verify">تائید</string>
<string name="receive_enter_amount_button">مبلغ را مشخص کنید</string>
<string name="account_create">ایجاد حساب</string>

<!-- Design system UI elements -->
<string name="search_hint">جستجو</string>
<string name="permission_allow">اجازه می‌دهم</string>
Expand Down Expand Up @@ -101,4 +101,4 @@

<string name="chain_syncing">بلاکچین در حال به‌روزرسانی...</string>

</resources>
</resources>
7 changes: 4 additions & 3 deletions common/src/main/res/values-fil/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
<string name="transfer_dash">Ilipat ang Dash</string>
<string name="login_error_title">Hindi makapag-log in sa iyong %s account</string>
<string name="login_error_message">May naganap na error habang nagla-log in sa iyong%s account.</string>
<string name="dash_address">Address ng Dash</string>
<string name="username">Username</string>
<string name="balance">Balanse:</string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">Guernsey Pound</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +56,11 @@
<string name="button_understand">Naiintindihan ko</string>
<string name="button_okay">Okay</string>
<string name="button_share">Ibahagi</string>
<string name="button_skip">Laktawan</string>
<string name="share_address">Ibahagi ang Address</string>
<string name="verify">Kumpirmahin</string>
<string name="receive_enter_amount_button">Tukuyin ang halaga</string>
<string name="account_create">Lumikha ng Account</string>

<!-- Design system UI elements -->
<string name="search_hint">Maghanap</string>
<string name="permission_allow">Payagan</string>
Expand Down Expand Up @@ -101,4 +102,4 @@

<string name="chain_syncing">Nagsi-sync ang chain…</string>

</resources>
</resources>
7 changes: 4 additions & 3 deletions common/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
<string name="transfer_dash">Transférer des dashs</string>
<string name="login_error_title">Impossible de se connecter à votre compte %s </string>
<string name="login_error_message">Une erreur est apparue lors de la connexion à votre compte %s.</string>
<string name="dash_address">Adresse Dash</string>
<string name="username">Nom d\'utilisateur</string>
<string name="balance">Solde :</string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">livre de Guernesey</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +56,11 @@
<string name="button_understand">Je comprends</string>
<string name="button_okay">OK</string>
<string name="button_share">Partager</string>
<string name="button_skip">Ignorer</string>
<string name="share_address">Partager adresse</string>
<string name="verify">Vérifier</string>
<string name="receive_enter_amount_button">Indiquez le montant</string>
<string name="account_create">Créer un compte</string>

<!-- Design system UI elements -->
<string name="search_hint">Chercher</string>
<string name="permission_allow">Autoriser</string>
Expand Down Expand Up @@ -101,4 +102,4 @@

<string name="chain_syncing">Synchronisation de la chaîne...</string>

</resources>
</resources>
7 changes: 4 additions & 3 deletions common/src/main/res/values-id/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
<string name="transfer_dash">Transfer Dash</string>
<string name="login_error_title">Tidak dapat masuk ke akun %s Anda</string>
<string name="login_error_message">Terjadi kesalahan saat masuk ke akun %s Anda.</string>
<string name="dash_address">Alamat Dash</string>
<string name="username">Nama pengguna</string>
<string name="balance">Saldo:</string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">Pound Guernsey</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +56,11 @@
<string name="button_understand">Saya Mengerti</string>
<string name="button_okay">Oke</string>
<string name="button_share">Berbagi</string>
<string name="button_skip">Lewati</string>
<string name="share_address">Bagikan Alamat</string>
<string name="verify">Memeriksa</string>
<string name="receive_enter_amount_button">Tentukan Jumlah</string>
<string name="account_create">Buat Akun</string>

<!-- Design system UI elements -->
<string name="search_hint">Cari</string>
<string name="permission_allow">Izinkan</string>
Expand Down Expand Up @@ -101,4 +102,4 @@

<string name="chain_syncing">Rantai sedang menyinkronkan…</string>

</resources>
</resources>
8 changes: 5 additions & 3 deletions common/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
<string name="transfer_dash">Trasferisci Dash</string>
<string name="login_error_title">Impossibile accedere al tuo %s account</string>
<string name="login_error_message">Si è verificato un errore durante l\'accesso al tuo %s account</string>
<string name="dash_address">Indirizzo Dash</string>
<string name="username">Carica la tua foto, personalizza la tua identità.
 </string>
<string name="balance">Saldo:</string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">Guernsey Pound</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +57,11 @@
<string name="button_understand">Ho capito</string>
<string name="button_okay">Bene</string>
<string name="button_share">Condividi</string>
<string name="button_skip">Salta</string>
<string name="share_address">Condividi indirizzo</string>
<string name="verify">Verifica</string>
<string name="receive_enter_amount_button">Specifica Importo</string>
<string name="account_create">Crea un Account</string>

<!-- Design system UI elements -->
<string name="search_hint">Cerca</string>
<string name="permission_allow">Permetti</string>
Expand Down Expand Up @@ -101,4 +103,4 @@

<string name="chain_syncing">La catena si sta sincronizzando...</string>

</resources>
</resources>
7 changes: 4 additions & 3 deletions common/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
<string name="transfer_dash">Dashを送金する</string>
<string name="login_error_title">お客様の%sアカウントにログインできません</string>
<string name="login_error_message">お客様の%sアカウントへのログイン中にエラーが発生しました。</string>
<string name="dash_address">Dashアドレス</string>
<string name="username">ユーザー名</string>
<string name="balance">残高:</string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">ガーンジー・ポンド</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +56,11 @@
<string name="button_understand">どれでも有効</string>
<string name="button_okay">OK</string>
<string name="button_share">共有</string>
<string name="button_skip">スキップする</string>
<string name="share_address">アドレスを共有する</string>
<string name="verify">検証する</string>
<string name="receive_enter_amount_button">金額を指定する</string>
<string name="account_create">アカウントの作成</string>

<!-- Design system UI elements -->
<string name="search_hint">検索</string>
<string name="permission_allow">許可する</string>
Expand Down Expand Up @@ -101,4 +102,4 @@

<string name="chain_syncing">チェーンを同期中</string>

</resources>
</resources>
7 changes: 4 additions & 3 deletions common/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
<string name="transfer_dash">대시 송금하기</string>
<string name="login_error_title">%s 계정에 로그인할 수 없습니다</string>
<string name="login_error_message">%s 계정에 로그인하는 동안 오류가 발생하였습니다.</string>
<string name="dash_address">대시 주소</string>
<string name="username">사용자 이름</string>
<string name="balance">잔고:</string>

<!-- Local Currency List: GGP -->
<string name="currency_GGP">건지섬 파운드</string>
<!-- Local Currency List: JEP -->
Expand Down Expand Up @@ -55,11 +56,11 @@
<string name="button_understand">이해합니다</string>
<string name="button_okay">알겠습니다</string>
<string name="button_share">공유</string>
<string name="button_skip">건너뛰기</string>
<string name="share_address">주소 공유하기</string>
<string name="verify">인증하기</string>
<string name="receive_enter_amount_button">금액 특정하기</string>
<string name="account_create">계정 생성하기</string>

<!-- Design system UI elements -->
<string name="search_hint">검색</string>
<string name="permission_allow">허용</string>
Expand Down Expand Up @@ -101,4 +102,4 @@

<string name="chain_syncing">체인 동기화 중...</string>

</resources>
</resources>
Loading

0 comments on commit a659621

Please sign in to comment.