Commit graph

89 commits

Author SHA1 Message Date
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
OleksandrSobol
6ac8dabf87 CAKE-306 | fixed onEnabled() method in the moonpay_buy_provider.dart 2021-06-07 14:28:53 +03:00
M
ff6e4d58f7 Added push notifications, FCM. 2021-06-04 18:25:17 +03:00
OleksandrSobol
ee6b8767d6 CAKE-306 | fixed settings_store.dart and di.dart 2021-06-02 20:09:39 +03:00
OleksandrSobol
90d53c9f6e CAKE-306 | fixed MoonPay icon for buy_list_item.dart and order_row.dart 2021-06-02 16:52:58 +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
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
M
f4c57e22f2 Minor bug fixes. 2021-05-11 18:37:26 +03:00
OleksandrSobol
7bbd530319 CAKE-297 | applied subaddress for incoming transaction 2021-05-10 19:10:33 +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
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
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
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
OleksandrSobol
0848ede37f CAKE-305 | fixed transfer to wyre next btc address 2021-03-31 20:02:44 +03:00
M
47c12a459c Merge branch 'main' into deploy 2021-03-24 12:22:42 +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
OleksandrSobol
b20246ad89 CAKE-279 | renamed WebViewPage on WyrePage; applied spinner to Buy button on dashboard_page.dart 2021-03-18 20:36:58 +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
OleksandrSobol
76c7108bd7 CAKE-293 | applied webview to the app 2021-03-17 12:32:22 +02:00
M
db75167302 Changed monero dependencies path for android. Changed scripts for generation of secrets. 2021-03-16 15:20:46 +02:00
OleksandrSobol
60333e235d CAKE-279 | applied order details to the app 2021-03-12 21:04:37 +02:00
OleksandrSobol
b2b17e66c5 CAKE-284 | moved support from settings to main menu; added support_page.dart and support_view_model.dart to the app 2021-02-25 20:25:52 +02:00
M
47ceac2dd6 Backup stuff. 2021-01-15 19:41:30 +02:00
M
9a79fcdc23 Merged 4.1.0 2021-01-13 19:18:28 +02:00
M
c09a41b090 Backup. 2021-01-13 18:43:34 +02:00
M
bef18de7a6 Added auto saving of wallet address to wallet info. Added users wallet addresses into address book. 2021-01-08 20:10:37 +02:00
M
d55b689636 Merge branch '4.1.0' into CAKE-198-notes-for-transactions 2021-01-05 22:02:47 +02:00
M
e8c4653aad Merge pull request #158 from cake-tech/CAKE-216-exchange-status-bug
CAKE-216 | added trade_details_view_model.dart to the app; applied Tr…
2021-01-05 22:00:18 +02:00
M
c0835d46ef Merge branch '4.1.0' into CAKE-198-notes-for-transactions 2021-01-05 21:57:05 +02:00
M
798d9a1edf Fixes 2021-01-05 20:31:03 +02:00
OleksandrSobol
9ca4bee602 Merge branch '4.1.0' into CAKE-216-exchange-status-bug
# Conflicts:
#	lib/di.dart
2020-12-24 22:14:24 +02:00
OleksandrSobol
023336d460 CAKE-198 | applied ability to make a note with some details about transaction; added transactionNote property and note getter to transaction_description.dart; added multiline textfield for notes (send_page.dart); added transaction_details_list_item.dart, textfield_list_item.dart, textfield_list_row.dart, transaction_details_view_model.dart to the app 2020-12-22 20:42:30 +02:00
M
7f2b109381 Fixed balance dispaying. Changed updating of balance after sending. Changed text for pre seed screen for btc wallet type. 2020-12-21 22:20:46 +02:00
OleksandrSobol
7168e4727d Merge branch '4.1.0' into CAKE-216-exchange-status-bug 2020-12-18 21:05:02 +02:00
OleksandrSobol
837f639129 CAKE-216 | added trade_details_view_model.dart to the app; applied TradeDetailsViewModel to the trade_details_page.dart; added _updateItems() method to the exchange_trade_view_model.dart; reworked content in the exchange_trade_page.dart 2020-12-18 14:42:53 +02:00
M
eede39ee7a Merged 4.0.9 2020-12-11 20:10:06 +02:00
M
042b17a82f Merge pull request #144 from cake-tech/CAKE-158-transaction-and-balance-displaying-between-accounts
CAKE-158 | added calculating balance to _onAccountChangeReaction in t…
2020-12-04 11:25:59 +02:00
OleksandrSobol
3ebc0627e7 CAKE-194 | added pre seed page to app; called pre seed page when creating new wallet from welcome an wallet list pages; added images to assets 2020-11-27 13:08:17 +02:00
OleksandrSobol
17ba74bce7 Merge branch '4.0.8' into CAKE-158-transaction-and-balance-displaying-between-accounts
# Conflicts:
#	lib/src/screens/receive/receive_page.dart
2020-11-18 18:19:43 +02:00
OleksandrSobol
23abacd252 CAKE-158 | made account tile slidable; added onEdit function to account tile; added ability to edit wallet account name; added isFirstAddress parameter to wallet_address_list_view_model.dart and made first address in the address list not editable (receive page); wrapped wallet account name in the wallet menu title by observer; added _moneroTransactionsChangeReaction to dashboard_view_model.dart 2020-11-17 20:16:58 +02:00
M
c5b739d36a Merge branch '4.0.8' of github.com:cake-tech/cake_wallet_private into btc 2020-11-17 14:33:35 +02:00
M
6418b28c08 CAKE-177. CAKE-176. CAKE-115. 2020-11-16 20:17:03 +02:00
M
4e4cd08135 Hack for display login issue 2020-11-12 22:02:37 +02:00