Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-11-17 17:57:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
655 commits 165 branches 89 tags 106 MiB
Commit graph

550 commits

Author SHA1 Message Date
Oleksandr Sobol
ca0c0d1ad6 CAKE-185 | fixed string resources 2020-11-27 09:59:28 +02:00
Oleksandr Sobol
4f43e963bf CAKE-185 | fixed string resources 2020-11-27 09:52:10 +02:00
OleksandrSobol
623299b8f6 CAKE-185 | changed isValidAmount() in the exchange_view_model.dart 2020-11-27 08:50:28 +02:00
OleksandrSobol
4cb4ede2d3 CAKE-185 | added validation of amount for xmr.to provider in the exchange_page.dart; added isValidAmount() to exchange_view_model.dart 2020-11-26 21:04:05 +02:00
OleksandrSobol
900b7ffedc CAKE-191 | removed Scan the qr code from qr widget 2020-11-26 19:50:58 +02:00
OleksandrSobol
8cf6d73daa CAKE-193 | renamed receive screen button 2020-11-24 15:01:16 +02:00
OleksandrSobol
29b03628e6 CAKE-191 | removed Scan the QR code from receive page 2020-11-24 14:51:59 +02:00
OleksandrSobol
dd71edd8c8 CAKE-185 | fixed _amount in the changeDepositAmount() method (exchange_view_model.dart) 2020-11-24 14:42:26 +02:00
OleksandrSobol
e927df3712 CAKE-187 | added new btc address for validation (address_validator.dart) 2020-11-20 19:07:29 +02:00
OleksandrSobol
83fea0e9d3 CAKE-169 | made Save button disabled during testing connection to node (node_create_or_edit_page.dart) 2020-11-20 18:46:06 +02:00
OleksandrSobol
5787bac658 CAKE-158 | added _onMoneroBalanceChangeReaction instead _onMoneroTransactionsChangeReaction in the dashboard_view_model.dart 2020-11-20 18:27:56 +02:00
Oleksandr Sobol
88477751c6 CAKE-169 | fixed string resources 2020-11-20 17:47:24 +02:00
OleksandrSobol
6cd6139fb3 CAKE-169 | created connection_state.dart; added connect() method and connectionState parameter to node_create_or_edit_view_model.dart; replaced Reset button to Connect button and added _setEffects() method to node_create_or_edit_page.dart; changed useSSL parameter from false to true in the connectToNode() method (monero_wallet.dart) 2020-11-19 21:13:54 +02:00
OleksandrSobol
11464a79e6 CAKE-184 | cleaned exchange screen when exchange confirm page was called 2020-11-19 18:48:09 +02:00
OleksandrSobol
7aecb33044 CAKE-158 | merged 4.0.8 into current branch; renamed _onMoneroTransactionsChange() on _onMoneroTransactionsUpdate(); applied _onMoneroTransactionsUpdate() in the dashboard_view_model.dart 2020-11-18 19:09:34 +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
1afe4255a7 Another one fix for authentication bar disapearing. Changed build version to 20 for android, 4.0.8 (3) for iOS. 2020-11-17 14:31:09 +02:00
M
ce465ca622 Fixed authentication bar disapearing. Changed build version to 19 for android, 4.0.8 (2) for iOS. 2020-11-17 11:00:58 +02:00
M
6418b28c08 CAKE-177. CAKE-176. CAKE-115. 2020-11-16 20:17:03 +02:00
OleksandrSobol
f704bdc864 CAKE-158 | added calculating balance to _onAccountChangeReaction in the monero wallet; created _onMoneroAccountChange method in the dashboard_view_model.dart; added _onMoneroAccountChangeReaction and account filter to transaction list in the dashboard_view_model.dart 2020-11-13 20:29:01 +02:00
M
ba2b5fb1fa Fixes issue with loading old android wallets. Changed seed text field type to visual password. 2020-11-13 16:58:28 +02:00
M
58280d1bb2 Merge pull request #143 from cake-tech/CAKE-172-restore-and-rescan-screen-fixes 
CAKE-172 | added onHeightOrDateEntered function to blockchain_height_…
 2020-11-12 22:31:13 +02:00
