dashpay · HashEngineering · Jun 13, 2023 · Jun 8, 2023 · Jun 8, 2023 · Jun 8, 2023
diff --git a/.editorconfig b/.editorconfig
@@ -5,7 +5,7 @@ ij_kotlin_allow_trailing_comma_on_call_site = false
 ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
 max_line_length = 120
 ktlint_standard_no-wildcard-imports = disabled
-ktlint_disabled_rules = no-wildcard-imports
+ktlint_disabled_rules = no-wildcard-imports, spacing-between-declarations-with-annotations
 ktlint_standard_package-name = disabled
 ktlint_standard_spacing-between-declarations-with-annotations = disabled
 ktlint_standard_colon-spacing = disabled
diff --git a/.github/workflows/dashwallet.yml b/.github/workflows/dashwallet.yml
@@ -84,6 +84,12 @@ jobs:
         APP_DISTRIBUTION_KEY_JSON: ${{secrets.APP_DISTRIBUTION_KEY_JSON}}
         GC_STORAGE_SERVICE_ACCOUNT_KEY_JSON: ${{secrets.GC_STORAGE_SERVICE_ACCOUNT_KEY_JSON}}
 
+    - name: Extract Secrets
+      run: |
+        echo "$GOOGLE_SERVICES_JSON" > wallet/google-services.json
+      env:
+        GOOGLE_SERVICES_JSON : ${{secrets.GOOGLE_SERVICES_JSON}}
+
     - name: Copy explore.db from GC Storage
       run: |
         gem install google-cloud-storage

diff --git a/.github/workflows/manual_distribution.yml b/.github/workflows/manual_distribution.yml
@@ -116,6 +116,12 @@ jobs:
         APP_DISTRIBUTION_KEY_JSON: ${{secrets.APP_DISTRIBUTION_KEY_JSON}}
         GC_STORAGE_SERVICE_ACCOUNT_KEY_JSON: ${{secrets.GC_STORAGE_SERVICE_ACCOUNT_KEY_JSON}}
 
+    - name: Extract Secrets
+      run: |
+        echo "$GOOGLE_SERVICES_JSON" > wallet/google-services.json
+      env:
+        GOOGLE_SERVICES_JSON : ${{secrets.GOOGLE_SERVICES_JSON}}
+
     - name: Copy explore.db from GC Storage
       run: |
         gem install google-cloud-storage

diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         kotlin_version = '1.7.10'
         coroutinesVersion = '1.6.4'
         ok_http_version = '4.9.1'
-        dashjVersion = '0.18.4-SNAPSHOT'
+        dashjVersion = '19.1-CJ-SNAPSHOT'
         hiltVersion = '2.40.1'
         hiltWorkVersion = '1.0.0'
         workRuntimeVersion='2.7.1'

diff --git a/common/src/main/java/org/dash/wallet/common/WalletDataProvider.kt b/common/src/main/java/org/dash/wallet/common/WalletDataProvider.kt
@@ -21,6 +21,8 @@ import kotlinx.coroutines.flow.Flow
 import org.bitcoinj.core.*
 import org.bitcoinj.wallet.CoinSelector
 import org.bitcoinj.wallet.Wallet
+import org.bitcoinj.wallet.WalletExtension
+import org.bitcoinj.wallet.authentication.AuthenticationKeyUsage
 import org.dash.wallet.common.services.LeftoverBalanceException
 import org.dash.wallet.common.transactions.TransactionWrapper
 import org.dash.wallet.common.transactions.filters.TransactionFilter
