Skip to content

feat: state cards only valid in US #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HashEngineering merged 12 commits into from
Sep 23, 2025
Merged

feat: state cards only valid in US #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
104d0e2
fix: if replaying, prevent giftcard purchase
HashEngineering Sep 2, 2025
0481815
fix: if replaying, prevent giftcard purchase
HashEngineering Sep 2, 2025
7849c7d
fix: log purchase errors with crashlytics, other DashSpend fixes
HashEngineering Sep 3, 2025
eac339e
fix: prevent crash from bad password
HashEngineering Sep 3, 2025
a8ed983
fix: remove obsolete file
HashEngineering Sep 8, 2025
06f39c1
fix: eliminate crash in PeerListFragment
HashEngineering Sep 8, 2025
fc5a692
fix: eliminate crash RequestUserNameViewModel.verify
HashEngineering Sep 8, 2025
3ae7b0b
fix: remove some debug logs
HashEngineering Sep 8, 2025
46386fa
fix: eliminate potential deadlocks in create, destroy BlockchainServi…
HashEngineering Sep 8, 2025
88ff5c8
feat: state cards only valid in US
HashEngineering Sep 10, 2025
0615630
Merge branch 'master' of https://github.com/dashevo/dash-wallet into …
HashEngineering Sep 23, 2025
791d356
style: ktlint
HashEngineering Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...edash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,7 @@ class CTXSpendViewModel @Inject constructor(
merchant.savingsPercentage = this.savingsPercentage
merchant.minCardPurchase = this.minimumCardPurchase
merchant.maxCardPurchase = this.maximumCardPurchase
// TODO: re-enable fixed denoms
merchant.active = this.enabled || this.denominationType == DenominationType.Fixed
merchant.active = this.enabled
merchant.fixedDenomination = this.denominationType == DenominationType.Fixed
merchant.denominations = this.denominations.map { it.toInt() }
}
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ class GiftCardDetailsViewModel @Inject constructor(
val timeElapsed = (System.currentTimeMillis() - startPurchaseTime).toDouble() / 1000
if (BuildConfig.DEBUG) {
log.info(
"event:process_gift_card_purchase: {} ms",
"event:process_gift_card_purchase: {} s",
timeElapsed
)
}
Expand Down
13 changes: 13 additions & 0 deletions features/exploredash/src/main/res/layout/item_details_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,19 @@
app:layout_constraintBottom_toTopOf="@id/pay_btn"
/>

<TextView
android:id="@+id/country_availability_text"
style="@style/Overline.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/country_availability"
android:layout_marginBottom="16dp"
android:visibility="visible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/temporary_unavailable_text"
/>

<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:id="@+id/pay_btn"
Expand Down
1 change: 1 addition & 0 deletions features/exploredash/src/main/res/values/strings-explore-dash.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@
<string name="create_an_account_at_ctx_spend_or_log_in_to_the_existing_one">Create a DashSpend account or log in to the existing one</string>
<string name="ctx_terms_url" translatable="false">https://ctx.com/gift-card-agreement/</string>
<string name="temporarily_unavailable">Temporarily unavailable</string>
<string name="country_availability">This card works only in the United States</string>
<string name="token_expired_title">Your session expired</string>
<string name="token_expired_message">It looks like you haven’t used DashSpend in a while. For security reasons, you’ve been logged out.\n\nPlease sign in again to continue exploring where to spend your Dash.</string>
</resources>