Commit graph

2456 commits

Author SHA1 Message Date
M
2688b44c05 Merge pull request #161 from cake-tech/CAKE-198-notes-for-transactions
Cake 198 notes for transactions
2021-01-05 22:03:25 +02:00
M
d55b689636 Merge branch '4.1.0' into CAKE-198-notes-for-transactions 2021-01-05 22:02:47 +02:00
M
722a08e39e Merge branch '4.1.0' of github.com:cake-tech/cake_wallet_private into 4.1.0 2021-01-05 22:00:28 +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
6bc5421775 Merge branch '4.1.0' of github.com:cake-tech/cake_wallet_private into 4.1.0 2021-01-05 21:57:41 +02:00
M
c0835d46ef Merge branch '4.1.0' into CAKE-198-notes-for-transactions 2021-01-05 21:57:05 +02:00
M
6a2327a849 Merge pull request #163 from cake-tech/CAKE-221-rework-send-screen
Cake 221 rework send screen
2021-01-05 21:50:15 +02:00
M
83dd4d9264 Fixes 2021-01-05 21:49:14 +02:00
M
43fc4032f4 Merge pull request #155 from cake-tech/CAKE-208-bug-after-balance-changing
CAKE-208 | added current balance display mode saving to shared prefer…
2021-01-05 21:11:48 +02:00
M
798d9a1edf Fixes 2021-01-05 20:31:03 +02:00
OleksandrSobol
9b041dbe1e CAKE-222 | fixed transaction priority picker on the settings screen; added check of priority for wallet type 2021-01-04 17:13:37 +02:00
M
2dc5489a8e Changed project version to 4.1.0 + 26. 2021-01-01 10:57:12 +02:00
M
6288d8e05f Changed iOS project version to 4.1. 2020-12-30 20:49:40 +02:00
M
74cdf7cd7f Changed of electrum servers list. Changed default electrum server. 2020-12-30 20:35:34 +02:00
M
3e79f87ad6 Merged 4.0.94 into 4.1.0. 2020-12-30 20:24:53 +02:00
Oleksandr Sobol
18ba208e44 CAKE-221 | fixed string resources 2020-12-30 18:19:16 +02:00
OleksandrSobol
823e9d11ae CAKE-221 | added pendingTransactionFeeFiatAmount getter to send_view_model.dart; applied feeFiatAmount property instead transactionPriority in the confirm_sending_alert.dart; fixed base_alert_dialog.dart 2020-12-30 16:54:55 +02:00
OleksandrSobol
ac1709bffb CAKE-221 | added fiat amount to estimated fee; reworked confirm_sending_alert.dart; applied alert when transaction was committed 2020-12-29 20:48:57 +02:00
M
1c2b8c2023 Changed iOS project version to 4.0.94. 2020-12-29 19:22:22 +02:00
M
84ad97c0b0 Fixes for 4.0.94. Changed version for 4.0.94. 2020-12-29 18:55:58 +02:00
Tanner Silva
3bb4b534ed Merged with 4.1.0 2020-12-24 18:15:03 -06:00
OleksandrSobol
d93c706997 CAKE-208 | changed MoneroBalance to Balance property and handled BitcoinBalance case in the balance_view_model.dart 2020-12-24 22:57:32 +02:00
OleksandrSobol
bf98c72f67 CAKE-216 | merged 4.1.0 branch into current and resolved problems 2020-12-24 22:22:29 +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
2d49d4f093 CAKE-198 | fixed saving transaction description in the send_view_model.dart 2020-12-24 12:04:23 +02:00
OleksandrSobol
ac883f3b16 CAKE-198 | fixed saving transaction description in the send_view_model.dart 2020-12-24 11:01:27 +02:00
Oleksandr Sobol
44536a8231 CAKE-198 | fixed string resources (send_success) 2020-12-24 10:33:11 +02:00
Oleksandr Sobol
d7cc595179 CAKE-198 | changed hint text from "Note" to "Enter your note..."; changed color of the hint text in textfield_list_row 2020-12-23 19:14:11 +02:00
Oleksandr Sobol
cf5f212f33 CAKE-198 | fixed string resources 2020-12-23 15:04:57 +02:00
M
647577497d Changed android project version to 4.0.92 (23). 2020-12-23 14:51:58 +02:00
M
fd4efd46ea Fixes for 'std::bad_alloc' issue. 2020-12-23 14:48:04 +02:00
Oleksandr Sobol
139f223de8 CAKE-198 | fixed string resources 2020-12-23 10:39:59 +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
Tanner Silva
01df91c946 Changed how the "View in block explorer" cell is placed in the transaction details page 2020-12-21 18:47:26 -06:00
M
8067c07e94 Changed iOS project version to 4.1.0 (9). 2020-12-21 22:21:41 +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
b1e0bf0edd CAKE-208 | merged 4.1.0 branch into current and resolved problems 2020-12-18 21:42:00 +02:00
OleksandrSobol
6f386a1efe Merge branch '4.1.0' into CAKE-208-bug-after-balance-changing
# Conflicts:
#	lib/store/settings_store.dart
#	lib/view_model/dashboard/balance_view_model.dart
2020-12-18 21:33:43 +02:00
M
782de5d1d8 Merge branch '4.1.0' of github.com:cake-tech/cake_wallet_private into 4.1.0 2020-12-18 21:30:55 +02:00
M
bd2bab997f Added backsupport for old saved themes 2020-12-18 21:30:43 +02:00
M
98343bd480 Merge pull request #160 from cake-tech/CAKE-218-change-sync-status-text
Cake 218 change sync status text
2020-12-18 21:28:59 +02:00
M
4e4dfe33dd Merge pull request #159 from cake-tech/CAKE-217-reduce-space-on-the-transactions-list
Cake 217 reduce space on the transactions list
2020-12-18 21:28:29 +02:00
OleksandrSobol
dcb892b24c CAKE-217 | merged 4.1.0 branch into current and resolved problems 2020-12-18 21:24:05 +02:00
OleksandrSobol
9a2794fc7c Merge branch '4.1.0' into CAKE-217-reduce-space-on-the-transactions-list
# Conflicts:
#	lib/src/screens/dashboard/widgets/trade_row.dart
#	lib/src/screens/dashboard/widgets/transaction_raw.dart
2020-12-18 21:14:59 +02:00
OleksandrSobol
7168e4727d Merge branch '4.1.0' into CAKE-216-exchange-status-bug 2020-12-18 21:05:02 +02:00
M
89c240091b Merged btc and 4.1.0 branches. 2020-12-18 20:42:28 +02:00
OleksandrSobol
b59d633665 CAKE-217 | reduced space between rows in the trade_row.dart and transaction_raw.dart 2020-12-18 20:02:08 +02:00
M
89095bc7d4 Merge pull request #157 from cake-tech/CAKE-219-change-buttons-colors-fordark-mode
Cake 219 change buttons colors fordark mode
2020-12-18 18:52:12 +02:00
M
89cebac642 Merge pull request #154 from cake-tech/CAKE-182-light-theme
Cake 182 light theme
2020-12-18 18:52:02 +02:00
M
29ed9103e8 Merge pull request #156 from cake-tech/CAKE-210-fix-dot-or-comma-on-the-receive-screen
CAKE-210 | added possibility to enter comma in amount field (qr_widge…
2020-12-18 18:51:46 +02:00