M
3b4e6fc1bf Merge pull request #141 from cake-tech/CAKE-171-fiat-amount-displaying-bug-on-transaction-list 
CAKE-171 | fixed fiat amount displaying bug on transaction list; move…
 2020-11-12 22:25:38 +02:00
M
1a7c2d4d8a Merge pull request #142 from cake-tech/CAKE-168-blockheight-calculation-by-date 
Cake 168 blockheight calculation by date
 2020-11-12 22:20:46 +02:00
M
29247967e7 Fixes 2020-11-12 22:20:20 +02:00
M
c5d6826a07 Merge branch '4.0.4-fixes' of github.com:cake-tech/cake_wallet_private into 4.0.4-fixes 2020-11-12 22:02:47 +02:00
M
4e4cd08135 Hack for display login issue 2020-11-12 22:02:37 +02:00
M
381d559ea6 Merge pull request #140 from cake-tech/CAKE-147-make-back-button-bigger 
Cake 147 make back button bigger
 2020-11-12 21:48:17 +02:00
OleksandrSobol
d682f6504b CAKE-168 | fixed getHeightByDate method 2020-11-12 21:12:58 +02:00
OleksandrSobol
838368c1f4 CAKE-172 | added onHeightOrDateEntered function to blockchain_height_widget and called it in the restoreHeightController listener; added string resources to blockchain_height_widget; added isButtonEnabled parameter to rescan view model and wallet restore view model; added reaction on mode in the wallet restore page; applied isDisable to buttons in wallet restore page and rescan page 2020-11-12 21:03:57 +02:00
M
e8f53766a0 Added selection of new wallet type. Returned support of bitcoin wallet. 2020-11-12 18:31:53 +02:00
OleksandrSobol
70467b1fe7 CAKE-168 | fixed blockheight calculation by date; changed getHeightByDate method; changed first date in the date picker to 1 of May, 2014 2020-11-12 17:46:05 +02:00
OleksandrSobol
7bbc14d549 CAKE-171 | fixed fiat amount displaying bug on transaction list; moved calculating price, type of fiat currency and display mode to transaction list item 2020-11-12 11:32:57 +02:00
M
36b8cc9086 Merge pull request #137 from cake-tech/CAKE-160-remove-digit-after-dots-for-cryptobalance 
CAKE-160 | added to format_amount.dart case when amount contains ',' …
 2020-11-11 21:03:33 +02:00
OleksandrSobol
c18fb9e31b CAKE-147 | changed size of arrow_back_ios icon from 24 to 16 2020-11-11 20:52:46 +02:00
M
65c2abdedc Cleaned unneded logs 2020-11-11 18:06:19 +02:00
M
ad3142aeb9 Changed app font to Lato. Changes for anrdoid version 2020-11-11 17:55:18 +02:00
M
882c57a132 CAKE-91 2020-11-11 11:49:46 +02:00
M
f5e19a13ab Fixes. 2020-11-11 00:24:50 +02:00
M
93049b4aa1 Fixes for exchanges. CAKE-159. 2020-11-10 16:58:40 +02:00
M
c86c44a936 CAKE-161 2020-11-10 13:46:58 +02:00
M
03f47e393c Fixes. 2020-11-10 01:14:47 +02:00
OleksandrSobol
5ce4fe7407 CAKE-160 | added to format_amount.dart case when amount contains ',' symbol 2020-11-09 18:09:04 +02:00
OleksandrSobol
c729f86ac8 CAKE-147 | changed back button image to arrow_back_ios icon with size 24; changed size of leading to 37 (base page) 2020-11-09 17:01:58 +02:00
M
5c4e1b4d01 Fixes. 2020-11-08 22:44:09 +02:00
M
b17e7744c6 Fixes 2020-11-06 20:54:00 +02:00
M
8a55d566c6 Fixed migration for pin length. Fixed issue for change of current address on dashboard address page. 2020-11-06 15:12:38 +02:00
M
164fb8b916 Updated xmr.to description 2020-11-04 19:38:18 +02:00
M
fdb0f49f88 Fixes. 2020-11-04 17:54:44 +02:00
M
a7a0f59b9c Merge branch 'new-world' of github.com:cake-tech/cake_wallet_private into new-world 2020-11-04 00:29:15 +02:00
M
7e33f1ae0a CAKE-150 2020-11-04 00:29:06 +02:00
M
73133d71fe Merge pull request #133 from cake-tech/CAKE-143-implement-newexchange-alert 
Cake 143 implement newexchange alert
 2020-11-04 00:08:07 +02:00
