Serhii
71d5a9b790
Merge branch 'main' into CW-247-Exchange-confirmation-screen-address-labels
2023-01-26 11:54:03 +02:00
Serhii
9ec006bb03
Merge branch 'main' into CW-302-Update-Cake-Pay-checkout-wording-for-Bitcoin-only
2023-01-25 18:31:30 +02:00
Serhii
9f5438d2f4
update localization files
2023-01-25 12:28:44 +02:00
OmarHatem
477d46b1d2
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-237-enhance-error-catching-reporting
2023-01-24 03:03:07 +02:00
Serhii
7f37bd3d59
update localization files
2023-01-14 23:29:47 +02:00
Serhii
25a71fa31e
Merge branch 'main' into CW-252-Add-notice-when-connecting-to-.onion-node
2023-01-13 15:43:29 +02:00
OmarHatem
a373253fd2
Add localizations for error dialog content
2023-01-09 18:16:50 +02:00
OmarHatem
23490b088f
Translate contact list for other languages
2023-01-06 14:40:35 +02:00
Mathias Herberts
de4ecefd20
Added localized strings in contact list
2023-01-05 22:44:19 +01:00
Serhii
e53602afa3
Add alert for onion nodes
2023-01-05 12:53:05 +02:00
Omar Hatem
9bd0de6d08
Merge pull request #625 from cake-tech/CW-122-Rework-filter-on-the-transactions-list-screen
...
[CW-122] rework filter on the transactions list screen
2022-12-28 20:50:17 +02:00
Serhii
d893562dad
update localization
2022-12-24 01:09:54 +02:00
OmarHatem
e005e2aed7
Add Cake Pay Web Card to marketplace
2022-12-21 19:15:02 +02:00
Serhii
00c008ed8b
Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen
2022-12-16 15:14:13 +02:00
Omar Hatem
d1832aa510
Merge branch 'main' into CW-225-pin-timeout
2022-12-13 20:40:20 +02:00
OmarHatem
01024b6694
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-66-open-app-from-qr-code
...
Conflicts:
lib/di.dart
lib/src/screens/send/send_page.dart
lib/src/screens/send/widgets/send_card.dart
lib/view_model/send/send_view_model.dart
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
2022-12-12 15:41:16 +02:00
Serhii
b9ef71749e
Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen
2022-12-09 23:35:14 +02:00
Godwin Asuquo
07ea937d37
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout
2022-12-09 19:42:07 +01:00
Omar Hatem
357ebe5fc8
Merge pull request #595 from cake-tech/CW-118-Allow-disabling-of-fiat
...
CW-118 Allow disabling of fiat
2022-12-09 20:20:16 +02:00
Justin Ehrenhofer
1fc4f809e5
Merge branch 'main' into warning-wording
2022-12-09 08:44:30 -06:00
OmarHatem
fddac23b94
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-118-Allow-disabling-of-fiat
...
Conflicts:
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
2022-12-08 14:01:20 +02:00
OmarHatem
55b37164dc
- Make getters to ease attribute access
...
- Add the old 'disable_fiat' translation
- rename getters to be more bool like names
2022-12-07 22:07:32 +02:00
Serhii
228e157b39
[skip ci] Update localization
2022-12-07 14:04:14 +02:00
Serhii
214c1fe0db
Merge branch 'main' into CW-118-Allow-disabling-of-fiat
2022-12-06 17:37:12 +02:00
Godwin Asuquo
65cbdd3fbb
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout
2022-12-05 13:33:17 +01:00
OmarHatem
9d64789983
Fix Conflict with main
...
Rename classes to advanced privacy settings to avoid confusion between settings/privacy-settings
2022-12-04 05:08:42 +02:00
OmarHatem
f792b58338
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-180-advanced-startup-privacy-settings
...
Conflicts:
lib/di.dart
lib/routes.dart
lib/view_model/node_list/node_create_or_edit_view_model.dart
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
2022-12-04 04:34:32 +02:00
Omar Hatem
dc60123f79
Merge pull request #529 from cake-tech/CW-182-allow-trusted-nodes
...
Cw 182 allow trusted nodes
2022-12-04 02:17:35 +02:00
Omar Hatem
bfcd3ee002
Merge pull request #643 from cake-tech/CW-223-settings-reorganization
...
Cw 223 settings reorganization
2022-12-01 21:37:43 +02:00
Godwin Asuquo
28abb4ded0
Add localization strings
2022-11-30 15:28:27 +02:00
OmarHatem
0d685823ce
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-66-open-app-from-qr-code
...
Conflicts:
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
2022-11-29 17:45:31 +02:00
Serhii
ab499c9069
Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen
2022-11-28 22:33:54 +02:00
Serhii
1a420a7470
Merge branch 'main' into CW-221-Change-synchronization-status-text
2022-11-28 22:24:25 +02:00
Godwin Asuquo
7da2de60cb
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout
2022-11-28 18:27:21 +02:00
Godwin Asuquo
63df8c6b6f
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-223-settings-reorganization
2022-11-23 22:54:24 +02:00
Godwin Asuquo
818a8afe20
[CW-225] Add pin timeout setting
2022-11-22 22:52:28 +02:00
Serhii
50d32021f6
Merge branch 'main' into CW-118-Allow-disabling-of-fiat
2022-11-22 19:48:43 +02:00
Omar Hatem
9b32c9c956
CW-227 Add Disable Exchange option to settings ( #642 )
...
* Add Disable Exchange option to settings
2022-11-21 21:18:18 -05:00
Godwin Asuquo
549975ecc1
Reorganize settings
2022-11-16 09:29:14 +02:00
Justin Ehrenhofer
cf7c21946b
Improve warning wording
...
Recommended in the Telegram testing group
2022-11-10 14:45:10 -06:00
Serhii
bf86fd6ed0
update localization
2022-11-10 17:38:23 +02:00
OmarHatem
6210d8fba6
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-180-advanced-startup-privacy-settings
...
Conflicts:
cw_core/lib/node.dart
lib/di.dart
lib/router.dart
lib/routes.dart
lib/view_model/node_list/node_create_or_edit_view_model.dart
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
2022-11-09 15:40:12 +02:00
Serhii
7d92a964c7
Change synchronization status text
...
changed the status from "Starting sync" to "Attempting sync".
2022-11-09 12:14:21 +02:00
OmarHatem
7c7de65cdf
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-66-open-app-from-qr-code
...
Conflicts:
lib/di.dart
lib/src/screens/send/send_page.dart
lib/src/screens/send/widgets/send_card.dart
lib/utils/payment_request.dart
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
2022-11-08 14:44:58 +02:00
Serhii
b5e74874ce
update localization files
2022-11-04 14:11:06 +02:00
OmarHatem
b8eaf98ff1
Merge branch 'flutter-upgrade' of https://github.com/cake-tech/cake_wallet into CW-182-allow-trusted-nodes
2022-11-03 21:34:20 +02:00
Serhii
a52f47220e
show warning if exchanging with slow fee ( #579 )
...
* show warning if exchanging with slow fee
* Update setDefaultTransactionPriority for return type void; update for use MoneroTransactionPriority.automatic instead of MoneroTransactionPriority.regular.
Co-authored-by: M <m@cakewallet.com>
2022-11-03 15:21:35 -04:00
Serhii
b27b55388c
add warning text to the seed screen ( #587 )
...
* Add warning text to the seed screen
* fix font size
2022-11-02 15:53:14 -04:00
Serhii
0040bca853
Add partners contacts ( #577 )
...
Contacts of SideShift and SimpleSwap partners added to the Support section
2022-11-02 14:11:05 -04:00
Omar Hatem
c34c3b0737
Cw 199 add wallet deletion confirmation ( #555 )
...
* Fix Slidable for deleting wallet
Add confirmation dialog for deleting wallet
* Swap confirmation dialog buttons to be consistent with other alerts
2022-10-21 16:06:59 -04:00
OmarHatem
6bbedde9b7
Add privacy settings route
...
Add text translation
2022-10-05 15:58:25 +02:00
OmarHatem
d748f12e44
Allow marking Monero Nodes as trusted
2022-10-04 14:54:39 +02:00
mkyq
4ae69d0344
Update text for cake pay learn more notification ( #502 )
2022-09-07 13:46:13 +01:00
Godwin Asuquo
bd25d047b2
CW-148 cake pay partial redemptions ( #490 )
...
* Ionia custom redemption screen
* update ionia gift card remaining amount with custom value
* [NO-TASK] Fix issues with custom redeem
* replace redeem
* update remaining amount
* fixed from code review
* Add localization
2022-09-02 14:47:45 +01:00
Omar Hatem
c50eeee58b
CW 68 exchange automatic rate selector ( #472 )
...
* Add 'Exchange provider picker'
Save user selections
* Save user's exchange providers selection
* Add text for selected providers availability
* Fix selected providers not updating
* Load limits based on highest maximum in the selected providers
* Change received and deposit amount to be the best value from the selected providers
* Add provider name next to Trade ID
Set selected provider based on amount calculated
* Grey out providers who doesn't support selected currency pair
* Fix disabled providers
* Add Provider logo in Confirm Screen
* Only choose a provider if it satisfies its limits
* Fix amount validation
* Fix typo in error message
* Add a queue of possible exchange providers sorted by the best rate to try next if one failed
* Fix string locale typo
* Add Localization for other languages
* Add Placeholder text when there are no providers selected
* Check Exchange provider availability before creating a trade
* Fix "Fixed Rate" changing unconditionally
* Enable "convert to" field regardless of the provider
* Remove "Choose one" from providers picker
* Merge Master
* Fix Conflicts with master
* Add missing isEnabled field in simple swap provider
2022-09-01 15:12:38 +01:00
Serhii
7fae9cf9bb
Cw 150 cake pay introduction card ( #486 )
...
* create introducing card
* add ability to close the card
* update walletInfo class
* update localization
* fix intro text
* fix card size
* show card for existing and new wallet types
* disable card for haven wallets
* fixes to PR
* fixes to PR
* fix PR
2022-08-30 19:03:02 +01:00
Serhii
8a740e1c41
change account sign-in/sign-up text ( #462 )
2022-08-11 15:44:27 +01:00
OmarHatem28
e5fac16ef7
Notify user when a different currency is scanned
2022-08-09 17:06:21 +02:00
mkyq
418c9563fe
Ionia ( #437 )
...
* Initial ionia service
* Ionia manage card UI (#374 )
* design ui for cakepay
* Add manage cards page ui
* create auth ui for ionia
* add authentication logic
* implement user create card
* Add ionia merchant sevic
* Add anypay. Add purschase gift card.
* display virtual card (#385 )
* display virtual card
* fix formatting
* Remove IoniaMerchantService from IoniaViewModel
* Add hex and txKey for monero pending transaction.
* Changed monero version and monero repo to cake tech.
* Add anypay payment. Add filter by search for ionia, add get purchased items for ionia.
* Fix for get transactions for hidden addresses for electrum wallet
* Add ionia categories.
* Add anypay commited info for payments.
* Update UI with new fixes (#400 )
* Change ionia base url. Add exception throwing for error messaging for some of ionia calls.
* CW-102 fix logic for ionia issues (#403 )
* refactor tips (#406 )
* refactor tips
* refactor ionia tips implementation
* Cw 115 implement gift cards list for ionia (#405 )
* Implement show purchased cards
* fix padding
* Fixes for getting of purchased gift cards.
* Implement gift card details screen (#408 )
* Implement gift card details screen
* Add redeem for ionia gift cards
* Fix navigation after ionia opt redirection.
* Fix update gift cards list.
* Add payment status update for ionia.
* Add usage instruction to gift card.
* Add copy for ionia gift card info.
* Change version for Cake Wallet ios.
* Add localisation (#414 )
* Fixes for fiat amounts for ionia.
* CW-128 marketplace screen text changes (#416 )
* Change text on marketplace
* fix build issues
* fix build
* UI fixes for ionia.
* UI fixes for ionia. (#421 )
* CW-129 ionia welcome screen text changes (#418 )
* update welcome text
* Update localization
* Cw 133 (#422 )
* UI fixes for ionia.
* Fixes for display card item on gift cards screen.
* Fix signup page (#419 )
* Changed tips for ionia.
* Cw 132 (#425 )
* UI fixes for ionia.
* Changed tips for ionia.
* Cw 131 (#426 )
* UI fixes for ionia.
* Changed tips for ionia.
* Fixes for IoniaBuyGiftCardDetailPage screen. Renamed 'Manage Cards' to 'Gift Cards'. Hide discount badge label for 0 discount.
* Change ionia heading font style (#427 )
* Fix for AddressResolver in di
* Changed build number for Cake Wallet ios.
* fix currency format for card details and routing for mark as redeemed (#431 )
* fix terms and condition overflow in ionia (#430 )
* fix terms and condition scroll
* fix color issues
* reuse
* refactor widget
* Remove IoniaTokenService
* Change api for ionia to staging
* Update versions for Cake Wallet for android and ios.
* Fixes for instructions. Remove diplay error on payment status screen.
* Change build versions for Cake Wallet
* Add ionia sign in.
* Update for discounts and statuses for ionia merch.
* Fixes for qr/barcode on ionia gift card screen.
* Fixed formatting for display ionia discounts.
* Fix merchant.discount.toStringAsFixed issue
* Add savingsPercentage to ionia merch discount.
* Change build number for Cake Wallet ios and android.
* Disable ionia for haven (#440 )
Co-authored-by: Godwin Asuquo <41484542+godilite@users.noreply.github.com>
2022-07-28 18:03:16 +01:00
Serhii
02533d68a0
prevent using same wallet name as existing ( #391 )
...
* Add wallet name validation
2022-06-29 18:21:21 +01:00
Omar Hatem
dc623f3293
Rework settings pickers ( #398 )
...
Updated pickers and settings screen
2022-06-29 13:38:44 +01:00
Omar Hatem
9568c5f932
QR code fullscreen ( #390 )
...
* Add fullscreen qr page flow
* Add qr fullscreen text localization
* Add package to control screen brightness when navigating to qr fullscreen and revert when leaving screen
* ios fix trial 1 - Change brightness control package
* Use package imports instead of relevant path
Add Map types
2022-06-23 10:25:00 +01:00
OmarHatem28
5a089b5893
Add Haven to welcome screen text
2022-06-18 17:10:07 +02:00
Mathias Herberts
6cd07278cc
Fixed localization of "View in Block Explorer" ( #342 )
...
Fixed localization of "View in Block Explorer
2022-04-22 16:15:05 +01:00
clear
135ede6a78
Cw-58: Show subaddress label on the transaction details page ( #333 )
...
* CW-58: Show subaddress label on the transaction details page
* add translations
* Fix interface
2022-04-12 16:38:47 +01:00
clear
5890df86db
cw-60: fill amount on scan qr on exchange page ( #309 )
...
* cw-60: fill amount on scan qr on exchange page
2022-03-31 18:54:45 +01:00
Serhii
1cd90cf57d
Cw 09 implement picker screen with ability to search ( #250 )
...
* Added new picker screen with search bar and currency icons
2022-03-31 15:16:42 +01:00
mkyq
01150ef2a7
Hv ( #295 )
...
* hv
* Change build version
2022-03-30 17:57:04 +02:00
mkyq
0a3a9885a5
Merge pull request #251 from cake-tech/CW-23-Fix-OpenAlias-alert-text
...
Changed alert header text for XMR and BTC wallets
2022-01-26 17:46:16 +02:00
Serhii-Borodenko
c54699e236
Changed alert header text for XMR and BTC wallets
2022-01-25 16:43:22 +02:00
M
63a0395c2d
Remove Next Address button and logic for electrum wallets. Add disclaimer for electrum wallets on address screen. Change way for generation of current receive and change addresses.
2022-01-24 14:04:23 +02:00
RafiaChy
f3eca2be1c
Adding seed languages for France and Italy for Monero New-Wallet and Monero Restore-Wallet
2022-01-17 21:46:49 +06:00
mkyq
ec7fe81d4f
Merge pull request #227 from cake-tech/CW-3-update-ui-for-sending-templates
...
update sending template
2022-01-14 14:25:52 +02:00
mkyq
a4b0a187cf
Merge pull request #234 from cake-tech/CW2
...
Added translations for the sell alert
2022-01-14 14:22:34 +02:00
RafiaChy
95654dfe47
Added translations for the sell alert
2022-01-14 00:10:27 +06:00
Serhii-Borodenko
89a3f71a6d
Updated localization for welcome screen
2022-01-13 11:39:06 +02:00
Godwin Asuquo
3115798b70
update sending template text
2022-01-12 18:58:54 +01:00
M
ff7700aa1f
Fix for monero.com label
2021-12-31 15:17:30 +02:00
M
226d546d55
Fixes for monero only app version.
2021-12-30 19:20:00 +02:00
M
fe3d00f1a8
Fixes for yat
2021-11-02 09:17:24 +00:00
OleksandrSobol
0e205a1606
CAKE-360 | applied localization to yat_popup.dart, first_introduction.dart, second_introduction.dart, third_introduction.dart, choose_yat_address_alert.dart and extract_address_from_parsed.dart
2021-10-05 14:43:37 +03:00
OleksandrSobol
cdddc12c81
CAKE-356 | added isYatDevMode parameter to the yat_alert.dart; deleted yat_webview_page.dart and yat_view_model.dart; applied localization of Yat to the app
2021-09-16 12:43:43 +03:00
OleksandrSobol
224253296a
CAKE-345 | merged CAKE-351 branch into current
2021-08-16 11:45:29 +03:00
OleksandrSobol
30a32ab071
CAKE-345 | fixed add receiver button; applied dotted borders to primary button; applied localization to add receiver button; added scrollbar to confirm_sending_alert.dart
2021-08-12 17:56:34 +03:00
OleksandrSobol
3abb78febf
Merge branch 'main' into CAKE-345-batch-sending
...
# Conflicts:
# lib/bitcoin/electrum_wallet.dart
2021-08-04 17:43:03 +03:00
OleksandrSobol
a20969b650
CAKE-334 | reworked unspent_coins_list_item.dart
2021-07-23 16:57:49 +03:00
OleksandrSobol
2a047e1f51
Merge branch 'release-4.2.4' into CAKE-345-batch-sending
...
# Conflicts:
# lib/bitcoin/electrum_wallet.dart
# lib/src/screens/send/send_page.dart
# lib/src/screens/send/send_template_page.dart
# lib/view_model/send/send_view_model.dart
# res/values/strings_de.arb
# res/values/strings_en.arb
# res/values/strings_es.arb
# res/values/strings_hi.arb
# res/values/strings_hr.arb
# res/values/strings_it.arb
# res/values/strings_ja.arb
# res/values/strings_ko.arb
# res/values/strings_nl.arb
# res/values/strings_pl.arb
# res/values/strings_pt.arb
# res/values/strings_ru.arb
# res/values/strings_uk.arb
# res/values/strings_zh.arb
2021-07-22 17:52:48 +03:00
M
3dd1bdabcc
Merge branch 'release-4.2.4' into CAKE-334-unspent-coins-control-application-logic
2021-07-22 10:48:22 +03:00
OleksandrSobol
7b2d89f96f
CAKE-345 | changed bitcoin transaction credentials; reworked createTransaction() method in the electrum_wallet.dart for batch sending; fixed exchange_trade_page.dart and send_page.dart; reworked confirm_sending_alert.dart; fixed _credenials() and commitTransaction() methods in the send_view_model.dart
2021-07-20 18:03:49 +03:00
OleksandrSobol
20e0c830cf
CAKE-334 | applied unspent coins control to the app; added unspent_coins_info.dart; reworked createTransaction(), calculateEstimatedFee() and updateUnspent() methods in the electrum_wallet.dart; fixed unspent_coins_list_view_model.dart, unspent_coins_details_view_model.dart, unspent_coins_list_item.dart, unspent_coins_list_page.dart and unspent_coins_details_page.dart; fixed bitcoin_transaction_wrong_balance_exception.dart; added properties to bitcoin_unspent.dart; applied localization to unspent coins pages
2021-07-05 16:52:24 +03:00
OleksandrSobol
37f326e21f
Merge branch 'main' into CAKE-192-implement-unstoppable-domain
...
# Conflicts:
# android/app/build.gradle
# android/build.gradle
# ios/Podfile
# ios/Podfile.lock
# res/values/strings_de.arb
# res/values/strings_en.arb
# res/values/strings_es.arb
# res/values/strings_hi.arb
# res/values/strings_hr.arb
# res/values/strings_it.arb
# res/values/strings_ja.arb
# res/values/strings_ko.arb
# res/values/strings_nl.arb
# res/values/strings_pl.arb
# res/values/strings_pt.arb
# res/values/strings_ru.arb
# res/values/strings_uk.arb
# res/values/strings_zh.arb
2021-06-15 13:18:52 +03:00
M
48066ce916
Changed alert for non supported crypto currencies for fiat buying.
2021-06-09 00:39:11 +03:00
M
98c8449b82
Merge branch 'main' into CAKE-306-add-moonpay-option-for-btc-buying
2021-06-07 21:52:58 +03:00
M
30e1fa81c7
Changed warning text for receive screen.
2021-06-07 21:44:58 +03:00
OleksandrSobol
68f1e39620
Merge branch 'main' into CAKE-306-add-moonpay-option-for-btc-buying
...
# Conflicts:
# lib/di.dart
# lib/view_model/dashboard/dashboard_view_model.dart
# res/values/strings_de.arb
# res/values/strings_en.arb
# res/values/strings_es.arb
# res/values/strings_hi.arb
# res/values/strings_hr.arb
# res/values/strings_it.arb
# res/values/strings_ja.arb
# res/values/strings_ko.arb
# res/values/strings_nl.arb
# res/values/strings_pl.arb
# res/values/strings_pt.arb
# res/values/strings_ru.arb
# res/values/strings_uk.arb
# res/values/strings_zh.arb
2021-06-07 15:26:21 +03:00
M
b2ece79334
Added warning on receive screen for outdated electrum wallets.
2021-06-04 13:30:59 +03:00
OleksandrSobol
1bf6ef6077
CAKE-306 | applied localization to MoonPay alert
2021-06-02 09:56:06 +03:00
OleksandrSobol
1fccb0b546
Merge branch 'main' into CAKE-306-add-moonpay-option-for-btc-buying
...
# Conflicts:
# lib/buy/wyre/wyre_buy_provider.dart
# lib/di.dart
# lib/src/screens/dashboard/dashboard_page.dart
# lib/view_model/dashboard/dashboard_view_model.dart
# res/values/strings_de.arb
# res/values/strings_en.arb
# res/values/strings_es.arb
# res/values/strings_hi.arb
# res/values/strings_ja.arb
# res/values/strings_ko.arb
# res/values/strings_nl.arb
# res/values/strings_pl.arb
# res/values/strings_pt.arb
# res/values/strings_ru.arb
# res/values/strings_uk.arb
# res/values/strings_zh.arb
2021-05-28 12:06:50 +03:00
OleksandrSobol
4d6cc87529
CAKE-192 | merged main branch into current; fixed call unstoppable domains api for different sdk versions; fixed italian and croatian locales
2021-05-24 21:06:12 +03:00
OleksandrSobol
251d6ad502
Merge branch 'main' into CAKE-192-implement-unstoppable-domain
...
# Conflicts:
# android/app/src/main/java/com/cakewallet/cake_wallet/MainActivity.java
# ios/Runner/AppDelegate.swift
# res/values/strings_de.arb
# res/values/strings_en.arb
# res/values/strings_es.arb
# res/values/strings_hi.arb
# res/values/strings_ja.arb
# res/values/strings_ko.arb
# res/values/strings_nl.arb
# res/values/strings_pl.arb
# res/values/strings_pt.arb
# res/values/strings_ru.arb
# res/values/strings_uk.arb
# res/values/strings_zh.arb
2021-05-24 19:09:43 +03:00