@@ -50,6 +52,8 @@ interface WalletDataProvider {
     // Treat @withConfidence with care - it may produce a lot of events and affect performance.
     fun observeTransactions(withConfidence: Boolean = false, vararg filters: TransactionFilter): Flow<Transaction>
 
+    fun observeAuthenticationKeyUsage(): Flow<List<AuthenticationKeyUsage>>
+
     fun getTransaction(hash: Sha256Hash): Transaction?
 
     fun getTransactions(vararg filters: TransactionFilter): Collection<Transaction>
@@ -66,4 +70,6 @@ interface WalletDataProvider {
     fun checkSendingConditions(address: Address?, amount: Coin)
 
     fun observeMostRecentTransaction(): Flow<Transaction>
+
+    fun getWalletExtensions(): Array<WalletExtension>
 }
diff --git a/common/src/main/res/values-cs/strings.xml b/common/src/main/res/values-cs/strings.xml
@@ -12,7 +12,7 @@
     <string name="copied">Zkopírováno</string>
     <string name="staking_title">Úročení</string>
     <string name="error">Chyba</string>
-
+    <string name="request_coins_share_dialog_title">Sdílet požadavek na Dash…</string>
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Guernseyská libra</string>
     <!-- Local Currency List: JEP -->
@@ -44,14 +44,17 @@
     <string name="button_okay">Dobře</string>
     <string name="button_share">Sdílet</string>
     <string name="verify">Ověřit</string>
+    <string name="receive_enter_amount_button">Uvést částku</string>
 
     <!-- Design system UI elements -->
     <string name="search_hint">Vyhledávání</string>
     <string name="permission_allow">Povolit</string>
     <string name="permission_deny">Odmítnout</string>
     <string name="max">Max</string>
+    <string name="dash">Dash</string>
     <string name="select_currency">Vybrat měnu</string>
     <string name="send_coins_error_dusty_send">Částka je příliš nízká pro odeslání</string>
     <string name="send_coins_error_insufficient_money">Nedostatečný zůstatek</string>
 
-    </resources>
+    <string name="syncing">Synchronizace</string>
+</resources>
diff --git a/common/src/main/res/values-uk/strings.xml b/common/src/main/res/values-uk/strings.xml
@@ -16,7 +16,11 @@
     <string name="error">Помилка</string>
     <string name="select_a_coin">Виберіть монету</string>
     <string name="request_coins_share_dialog_title">Поділитись запитом Dash-монет…</string>
+    <string name="buy_with_fiat">Купити Dash за фіат</string>
+    <string name="buy_and_convert">Купуйте та конвертуйте Dash за допомогою іншої криптовалюти</string>
     <string name="transfer_dash">Переказати Dash</string>
+    <string name="login_error_title">Навдалося ввійти в ваш %s акаунт</string>
+    <string name="login_error_message">Сталася помилка під час входу до вашого %s акаунту.</string>
     <string name="balance">Баланс:</string>
 
     <!-- Local Currency List: GGP -->
@@ -51,6 +55,7 @@
     <string name="button_understand">Я розумію</string>
     <string name="button_okay">Згода</string>
     <string name="button_share">Поділитися</string>
+    <string name="share_address">Поділитися адресою</string>
     <string name="verify">Підтвердити</string>
     <string name="receive_enter_amount_button">Вкажіть суму</string>
 

diff --git a/...a/org/dash/wallet/features/exploredash/network/service/stubs/FakeDashDirectSendService.kt b/...a/org/dash/wallet/features/exploredash/network/service/stubs/FakeDashDirectSendService.kt
@@ -29,7 +29,7 @@ import javax.inject.Inject
 class FakeDashDirectSendService @Inject constructor(
     private val realService: SendPaymentService,
     private val walletDataProvider: WalletDataProvider
-): SendPaymentService {
+) : SendPaymentService {
     internal companion object {
         const val DASH_DIRECT_SCHEMA = "dashdirect://"
     }

diff --git a/features/exploredash/src/main/res/values-ar/strings-explore-dash.xml b/features/exploredash/src/main/res/values-ar/strings-explore-dash.xml
@@ -162,7 +162,6 @@
     <string name="buy_gift_card_text">شراء بطاقات الهدايا مع داش الخاص بك</string>
     <string name="buy_gift_card_desc_text">اشترِ بطاقات هدايا مع داش الخاص بك بالمبلغ المحدد لعملية الشراء.</string>
     <string name="learn_more_text">اعرف المزيد</string>
-    <string name="continue_text">استمر</string>
     <string name="buy_card_header_text">كيفية استخدام بطاقة الهدايا</string>
     <string name="buy_card_desc_text">لا تقبل جميع المتاجر داش مباشرةً ، ولكن يمكنك شراء بطاقة هدايا باستخدام داش.</string>
     <string name="find_merchant_text">ابحث عن تاجر.</string>

diff --git a/features/exploredash/src/main/res/values-cs/strings-explore-dash.xml b/features/exploredash/src/main/res/values-cs/strings-explore-dash.xml
@@ -152,7 +152,6 @@
     <string name="buy_gift_card_text">Nákup dárkových poukazů za Dash</string>
     <string name="buy_gift_card_desc_text">Kupte si dárkové poukazy za Dash za přesnou částku vašeho nákupu.</string>
     <string name="learn_more_text">Více informací</string>
-    <string name="continue_text">Pokračovat</string>
     <string name="buy_card_header_text">Jak použít dárkový poukaz</string>
     <string name="buy_card_desc_text">Ne všechny obchody přijímají přímo DASH, můžete si ale za Dash koupit dárkový poukaz.</string>
     <string name="find_merchant_text">Najít obchodníka.</string>

diff --git a/features/exploredash/src/main/res/values-de/strings-explore-dash.xml b/features/exploredash/src/main/res/values-de/strings-explore-dash.xml
@@ -146,7 +146,6 @@
     <string name="buy_gift_card_text">Kaufe Gutscheinkarten mit Dash</string>
     <string name="buy_gift_card_desc_text">Kaufe mit deinen Dash Geschenkkarten in Höhe des genauen Betrags deines Einkaufs.</string>
     <string name="learn_more_text">Mehr erfahren</string>
-    <string name="continue_text">Fortfahren</string>
     <string name="buy_card_header_text">Wie man eine Gutscheinkarte verwendet</string>
     <string name="buy_card_desc_text">Nicht alle Geschäfte akzeptieren DASH direkt, aber du kannst mit deinen Dash auch einen Gutschein kaufen.</string>
     <string name="find_merchant_text">Finde einen Händler.</string>

diff --git a/features/exploredash/src/main/res/values-el/strings-explore-dash.xml b/features/exploredash/src/main/res/values-el/strings-explore-dash.xml
@@ -146,7 +146,6 @@
     <string name="buy_gift_card_text">Αγοράστε δωροκάρτες με το Dash σας</string>
     <string name="buy_gift_card_desc_text">Αγοράστε δωροκάρτες με το Dash σας για το ακριβές ποσό της αγοράς σας.</string>
     <string name="learn_more_text">Μάθετε περισσότερα</string>
-    <string name="continue_text">Συνέχεια</string>
     <string name="buy_card_header_text">Πώς να χρησιμοποιήσετε μια δωροκάρτα</string>
     <string name="buy_card_desc_text">Δεν δέχονται όλα τα καταστήματα το DASH απευθείας, αλλά μπορείτε να αγοράσετε μια δωροκάρτα με το Dash σας.</string>
     <string name="find_merchant_text">Βρείτε έναν έμπορο.</string>

diff --git a/features/exploredash/src/main/res/values-es/strings-explore-dash.xml b/features/exploredash/src/main/res/values-es/strings-explore-dash.xml
@@ -150,7 +150,6 @@
     <string name="buy_gift_card_text">Compra tarjetas de regalo con tus Dash</string>
     <string name="buy_gift_card_desc_text">Compra tarjetas de regalo con tus Dash por el monto exacto de tu compra.</string>
     <string name="learn_more_text">Aprende más</string>
-    <string name="continue_text">Continuar</string>
     <string name="buy_card_header_text">Como usar una tarjeta de regalo</string>
     <string name="buy_card_desc_text">No todas las tiendas aceptan DASH directamente, pero puedes comprar una tarjeta de regalo con tus Dash.</string>
     <string name="find_merchant_text">Encontrar un comercio.</string>

diff --git a/features/exploredash/src/main/res/values-fa/strings-explore-dash.xml b/features/exploredash/src/main/res/values-fa/strings-explore-dash.xml
@@ -146,7 +146,6 @@
     <string name="buy_gift_card_text">خرید کارت هدیه با دش</string>
     <string name="buy_gift_card_desc_text">با دش‌تان کارت هدیه دقیقا به اندازه خریدتان بخرید</string>
     <string name="learn_more_text">اطلاعات بیشتر</string>
-    <string name="continue_text">ادامه</string>
     <string name="buy_card_header_text">چطور از کارت هدیه استفاده کنیم</string>
     <string name="buy_card_desc_text">این طور نیست که همه این فروشندگان، دش را به صورت مستقیم بپذیرند. اما می‌توانید با دش اقدام به خرید کارت هدیه کنید.</string>
     <string name="find_merchant_text">یک فروشنده بیابید. </string>

diff --git a/features/exploredash/src/main/res/values-fil/strings-explore-dash.xml b/features/exploredash/src/main/res/values-fil/strings-explore-dash.xml
@@ -146,7 +146,6 @@
     <string name="buy_gift_card_text">Bumili ng mga gift card gamit ang iyong Dash</string>
     <string name="buy_gift_card_desc_text">Bumili ng mga gift card gamit ang iyong Dash para sa eksaktong halaga ng iyong binili.</string>
     <string name="learn_more_text">Matuto pa</string>
-    <string name="continue_text">Ipagpatuloy</string>
     <string name="buy_card_header_text">Paano Gumamit ng Gift Card</string>
     <string name="buy_card_desc_text">Hindi lahat ng tindahan ay direktang tumatanggap ng DASH, ngunit maaari kang bumili ng gift card gamit ang iyong Dash.</string>
     <string name="find_merchant_text">Maghanap ng merchant.</string>

diff --git a/features/exploredash/src/main/res/values-fr/strings-explore-dash.xml b/features/exploredash/src/main/res/values-fr/strings-explore-dash.xml
@@ -150,7 +150,6 @@
     <string name="buy_gift_card_text">Achetez des cartes-cadeau avec vos dashs</string>
     <string name="buy_gift_card_desc_text">Achetez des cartes-cadeau avec vos dashs pour le montant exact de vos achats.</string>
     <string name="learn_more_text">En savoir plus</string>
-    <string name="continue_text">Continuer</string>
     <string name="buy_card_header_text">Comment utiliser une carte-cadeau</string>
     <string name="buy_card_desc_text">Tous les magasins n\'acceptent pas Dash directement, mais vous pouvez acheter une carte-cadeau avec vos dashs.</string>
     <string name="find_merchant_text">Trouvez un vendeur.</string>

diff --git a/features/exploredash/src/main/res/values-id/strings-explore-dash.xml b/features/exploredash/src/main/res/values-id/strings-explore-dash.xml
@@ -142,7 +142,6 @@
     <string name="buy_gift_card_text">Beli kartu hadiah dengan Dash Anda</string>
     <string name="buy_gift_card_desc_text">Beli kartu hadiah dengan Dash untuk jumlah yang tepat dari pembelian Anda.</string>
     <string name="learn_more_text">Pelajari lebih lanjut</string>
-    <string name="continue_text">Teruskan</string>
     <string name="buy_card_header_text">Cara Menggunakan Kartu Hadiah</string>
     <string name="buy_card_desc_text">Tidak semua toko menerima DASH secara langsung, tetapi Anda dapat membeli kartu hadiah dengan Dash.</string>
     <string name="find_merchant_text">Cari pedagang.</string>

diff --git a/features/exploredash/src/main/res/values-it/strings-explore-dash.xml b/features/exploredash/src/main/res/values-it/strings-explore-dash.xml
@@ -150,7 +150,6 @@
     <string name="buy_gift_card_text">Acquista carte regalo con Dash</string>
     <string name="buy_gift_card_desc_text">Acquista carte regalo con i tuoi Dash per l\'importo esatto del tuo acquisto.</string>
     <string name="learn_more_text">Per saperne di più</string>
-    <string name="continue_text">Continua</string>
     <string name="buy_card_header_text">Come utilizzare una carta regalo</string>
     <string name="buy_card_desc_text">Non tutti i negozi accettano direttamente DASH, ma puoi acquistare una carta regalo con Dash.</string>
     <string name="find_merchant_text">Cerca un commerciante.</string>

diff --git a/features/exploredash/src/main/res/values-ja/strings-explore-dash.xml b/features/exploredash/src/main/res/values-ja/strings-explore-dash.xml
@@ -142,7 +142,6 @@
     <string name="buy_gift_card_text">Dashでギフトカードを購入</string>
     <string name="buy_gift_card_desc_text">Dashでギフトカードを購入し、購入金額と同額を支払います。</string>
     <string name="learn_more_text">詳細はこちら</string>
-    <string name="continue_text">続ける</string>
     <string name="buy_card_header_text">ギフトカードの使用方法</string>
     <string name="buy_card_desc_text">全ての店舗でDASHが直接使えるとは限りませんが、Dashでギフトカードが購入できます。</string>
     <string name="find_merchant_text">加盟店を探す。</string>

diff --git a/features/exploredash/src/main/res/values-ko/strings-explore-dash.xml b/features/exploredash/src/main/res/values-ko/strings-explore-dash.xml
@@ -142,7 +142,6 @@
     <string name="buy_gift_card_text">대시로 기프트 카드 구매</string>
     <string name="buy_gift_card_desc_text">정확히 당신의 구매 금액만큼 기프트 카드를 구매하세요.</string>
     <string name="learn_more_text">더 알아보기</string>
-    <string name="continue_text">계속</string>
     <string name="buy_card_header_text">기프트 카드 사용 방법</string>
     <string name="buy_card_desc_text">모든 상점에서 직접 대시를 받는 것은 아니지만, 대시를 통해 기프트 카드를 구매할 수 있습니다.</string>
     <string name="find_merchant_text">상점을 찾습니다.</string>

diff --git a/features/exploredash/src/main/res/values-nl/strings-explore-dash.xml b/features/exploredash/src/main/res/values-nl/strings-explore-dash.xml
@@ -146,7 +146,6 @@
     <string name="buy_gift_card_text">Koop geschenkbonnen met je Dash</string>
     <string name="buy_gift_card_desc_text">Koop geschenkbonnen met je Dash voor het exacte bedrag van je aankoop.</string>
     <string name="learn_more_text">Lees verder</string>
-    <string name="continue_text">Doorgaan</string>
     <string name="buy_card_header_text">Hoe een geschenkbon te gebruiken</string>
     <string name="buy_card_desc_text">Niet alle winkels accepteren direct DASH, maar je kan een geschenkbon kopen met je Dash.</string>
     <string name="find_merchant_text">Vind een acceptant</string>

diff --git a/features/exploredash/src/main/res/values-pl/strings-explore-dash.xml b/features/exploredash/src/main/res/values-pl/strings-explore-dash.xml
@@ -154,7 +154,6 @@
     <string name="buy_gift_card_text">Kup karty podarunkowe za pomocą Dash</string>
     <string name="buy_gift_card_desc_text">Kup karty podarunkowe na dokładną kwotę twojego zakupu</string>
     <string name="learn_more_text">Dowiedz się więcej</string>
-    <string name="continue_text">Dalej</string>
     <string name="buy_card_header_text">Jak Używać Kart Podarunkowych</string>
     <string name="buy_card_desc_text">Nie wszystkie sklepy akceptują Dash bezpośrednio, ale zawsze możesz użyć Dash aby kupić kartę podarunkową.</string>
     <string name="find_merchant_text">Znajdź sprzedawcę</string>

diff --git a/features/exploredash/src/main/res/values-pt/strings-explore-dash.xml b/features/exploredash/src/main/res/values-pt/strings-explore-dash.xml
@@ -150,7 +150,6 @@
     <string name="buy_gift_card_text">Compre cartões presente com seu Dash</string>
     <string name="buy_gift_card_desc_text">Compre cartões presente com seu Dash pelo valor exato de sua compra.</string>
     <string name="learn_more_text">Saiba mais</string>
-    <string name="continue_text">Continuar</string>
     <string name="buy_card_header_text">Como Usar um Cartão Presente</string>
     <string name="buy_card_desc_text">Nem todas as lojas aceitam DASH diretamente, mas você pode comprar um cartão presente com seu Dash.</string>
     <string name="find_merchant_text">Encontre um comércio</string>

diff --git a/features/exploredash/src/main/res/values-ru/strings-explore-dash.xml b/features/exploredash/src/main/res/values-ru/strings-explore-dash.xml
@@ -154,7 +154,6 @@
     <string name="buy_gift_card_text">Покупайте подарочные карты с помощью Dash</string>
     <string name="buy_gift_card_desc_text">Купите подарочные карты на точную сумму вашей покупки используя Dash.</string>
     <string name="learn_more_text">Узнать больше</string>
-    <string name="continue_text">Продолжить</string>
     <string name="buy_card_header_text">Как использовать подарочную карту</string>
     <string name="buy_card_desc_text">Не все магазины принимают DASH напрямую, но вы можете купить подарочную карту с помощью Dash.</string>
     <string name="find_merchant_text">Найдите продавца.</string>

diff --git a/features/exploredash/src/main/res/values-sk/strings-explore-dash.xml b/features/exploredash/src/main/res/values-sk/strings-explore-dash.xml
@@ -154,7 +154,6 @@
     <string name="buy_gift_card_text">Kúpte si darčekové poukážky s Dashom</string>
     <string name="buy_gift_card_desc_text">Kúpte si darčekové karty s Dashom za presnú sumu vášho nákupu.</string>
     <string name="learn_more_text">Ďalšie informácie</string>
-    <string name="continue_text">Pokračovať</string>
     <string name="buy_card_header_text">Ako používať darčekovú poukážku</string>
     <string name="buy_card_desc_text">Nie všetky obchody akceptujú priamo DASH, ale môžete si kúpiť darčekovú kartu s Dashom.</string>
     <string name="find_merchant_text">Nájsť obchodníka.</string>

diff --git a/features/exploredash/src/main/res/values-th/strings-explore-dash.xml b/features/exploredash/src/main/res/values-th/strings-explore-dash.xml
@@ -142,7 +142,6 @@
     <string name="buy_gift_card_text">ซื้อบัตรของขวัญด้วย Dash ของคุณ</string>
     <string name="buy_gift_card_desc_text">ซื้อบัตรของขวัญด้วย Dash ของคุณสำหรับจำนวนที่แน่นอนของการซื้อของคุณ</string>
     <string name="learn_more_text">เรียนรู้เพิ่มเติม</string>
-    <string name="continue_text">ดำเนินการต่อ</string>
     <string name="buy_card_header_text">การใช้บัตรของขวัญ</string>
     <string name="buy_card_desc_text">ไม่ใช่ร้านค้าทั้งหมดที่ยอมรับ Dash โดยตรง แต่คุณสามารถซื้อบัตรของขวัญด้วย Dash ของคุณ</string>
     <string name="find_merchant_text">ค้นหาร้านค้า</string>

diff --git a/features/exploredash/src/main/res/values-tr/strings-explore-dash.xml b/features/exploredash/src/main/res/values-tr/strings-explore-dash.xml
@@ -146,7 +146,6 @@
     <string name="buy_gift_card_text">Dash\'iniz ile hediye kartları satın alın</string>
     <string name="buy_gift_card_desc_text">Satın alma işleminizin tam tutarı için Dash\'ınızla hediye kartları satın alın.</string>
     <string name="learn_more_text">Daha fazla bilgi edin</string>
-    <string name="continue_text">Devam</string>
     <string name="buy_card_header_text">Hediye Kartı Nasıl Kullanılır</string>
     <string name="buy_card_desc_text">Tüm mağazalar DASH\'i doğrudan kabul etmez, ancak Dash\'inizle bir hediye kartı satın alabilirsiniz.</string>
     <string name="find_merchant_text">Bir tüccar bulun.</string>

diff --git a/features/exploredash/src/main/res/values-uk/strings-explore-dash.xml b/features/exploredash/src/main/res/values-uk/strings-explore-dash.xml
@@ -154,7 +154,6 @@
     <string name="buy_gift_card_text">Купуйте подарункові картки за допомогою Dash</string>
     <string name="buy_gift_card_desc_text">Купуйте подарункові картки за допомогою Dash на точну суму покупки.</string>
     <string name="learn_more_text">Дізнатися більше</string>
-    <string name="continue_text">Продовжити</string>
     <string name="buy_card_header_text">Як використовувати подарункову карту</string>
     <string name="buy_card_desc_text">Не всі магазини приймають DASH напряму, але ви можете купити подарункову картку за допомогою Dash.</string>
     <string name="find_merchant_text">Знайти продавця.</string>