M
96c9542704 Merge pull request #134 from cake-tech/CAKE-144-exchange-screen-fixes 
CAKE-144 | changed string resources on the exchange page
 2020-11-04 00:06:52 +02:00
M
bea3a3d88e Merge pull request #135 from cake-tech/CAKE-145-pre-release-fixes 
CAKE-145 | changed twitter link and name on the settings page; change…
 2020-11-04 00:06:13 +02:00
M
76581505a0 CAKE-149 2020-11-03 18:57:36 +02:00
Oleksandr Sobol
68fa60954d CAKE-145 | changed twitter link and name on the settings page; changed text on the rescan page; changed reconnect alert text; changed button color on create account and create new subaddress pages; changed title of create new subaddress page 2020-11-02 18:11:51 +02:00
Oleksandr Sobol
c65efd9452 CAKE-144 | changed string resources on the exchange page 2020-11-02 16:03:19 +02:00
Oleksandr Sobol
b642f9986f CAKE-143 | added localization to exchange alert 2020-11-02 15:02:40 +02:00
OleksandrSobol
7ce30e08b0 CAKE-143 | added status parameter to exchange_view_model.dart; called alert when user tries exchange deposit xmr currency but wallet is not synchronized 2020-11-02 13:33:45 +02:00
M
5524efb44d Merge pull request #131 from cake-tech/CAKE-133-add-localization 
CAKE-133 | added localization to change current wallet alert, to crea…
 2020-10-30 19:43:05 +02:00
M
a8e62188aa Merge pull request #132 from cake-tech/CAKE-141-xmr_to-exchange-screen-description 
CAKE-141 | changed description for xmr.to on exchange and exchange te…
 2020-10-30 19:37:23 +02:00
M
8117a993f1 Merge pull request #129 from cake-tech/CAKE-135-validation-alert 
CAKE-135 | removed validation alert in the send and exchange pages wh…
 2020-10-30 19:36:09 +02:00
M
827cda617b Merge pull request #130 from cake-tech/CAKE-136-user-can't-add-node-address-with-dash 
CAKE-136 | added "-" symbol to node_address_validator.dart; changed m…
 2020-10-30 19:35:51 +02:00
Oleksandr Sobol
11d85accec CAKE-141 | changed description for xmr.to on exchange and exchange template pages 2020-10-30 19:28:20 +02:00
Oleksandr Sobol
0473d342f3 CAKE-133 | added localization to change current wallet alert, to create new wallet popup, to seed alert 2020-10-30 18:40:42 +02:00
M
9f498f30a2 CAKE-134. CAKE-139. FIXES. 2020-10-30 18:32:21 +02:00
M
ed72cee3f4 CAKE-137 2020-10-30 15:56:23 +02:00
M
f59812fe4a CAKE-83 2020-10-30 15:33:03 +02:00
OleksandrSobol
9748caf407 CAKE-136 | added "-" symbol to node_address_validator.dart; changed minLength from 1 to 0 in the node_port_validator.dart 2020-10-30 15:11:20 +02:00
OleksandrSobol
18e2df4f40 CAKE-135 | removed validation alert in the send and exchange pages when clear/reset buttons was pushed (applied _formKey.currentState.reset()) 2020-10-30 14:42:23 +02:00
M
68f748b09a Changed min ios version to 11.0. Fixes. 2020-10-30 12:39:07 +02:00
M
596706fd2e Merge branch 'new-world' of github.com:cake-tech/cake_wallet_private into new-world 2020-10-29 20:10:19 +02:00
M
882f13011c Fixes. 2020-10-29 20:10:09 +02:00
M
e7574c51f6 Merge pull request #127 from cake-tech/CAKE-130-change-exchange-screen 
Cake 130 change exchange screen
 2020-10-29 20:06:46 +02:00
