From 84a1687ed3acaf6eb68243db2bae62c54d33dc2a Mon Sep 17 00:00:00 2001 From: zaiatsartem Date: Tue, 3 Sep 2024 14:04:29 +0300 Subject: [PATCH] Feature/and 62 ccd onramp (#113) * Add Concordex and Wert to CCD onramp * Change Wert icon * Update Changelog * Add Concordex Testnet --- CHANGELOG.md | 1 + .../wallet/ui/onramp/CcdOnrampListItem.kt | 3 +++ .../wallet/ui/onramp/CcdOnrampSite.kt | 1 + .../ui/onramp/CcdOnrampSiteRepository.kt | 19 +++++++++++++++++++ app/src/main/res/values/ccx_styles.xml | 3 +++ app/src/main/res/values/strings.xml | 1 + app/src/main/res/values/styles.xml | 1 + 7 files changed, 29 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3d456db..97d24c47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Added - Notifications for CCD and CIS-2 token transactions +- Concordex exchange and Wert service where CCD can be purchased ## [1.2.0] - 2024-08-27 diff --git a/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampListItem.kt b/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampListItem.kt index 76696b18..44a43f04 100644 --- a/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampListItem.kt +++ b/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampListItem.kt @@ -17,6 +17,9 @@ sealed interface CcdOnrampListItem { CcdOnrampSite.Type.CEX -> R.string.ccd_onramp_site_type_cex + + CcdOnrampSite.Type.DEX -> + R.string.ccd_onramp_site_type_dex } ) } diff --git a/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampSite.kt b/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampSite.kt index b60088c3..f92c8c2f 100644 --- a/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampSite.kt +++ b/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampSite.kt @@ -12,6 +12,7 @@ class CcdOnrampSite( enum class Type { PAYMENT_GATEWAY, CEX, + DEX ; } } diff --git a/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampSiteRepository.kt b/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampSiteRepository.kt index 6a302314..bc964c33 100644 --- a/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampSiteRepository.kt +++ b/app/src/main/java/com/concordium/wallet/ui/onramp/CcdOnrampSiteRepository.kt @@ -11,6 +11,13 @@ class CcdOnrampSiteRepository { type = CcdOnrampSite.Type.PAYMENT_GATEWAY, acceptsCreditCard = true, ), + CcdOnrampSite( + name = "Wert", + url = "https://wert.io/try-wert", + logoUrl = "https://partner.wert.io/icons/apple-touch-icon.png", + type = CcdOnrampSite.Type.PAYMENT_GATEWAY, + acceptsCreditCard = true, + ), CcdOnrampSite( name = "LetsExchange", url = "https://letsexchange.io/", @@ -59,6 +66,12 @@ class CcdOnrampSiteRepository { logoUrl = "https://cdn.prod.website-files.com/64f060f3fc95f9d2081781db/668529303de2213473aa1be0_1654851660739235057_downlod_gate1.svg", type = CcdOnrampSite.Type.CEX, ), + CcdOnrampSite( + name = "Concordex", + url = "https://app.concordex.io/trade?mode=simple", + logoUrl = "https://cdn.prod.website-files.com/64f060f3fc95f9d2081781db/64f0d420d065ec0e03a694b9_logo-favicon-concordex.png", + type = CcdOnrampSite.Type.DEX, + ), ) val testnetSites = listOf( @@ -67,6 +80,12 @@ class CcdOnrampSiteRepository { url = "https://radiokot.github.io/ccd-faucet/", logoUrl = "https://em-content.zobj.net/source/apple/391/smiling-face-with-sunglasses_1f60e.png", type = CcdOnrampSite.Type.PAYMENT_GATEWAY, + ), + CcdOnrampSite( + name = "Concordex Testnet", + url = "https://testnet.concordex.io/trade?mode=simple", + logoUrl = "https://cdn.prod.website-files.com/64f060f3fc95f9d2081781db/64f0d420d065ec0e03a694b9_logo-favicon-concordex.png", + type = CcdOnrampSite.Type.DEX, ) ) diff --git a/app/src/main/res/values/ccx_styles.xml b/app/src/main/res/values/ccx_styles.xml index 8334b3e4..7eb65548 100644 --- a/app/src/main/res/values/ccx_styles.xml +++ b/app/src/main/res/values/ccx_styles.xml @@ -81,6 +81,7 @@ @@ -191,6 +192,7 @@ @drawable/ccx_welcome_background @style/AlertDialogTheme @style/AlertDialogTheme + false diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d15a5fa5..51fbde96 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1110,6 +1110,7 @@ Read our disclaimer for more. Payment Gateway CEX + DEX Disclaimer The information regarding the CCD on any Concordium website does not constitute an offer or solicitation to purchase CCDs. diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5b186811..5fdcb6f0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -52,6 +52,7 @@