Commit graph

251 commits

Author SHA1 Message Date
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
81b34a30e7 Changes for buy page for bitcoin and litecoin. Added listeners for notifications from resume and launch. 2021-06-08 23:06:22 +03:00
M
951cdbeb50 Merge pull request #134 from cake-tech/CAKE-297-subaddress-for-incoming-transaction
Cake 297 subaddress for incoming transaction
2021-06-07 21:57:10 +03:00
OleksandrSobol
d5d1afd89b CAKE-306 | merged main branch into current; added _fetchBuyItems() method to buy_view_model.dart; deleted isMoonPayEnabled parameter from settings_store.dart 2021-06-07 16:40:25 +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
b5cc1bbe7d Merge pull request #147 from cake-tech/notification
Notification
2021-06-04 18:28:05 +03:00
M
ff6e4d58f7 Added push notifications, FCM. 2021-06-04 18:25:17 +03:00
OleksandrSobol
9e1c151f85 CAKE-306 | fixed moonpay_buy_provider.dart; added onEnabled() method to moonpay_buy_provider.dart; checked is MoonPayBuyProvider enabled; added isMoonPayEnabled to settings_store.dart 2021-06-01 21:03:35 +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
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
OleksandrSobol
9ad276622f CAKE-297 | merged main branch into current 2021-05-18 19:37:43 +03:00
OleksandrSobol
b474936aee Merge branch 'main' into CAKE-297-subaddress-for-incoming-transaction
# Conflicts:
#	lib/monero/monero_wallet.dart
#	lib/view_model/transaction_details_view_model.dart
2021-05-18 19:25:49 +03:00
OleksandrSobol
66e22c2d07 CAKE-324 | fixed localization 2021-05-18 19:14:42 +03:00
OleksandrSobol
34ee2dd8e6 CAKE-324 | added website and github links to support page 2021-05-17 21:22:49 +03:00
OleksandrSobol
8567f20809 CAKE-297 | fixed addressIndex 2021-05-12 19:34:36 +03:00
M
f4c57e22f2 Minor bug fixes. 2021-05-11 18:37:26 +03:00
M
a439560d4d Fixes for LTC and added banner for old bitcoin electrum wallets. 2021-05-11 16:52:48 +03:00
M
2b4248e30b Merged main into ltc. 2021-05-10 19:51:13 +03:00
M
b23db7e414 Merge pull request #125 from cake-tech/CAKE-314-bnb-exchange-bug
CAKE-314 | changed bnb crypto currency to bnb bep2; removed bnb bep2 …
2021-05-10 19:26:00 +03:00
OleksandrSobol
7bbd530319 CAKE-297 | applied subaddress for incoming transaction 2021-05-10 19:10:33 +03:00
M
595636c24d Fixes for LTC. 2021-05-07 21:59:03 +03:00
M
1330966794 Reworked electrum wallet. Added Litecoin wallet. 2021-05-07 10:36:38 +03:00
OleksandrSobol
ae7ccacf29 CAKE-306 | fixed moonpay_buy_provider.dart, buy_view_model.dart and order_details_view_model.dart 2021-04-30 13:12:00 +03:00
OleksandrSobol
3675350452 CAKE-314 | changed bnb crypto currency to bnb bep2; removed bnb bep2 from receive currency list on exchange page 2021-04-30 12:46:15 +03:00
OleksandrSobol
9627590ba5 CAKE-306 | fixed findOrderById() in the moonpay_buy_provider.dart; fixed saveOrder() in the buy_view_model.dart 2021-04-30 11:08:25 +03:00
OleksandrSobol
bbe75451a4 CAKE-312 | wrapped unlock page by WillPopScope; fixed biometricAuth() in the auth_view_model.dart 2021-04-22 18:56:14 +03:00
OleksandrSobol
ae9efb0ae8 CAKE-192 | implemented unstoppable domain address to the app 2021-04-20 20:49:53 +03:00
OleksandrSobol
1c976bfaa1 CAKE-306 | applied _saveOrder() to buy_webview_page.dart; fixed moonpay_buy_provider.dart and wyre_buy_provider.dart; canceled timers on exchange_trade_page.dart, order_details_page.dart and trade_details_page.dart; reworked pre_order_page.dart 2021-04-15 20:10:23 +03:00
OleksandrSobol
697fc7f5a5 CAKE-306 | reworked buy_list_item.dart and pre_order_page.dart; added clear button to pre_order_page.dart; fixed order_row.dart and order_details_view_model.dart; added MoonPay statuses to trade_state.dart 2021-04-14 21:23:10 +03:00
OleksandrSobol
19ffffa6cc CAKE-306 | applied buy_webview_page.dart to the app; fixed order_details_view_model.dart and order_row.dart; applied localization to the pre_order_page.dart; deleted unused files 2021-04-13 21:40:44 +03:00
OleksandrSobol
346a034d0a CAKE-306 | added MoonPay option for BTC buying; applied PreOrderPage to the app; created Wyre and MoonPay buy providers 2021-04-12 21:22:22 +03:00
M
b32418d9e8 Merge pull request #110 from cake-tech/CAKE-296-remove-xmr-to-xrp-and-xmr-to-xlm-exchange-pairs
Cake 296 remove xmr to xrp and xmr to xlm exchange pairs
2021-04-09 15:24:15 +03:00
OleksandrSobol
68c12cbb79 CAKE-296 | added receiveCurrencies (list of crypto currencies without xlm and xrp) to exchange_view_model.dart; applied receiveCurrencies to receive card in the exchange_page.dart 2021-04-06 20:11:26 +03:00
M
c3fb0cfcd4 Merge pull request #104 from cake-tech/CAKE-288-hidden-balance-fixes
Cake 288 hidden balance fixes
2021-04-06 18:55:33 +03:00
OleksandrSobol
753d164d6e CAKE-296 | removed xmr to xrp and xmr to xlm exchange pairs from ChangeNow pair list; disabled exchange button when pair is not exists 2021-04-01 21:08:11 +03:00
OleksandrSobol
0848ede37f CAKE-305 | fixed transfer to wyre next btc address 2021-03-31 20:02:44 +03:00
OleksandrSobol
3da9eb38aa CAKE-288 | added possibility to see available and additional balance by pressing on hidden balance (balance_page.dart); fixed switch of display mode on order_list_item.dart and trade_list_item.dart 2021-03-31 19:18:33 +03:00
M
c0a12c6026 Merge pull request #102 from cake-tech/CAKE-301-add-wyre-contact-to-support
Cake 301 add wyre contact to support
2021-03-29 22:03:03 +03:00
OleksandrSobol
c077bb6b98 CAKE-301 | replaced link for wyre contact 2021-03-29 20:32:39 +03:00
OleksandrSobol
013ba5f462 CAKE-301 | added wyre contact to support page 2021-03-26 20:59:38 +02:00
OleksandrSobol
3839850f04 CAKE-299 | fixed bug for estimatedFee getter in the send_view_model.dart 2021-03-26 20:16:10 +02:00
M
47c12a459c Merge branch 'main' into deploy 2021-03-24 12:22:42 +02:00
M
21ae0ec0da Merge pull request #96 from cake-tech/CAKE-279-integrate-wyre
Cake 279 integrate wyre
2021-03-24 12:13:01 +02:00
OleksandrSobol
1cbbc71201 CAKE-279 | canceled changes in AndroidManifest.xml and MainActivity.java; added static constants to wyre_service.dart; moved WyreException class into own file; imported WyreService by di.dart 2021-03-23 20:57:20 +02:00
OleksandrSobol
08efc52f71 CAKE-279 | removed find_order_by_id.dart; added and applied wyre_service.dart to the app 2021-03-23 19:19:01 +02:00
M
5cad3a9612 Updates wyre. 2021-03-23 13:05:01 +02:00
M
23f73df391 Whatever. 2021-03-22 19:38:55 +02:00
M
e77cf89651 Changed api to prod mode. 2021-03-18 11:15:07 +02:00
OleksandrSobol
af9d39f460 CAKE-279 | added isRunningWebView to the dashboard_view_model.dart; applied isRunningWebView to call of WebViewPage in the dashboard_page.dart 2021-03-17 21:32:13 +02:00
OleksandrSobol
d752692c3f CAKE-279 | saved orderId in the orders store; added saveOrder() method to the dashboard_view_model.dart 2021-03-17 20:21:26 +02:00