M
9decb7d324 Merge pull request #126 from cake-tech/CAKE-129-add-new-btc-address-in-the-validation 
CAKE-129 | added new length of the new btc address in the address val…
 2020-10-29 20:04:40 +02:00
M
ee60244dc2 Merge pull request #125 from cake-tech/CAKE-123-change-telegram-bot-name 
CAKE-123 | changed Telegram bot name in the settings page
 2020-10-29 20:04:13 +02:00
M
b8e435ea8e Fixes. 2020-10-29 12:49:07 +02:00
Oleksandr Sobol
863a18ea78 CAKE-130 | fixed string resources 2020-10-28 20:20:07 +02:00
OleksandrSobol
bf491c7d14 CAKE-130 | confirmation button shown only for pairs when user send xmr; if provider is xmr.to then button title is Confirm, else button title is Send XMR 2020-10-28 19:33:04 +02:00
OleksandrSobol
692c460988 CAKE-129 | added new length of the new btc address in the address validator 2020-10-26 19:28:36 +02:00
OleksandrSobol
4dce12e2df CAKE-123 | changed Telegram bot name in the settings page 2020-10-26 19:19:48 +02:00
M
44e55f0bc4 Changed background and text colors of confirm buttons on disclaimer and restore wallet screens. 2020-10-26 11:58:16 +02:00
M
f7fe9d76a5 Merge branch 'new-world' of github.com:cake-tech/cake_wallet_private into new-world 2020-10-26 11:38:22 +02:00
M
e2c6cb6f4b Fixed loading of setup pin screen from welcome screen for restore case. Renamed 'Next' to 'Restore' for confirm button on restore wallet screen. Removed 'Bitcoin' from welcome screen. 2020-10-26 11:38:01 +02:00
Tanner Silva
cd5426da81 generateName() now returns strings with capitalized words 2020-10-24 13:51:12 -05:00
M
082a5f0b6c Fixes 2020-10-24 17:35:55 +03:00
M
71e02f429d Merge branch 'new-world' of github.com:cake-tech/cake_wallet_private into rework-restore-wallet 2020-10-24 15:55:31 +03:00
M
588d93c1a4 Fixes 2020-10-24 15:55:24 +03:00
M
db7e36962b Merge pull request #124 from cake-tech/CAKE-126-unite-show-seed-and-show-keys-screens 
Cake 126 unite show seed and show keys screens
 2020-10-23 18:41:20 +03:00
M
57eaeb547b Merge pull request #121 from cake-tech/CAKE-116-all-button-validation-bug 
CAKE-116 | added AllAmountValidator class to the amount_validator.dar…
 2020-10-22 21:30:32 +03:00
M
d881317a76 Merge pull request #122 from cake-tech/CAKE-119-make-qr-code-more-bright-on-the-dark-mode 
CAKE-119 | applied white color to qr code on the dark mode (qr widget…
 2020-10-22 21:29:49 +03:00
M
8f1c543e8e Merge pull request #123 from cake-tech/CAKE-120-xmr_to-exchange-description 
CAKE-120 | added xmr.to exchange description to exchange and exchange…
 2020-10-22 21:29:02 +03:00
M
0c197660a8 Integrated wallet names generation 2020-10-22 21:24:24 +03:00
Oleksandr Sobol
1f1f6e3e57 CAKE-126 | fixed string resources 2020-10-22 20:41:51 +03:00
OleksandrSobol
753e898112 CAKE-126 | added seed item to wallet_keys_view_model; changed title of wallet_keys_page; created wallet menu item; applied wallet menu item to wallet menu; removed show seed item from wallet menu 2020-10-22 19:50:53 +03:00
M
62cf0d0b4c Merged cake-105 2020-10-22 18:20:26 +03:00
M
cba4188665 Comments. 2020-10-22 18:11:52 +03:00
M
aa120c33b1 Updates 2020-10-20 15:09:49 +03:00
Tanner Silva
d7f829042b added fucntion to WalletCreationVMBase to generate random wallet names. Wallet name generator follows this format <ADJECTIVE><space><NOUN> 2020-10-19 12:21:53 -05:00
Tanner Silva
ca5b4c7cc7 corrected error with salt secret 2020-10-19 11:17:21 -05:00
M
ad695db5f6 Update welcome_page.dart 
Fix mistake after merge conflict
 2020-10-19 18:42:41 +03:00
M
6b86cfbea2 Updated to flutter v1.22.2 2020-10-19 14:20:24 +03:00
M
598b8c9b9c TMP 2020-10-14 00:11:04 +03:00
OleksandrSobol
a0d57084f2 CAKE-119 | applied white color to qr code on the dark mode (qr widget and exchange trade page) 2020-10-12 20:11:20 +03:00
OleksandrSobol
20c35451d5 CAKE-120 | added xmr.to exchange description to exchange and exchange template pages; made observable isReceiveAmountEntered parameter in the exchange view model; added isReceiveAmountEntered parameter to applyTemplate() (exchange page) and reset() (exchange view model); added possibility to enter amount in receive card (exchange template page) 2020-10-12 19:47:01 +03:00
M
9a169254a6 Fixes 2020-10-12 11:47:20 +03:00
OleksandrSobol
dea8f872d5 CAKE-116 | merged new world branch into current 2020-10-09 23:19:12 +03:00
OleksandrSobol
8495122bcd Merge branch 'new-world' into CAKE-116-all-button-validation-bug 
# Conflicts:
#	lib/src/screens/send/send_page.dart
 2020-10-09 22:45:04 +03:00
M
9cb7e77a5e Merge pull request #119 from cake-tech/CAKE-92-templates-saving-bug 
CAKE-92 | fixed templates saving bug on send and exchange pages; adde…
 2020-10-09 21:36:08 +03:00
M
f9cc21478a TMP 2020-10-09 21:34:21 +03:00
OleksandrSobol
0b6b711618 CAKE-116 | added AllAmountValidator class to the amount_validator.dart; applied all amount validator to the send page; added fiat amount controller to the send page 2020-10-09 10:41:29 +03:00
OleksandrSobol
f42e398c80 CAKE-114 | removed disclaimer alert 2020-10-09 09:20:42 +03:00
OleksandrSobol
f6e099eb0a CAKE-114 | applied disclaimer page when user install wallet first time; applied route to disclaimer page as initial route (main.dart); change leading widget in the disclaimer page; applied call of welcome page when user press accept button in the disclaimer page 2020-10-08 19:38:33 +03:00
OleksandrSobol
521d7294a7 CAKE-92 | fixed templates saving bug on send and exchange pages; added comma for keyboard on templates pages; added fiat amount controller to send page; added crypto amount and fiat amount controllers to send template pages; added send template store to send view model; added updateTemplate(), addTemplate(), removeTemplate() to send view model and exchange view model; fixed remove template alert on send and exchange pages 2020-10-07 08:58:22 +03:00
M
a8695cc560 Merge pull request #117 from cake-tech/CAKE-97-date-picker-for-ios 
Cake 97 date picker for ios
 2020-10-06 14:43:39 +03:00
M
961e4203f1 Merge pull request #116 from cake-tech/CAKE-104-add-description-for-exchange-provider-picker 
Cake 104 add description for exchange provider picker
 2020-10-06 14:42:05 +03:00
M
7aacfb55fa Merge pull request #115 from cake-tech/CAKE-103-change-refund-address-position-on-exchange-screen 
Cake 103 change refund address position on exchange screen
 2020-10-06 14:40:41 +03:00
M
0cc83dd9ee Merge pull request #114 from cake-tech/CAKE-101-change-buttons-position-on-confirm-sending-alert 
CAKE-101 | changed buttons position on confirm sending alert; added p…
 2020-10-06 14:39:39 +03:00
M
81f03220ee Merge pull request #113 from cake-tech/CAKE-99-change-paste-icon 
CAKE-99 | added paste_ios.png and removed duplicate.png; applied ios …
 2020-10-06 14:39:19 +03:00
OleksandrSobol
0f9b509530 Merge branch 'new-world' into CAKE-97-date-picker-for-ios 
# Conflicts:
#	pubspec.lock
 2020-10-05 21:10:41 +03:00
OleksandrSobol
a124cd810a CAKE-103 | fixed placeholder of address text field (deposit card) 2020-10-05 20:55:46 +03:00
OleksandrSobol
17fa8bcf92 CAKE-104 | fixed show pop up 2020-10-02 21:00:30 +03:00
Oleksandr Sobol
1b94de3cfb CAKE-104 | fixed string resources 2020-10-02 20:51:07 +03:00
OleksandrSobol
33e29a7132 CAKE-99 | added paste_ios.png and removed duplicate.png; applied ios paste icon to address_text_field 2020-10-02 20:28:34 +03:00
M
04e7c18841 Fixes and improvments. 2020-10-02 20:28:29 +03:00
OleksandrSobol
738d719fec CAKE-104 | added description parameter to the picker; applied description text in the present provider picker 2020-10-02 19:30:13 +03:00
OleksandrSobol
468ad82b37 CAKE-103 | added hasRefundAddress parameter to exchange card; applied refund address to deposit card on the exchange page 2020-10-02 18:49:45 +03:00
OleksandrSobol
0b0b5016b9 CAKE-101 | changed buttons position on confirm sending alert; added poppins font to confirm sending alert 2020-10-01 20:51:30 +03:00
OleksandrSobol
ae6291179e CAKE-97 | created date_picker for Android and iOS; applied date picker to blockchain_height_widget 2020-10-01 20:29:06 +03:00
M
cf9cc1369d Merge pull request #112 from cake-tech/CAKE-79-add-ability-to-flip-balance-on-the-main-screen 
Cake 79 add ability to flip balance on the main screen
 2020-10-01 19:47:03 +03:00
M
599e9bee64 Merge branch 'new-world' of github.com:cake-tech/cake_wallet_private into new-world 2020-10-01 19:46:28 +03:00
M
2eb229b91e Fixes for gray screen bug. 2020-10-01 19:46:23 +03:00
M
f5707e6610 Merge pull request #109 from cake-tech/CAKE-43-xmr_to-amount-entering 
Cake 43 xmr to amount entering
 2020-10-01 18:38:34 +03:00
M
90d33bc9fa Merge pull request #110 from cake-tech/CAKE-54-usdterc20-for-changenow 
Cake 54 usdterc20 for changenow
 2020-10-01 18:38:21 +03:00
M
606f4e59c5 Changed subaddress sorting. 2020-10-01 13:52:49 +03:00
M
fe147ff9ed Fixes 2020-09-30 21:23:15 +03:00
OleksandrSobol
97226ad5eb CAKE-43 | merged new world branch into current 2020-09-30 20:34:18 +03:00
OleksandrSobol
0c65c8d04d Merge branch 'new-world' into CAKE-43-xmr_to-amount-entering 
# Conflicts:
#	lib/src/screens/exchange/exchange_page.dart
 2020-09-30 20:21:57 +03:00
Oleksandr Sobol
32b0de916e CAKE-79 | fixed string resources 2020-09-29 22:32:19 +03:00
M
6da61649cb Merge branch 'new-world' of github.com:cake-tech/cake_wallet_private into new-world 2020-09-29 20:56:31 +03:00
M
696b808698 Fixes 2020-09-29 20:56:11 +03:00
OleksandrSobol
1800070fc1 CAKE-79 | added ability to flip balance on dashboard page; added isReversing, displayMode and savedDisplayMode to balance_view_model; added display mode to balance page 2020-09-29 11:45:35 +03:00
M
a034f33fba Merge pull request #111 from cake-tech/CAKE-65-change-rrescan-screen 
CAKE-65 | changed color of the rescan button on rescan page; added te…
 2020-09-28 22:57:37 +03:00
M
e08e10bc35 Fixes 2020-09-28 22:02:30 +03:00
OleksandrSobol
75a30c7567 CAKE-54 | merged new world branch into current 2020-09-28 21:47:45 +03:00
OleksandrSobol
69b58d827b Merge branch 'new-world' into CAKE-54-usdterc20-for-changenow 2020-09-28 21:42:38 +03:00
OleksandrSobol
e81c75be35 CAKE-43 | merged new world branch into current 2020-09-28 21:39:24 +03:00
OleksandrSobol
56258de341 Merge branch 'new-world' into CAKE-43-xmr_to-amount-entering 
# Conflicts:
#	lib/src/screens/dashboard/dashboard_page.dart
 2020-09-28 21:31:58 +03:00