From fe9deecd03779156f9c816df23f5d5e31f198fae Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Wed, 29 Jul 2020 19:55:42 +0300
Subject: [PATCH 01/15] CAKE-20 | updated send and send template pages; added
 send_template_store and exchange_template_store; created base_send_widget;
 applied send_template_store to send_view_model; applied base_send_widget to
 send and send template pages; added properties to address_text_field,
 base_text_field and template_tile

---
 assets/fonts/Poppins-SemiBold.ttf             | Bin 0 -> 155192 bytes
 assets/images/2.0x/duplicate.png              | Bin 0 -> 549 bytes
 assets/images/3.0x/duplicate.png              | Bin 0 -> 603 bytes
 assets/images/duplicate.png                   | Bin 0 -> 403 bytes
 lib/core/amount_validator.dart                |   4 +-
 lib/core/template_validator.dart              |  12 +
 lib/core/validator.dart                       |   4 +-
 lib/di.dart                                   |  21 +-
 lib/generated/i18n.dart                       | 139 +++--
 lib/main.dart                                 |   8 +-
 lib/palette.dart                              |   5 +
 lib/router.dart                               |   7 +-
 lib/src/screens/base_page.dart                |   8 +-
 lib/src/screens/send/send_page.dart           | 563 +-----------------
 lib/src/screens/send/send_template_page.dart  | 272 +--------
 .../send/widgets/base_send_widget.dart        | 541 +++++++++++++++++
 lib/src/widgets/address_text_field.dart       | 207 ++++---
 lib/src/widgets/base_text_form_field.dart     |   7 +-
 lib/src/widgets/template_tile.dart            | 191 ++++--
 .../templates/exchange_template_store.dart    |  40 ++
 lib/store/templates/send_template_store.dart  |  34 ++
 lib/view_model/send_view_model.dart           | 143 ++++-
 pubspec.yaml                                  |   1 +
 res/values/strings_de.arb                     |  10 +-
 res/values/strings_en.arb                     |  10 +-
 res/values/strings_es.arb                     |  10 +-
 res/values/strings_hi.arb                     |  10 +-
 res/values/strings_ja.arb                     |  10 +-
 res/values/strings_ko.arb                     |  10 +-
 res/values/strings_nl.arb                     |  10 +-
 res/values/strings_pl.arb                     |  10 +-
 res/values/strings_pt.arb                     |  10 +-
 res/values/strings_ru.arb                     |  10 +-
 res/values/strings_uk.arb                     |  10 +-
 res/values/strings_zh.arb                     |  10 +-
 35 files changed, 1272 insertions(+), 1055 deletions(-)
 create mode 100644 assets/fonts/Poppins-SemiBold.ttf
 create mode 100644 assets/images/2.0x/duplicate.png
 create mode 100644 assets/images/3.0x/duplicate.png
 create mode 100644 assets/images/duplicate.png
 create mode 100644 lib/core/template_validator.dart
 create mode 100644 lib/src/screens/send/widgets/base_send_widget.dart
 create mode 100644 lib/store/templates/exchange_template_store.dart
 create mode 100644 lib/store/templates/send_template_store.dart

diff --git a/assets/fonts/Poppins-SemiBold.ttf b/assets/fonts/Poppins-SemiBold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..dabf7c242e938c49fccd0cba88dc2fdccb2f65ee
GIT binary patch
literal 155192
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
Oh8&vYWJfULBL4$JU)8+;

literal 0
HcmV?d00001

diff --git a/assets/images/2.0x/duplicate.png b/assets/images/2.0x/duplicate.png
new file mode 100644
index 0000000000000000000000000000000000000000..b377d0a9d367d50efd833cb035215cee8ed56cd5
GIT binary patch
literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0lG;<K~#7F?N?1s
z!ax*$Z>Ie0@CNn<gbjwc=?(A()D4EXAZR3UrLJ5Eh8@A3H}D8$MR3(4^a!jW&U2<r
zo5o1f#QtF5O9)@5uYE5w@8>Iy-aaQl)Q1d!03Ius8-vTnYL^Ym%DDmom|yF4JI=-k
z8KQ$k4x|A@lZfmjreOfe`R&!&6QqEb>B2(B>?F1f3dS)219HM>w!A<gPJ(M<Y{i9e
za|=LLMqfI$qDz7?uh1h<eImCV5C8)Mv8K5Vx=-X5z_8nN13sQDEz<mOsvrs>#GEnq
zSXcmey_O^Y)bBu#Ks6;<1?|EDkV2(Sh_>R#VYEj{NMtG{11W%WUKd1(Y{LLlQlL(Z
zzapt~KLBa!$*eRXBOrnMb8RiedxdkyzyCa4m=(jQLqsg3=N-M9ZgUR%42-+!%WKXb
z6c?M#V0eA*LJD}DEjvQzTWlwkHL5-^EZ?wHszFLnN(l6O|IaXzGu&26M)SEIsav%x
zd;4$CsBFLQwLHbg(}fL;ohmL%-U3~!$%m0VvrtBD#f0N8%c({?`iCwx&v(jsC)jp~
n^oiIbVAbje=@(=HxpR|mDRG&hWD`;k00000NkvXXu0mjfQ}N`T

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/duplicate.png b/assets/images/3.0x/duplicate.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fbef4bf2302b95cb379bcc4e0d3d919c7ebd628
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0q{vgK~#7F?V7Pp
z!!Qs)&v6>o{sH9+5DWz-$`>?z0j-26jG!>n8BwJh>V*0S<qxu<j{HIRgO05#dYn;<
z+z_Bi)z}t(L#vAu+n4z4yR+H-<4c1(PKW?yP|tvSUh}%SH(K=phdO_!N#_Or`($#K
z<pGB}UjdC^jAeS6?zaj6VknUL*Uvoy+(cz@&^p+G0_l(qqT@V4P8={CtAJ{(0;(}y
z0T(ppp*QqtUD{166YCZ8yl1TyV2E{OtdUlR;%7RI%pO9BHERQ#WQN%1j73Y=0J<Rg
zPFgE)dvz2guXTFEw(S1fbwD-Nh>He!sV2+DDG;3Rzsa(-0o52cggza-+02ZEEDiEP
zLrMZv7P7Sg)mQ~oV---%(lkm_R9WOIp-4DCrqB@bl3WMM>m*upu}0?w=6R!tG3_CI
z$u5YPlcIaj1%$zG#lhv_i7dOkR63oG$3AT}ZG&Ry%|<t^>MK|bf@Qf`xUys~^@U6Z
z)lW-(Y!XVVgw$?6cUmM`<y<98B%KPvr-myF!MYNv`QI@y*+f_5D&=b;ZzHEZ=9?7Z
zUv-gf#lb~&X^|2J3u4U6_a#mitfjyzyX+zWmt)u;>q_&9XtqJgVAIGngs72~PmvUX
pI9ZTM0lu}>r@sN{!H9-t`vW<Nhc@Q2%n<+p002ovPDHLkV1izs1NQ&`

literal 0
HcmV?d00001

diff --git a/assets/images/duplicate.png b/assets/images/duplicate.png
new file mode 100644
index 0000000000000000000000000000000000000000..99cfd4ca23304e2c1a3166b4035928f5ef03e4f4
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0VqjCK~#7Fol`+d
z!%z^-%p{VH7;lgpSX^}DCOt|)x^bf-Ze0qBbS1@Aa|3$=>q3eva|7EOWL?Z3=LHIy
zhS2_jBtMh?US{5#PfstO-x>sIuxm(^-khJVHm_j~R=s5Aq7z7zIOk@~bch?k*Q5S>
z7k)fhq_#0=CD=FaL1q!hap^^H!2E{RtM$5M9|DyqBj<*;OuPu-0*e$T{@kkt#MP(|
z*9P7M56>Sxj-s(w3kYIPtc9$uz^SHY&8iFVW2#e29t5RbdBpn_W58vln$z9%D><z6
zXjkChbAb3)6~@(JNX+Nv#%4TD7MUG^>6QzaFx9GODj(looE1>J77X8<D>pe2Ie~Vq
xHrkZUNMvry0jz@Bb)G1<$56uX6=3_>@)y+eYx0aEu*3iW002ovPDHLkV1kZ8rELHJ

literal 0
HcmV?d00001

diff --git a/lib/core/amount_validator.dart b/lib/core/amount_validator.dart
index 0394e9244..0aa0aba23 100644
--- a/lib/core/amount_validator.dart
+++ b/lib/core/amount_validator.dart
@@ -13,10 +13,10 @@ class AmountValidator extends TextValidator {
   static String _pattern(WalletType type) {
     switch (type) {
       case WalletType.monero:
-        return '^([0-9]+([.][0-9]{0,12})?|[.][0-9]{1,12})\$';
+        return '^([0-9]+([.][0-9]{0,12})?|[.][0-9]{1,12}|ALL)\$';
       case WalletType.bitcoin:
         // FIXME: Incorrect pattern for bitcoin
-        return '^([0-9]+([.][0-9]{0,12})?|[.][0-9]{1,12})\$';
+        return '^([0-9]+([.][0-9]{0,12})?|[.][0-9]{1,12}|ALL)\$';
       default:
         return '';
     }
diff --git a/lib/core/template_validator.dart b/lib/core/template_validator.dart
new file mode 100644
index 000000000..85fe66287
--- /dev/null
+++ b/lib/core/template_validator.dart
@@ -0,0 +1,12 @@
+import 'package:cake_wallet/core/validator.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+
+class TemplateValidator extends TextValidator {
+  TemplateValidator()
+      : super(
+          minLength: 0,
+          maxLength: 0,
+          pattern: '''^[^`,'"]{1,20}\$''',
+          errorMessage: S.current.error_text_template
+        );
+}
\ No newline at end of file
diff --git a/lib/core/validator.dart b/lib/core/validator.dart
index 066367eed..312c7f356 100644
--- a/lib/core/validator.dart
+++ b/lib/core/validator.dart
@@ -27,7 +27,7 @@ class TextValidator extends Validator<String> {
   @override
   bool isValid(String value) {
     if (value == null || value.isEmpty) {
-      return true;
+      return false;
     }
 
     return value.length > (minLength ?? 0) &&
@@ -42,4 +42,4 @@ class TextValidator extends Validator<String> {
 class WalletNameValidator extends TextValidator {
   WalletNameValidator()
       : super(minLength: 1, maxLength: 15, pattern: '^[a-zA-Z0-9_]\$');
-}
+}
\ No newline at end of file
diff --git a/lib/di.dart b/lib/di.dart
index e8f878327..56e5eeb3a 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -7,6 +7,7 @@ import 'package:cake_wallet/src/screens/contact/contact_page.dart';
 import 'package:cake_wallet/src/screens/nodes/node_create_or_edit_page.dart';
 import 'package:cake_wallet/src/screens/nodes/nodes_list_page.dart';
 import 'package:cake_wallet/src/screens/seed/wallet_seed_page.dart';
+import 'package:cake_wallet/src/screens/send/send_template_page.dart';
 import 'package:cake_wallet/src/screens/settings/settings.dart';
 import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
 import 'package:cake_wallet/store/contact_list_store.dart';
@@ -57,6 +58,10 @@ import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:cake_wallet/store/dashboard/trade_filter_store.dart';
 import 'package:cake_wallet/store/dashboard/transaction_filter_store.dart';
 import 'package:cake_wallet/store/dashboard/fiat_convertation_store.dart';
+import 'package:cake_wallet/store/templates/send_template_store.dart';
+import 'package:cake_wallet/store/templates/exchange_template_store.dart';
+import 'package:cake_wallet/src/domain/common/template.dart';
+import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
 
 final getIt = GetIt.instance;
 
@@ -83,7 +88,9 @@ Future setup(
     {Box<WalletInfo> walletInfoSource,
     Box<Node> nodeSource,
     Box<Contact> contactSource,
-    Box<Trade> tradesSource}) async {
+    Box<Trade> tradesSource,
+    Box<Template> templates,
+    Box<ExchangeTemplate> exchangeTemplates}) async {
   getIt.registerSingletonAsync<SharedPreferences>(
       () => SharedPreferences.getInstance());
 
@@ -110,6 +117,10 @@ Future setup(
       TradeFilterStore(wallet: getIt.get<AppStore>().wallet));
   getIt.registerSingleton<TransactionFilterStore>(TransactionFilterStore());
   getIt.registerSingleton<FiatConvertationStore>(FiatConvertationStore());
+  getIt.registerSingleton<SendTemplateStore>(
+      SendTemplateStore(templateSource: templates));
+  getIt.registerSingleton<ExchangeTemplateStore>(
+      ExchangeTemplateStore(templateSource: exchangeTemplates));
 
   getIt.registerFactory<KeyService>(
       () => KeyService(getIt.get<FlutterSecureStorage>()));
@@ -198,11 +209,17 @@ Future setup(
               getIt.get<WalletAddressEditOrCreateViewModel>(param1: item)));
 
   getIt.registerFactory<SendViewModel>(() => SendViewModel(
-      getIt.get<AppStore>().wallet, getIt.get<AppStore>().settingsStore));
+      getIt.get<AppStore>().wallet,
+      getIt.get<AppStore>().settingsStore,
+      getIt.get<FiatConvertationStore>(),
+      getIt.get<SendTemplateStore>()));
 
   getIt.registerFactory(
       () => SendPage(sendViewModel: getIt.get<SendViewModel>()));
 
+  getIt.registerFactory(
+          () => SendTemplatePage(sendViewModel: getIt.get<SendViewModel>()));
+
   getIt.registerFactory(() => WalletListViewModel(
       walletInfoSource, getIt.get<AppStore>(), getIt.get<KeyService>()));
 
diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart
index 512866c0e..261e73f6d 100644
--- a/lib/generated/i18n.dart
+++ b/lib/generated/i18n.dart
@@ -56,6 +56,8 @@ class S implements WidgetsLocalizations {
   String get choose_wallet_currency => "Please choose wallet currency:";
   String get clear => "Clear";
   String get confirm => "Confirm";
+  String get confirm_delete_template => "This action will delete this template. Do you wish to continue?";
+  String get confirm_delete_wallet => "This action will delete this wallet. Do you wish to continue?";
   String get confirm_sending => "Confirm sending";
   String get contact => "Contact";
   String get contact_name => "Contact Name";
@@ -183,14 +185,13 @@ class S implements WidgetsLocalizations {
   String get send_estimated_fee => "Estimated fee:";
   String get send_fee => "Fee:";
   String get send_got_it => "Got it";
-  String get send_monero_address => "Monero address";
   String get send_name => "Name";
   String get send_new => "New";
   String get send_payment_id => "Payment ID (optional)";
   String get send_sending => "Sending...";
   String get send_success => "Your Monero was successfully sent";
   String get send_templates => "Templates";
-  String get send_title => "Send Monero";
+  String get send_title => "Send";
   String get send_xmr => "Send XMR";
   String get send_your_wallet => "Your wallet";
   String get sending => "Sending";
@@ -234,6 +235,7 @@ class S implements WidgetsLocalizations {
   String get sync_status_starting_sync => "STARTING SYNC";
   String get sync_status_syncronized => "SYNCHRONIZED";
   String get sync_status_syncronizing => "SYNCHRONIZING";
+  String get template => "Template";
   String get today => "Today";
   String get trade_details_created_at => "Created at";
   String get trade_details_fetching => "Fetching";
@@ -316,6 +318,7 @@ class S implements WidgetsLocalizations {
   String openalias_alert_content(String recipient_name) => "You will be sending funds to\n${recipient_name}";
   String powered_by(String title) => "Powered by ${title}";
   String router_no_route(String name) => "No route defined for ${name}";
+  String send_address(String cryptoCurrency) => "${cryptoCurrency} address";
   String send_priority(String transactionPriority) => "Currently the fee is set at ${transactionPriority} priority.\nTransaction priority can be adjusted in the settings";
   String time(String minutes, String seconds) => "${minutes}m ${seconds}s";
   String trade_details_copied(String title) => "${title} copied to Clipboard";
@@ -677,6 +680,8 @@ class $de extends S {
   @override
   String get sync_status_syncronized => "SYNCHRONISIERT";
   @override
+  String get template => "Vorlage";
+  @override
   String get transaction_priority_medium => "Mittel";
   @override
   String get transaction_details_transaction_id => "Transaktions-ID";
@@ -725,6 +730,8 @@ class $de extends S {
   @override
   String get trade_not_created => "Handel nicht angelegt.";
   @override
+  String get confirm_delete_wallet => "Diese Aktion löscht diese Brieftasche. Möchten Sie fortfahren?";
+  @override
   String get restore_wallet_name => "Walletname";
   @override
   String get widgets_seed => "Seed";
@@ -733,6 +740,8 @@ class $de extends S {
   @override
   String get rename => "Umbenennen";
   @override
+  String get confirm_delete_template => "Diese Aktion löscht diese Vorlage. Möchten Sie fortfahren?";
+  @override
   String get restore_active_seed => "Aktives Seed";
   @override
   String get send_name => "Name";
@@ -793,7 +802,7 @@ class $de extends S {
   @override
   String get send => "Senden";
   @override
-  String get send_title => "Senden Sie Monero";
+  String get send_title => "Senden Sie";
   @override
   String get error_text_keys => "Walletschlüssel können nur 64 hexadezimale Zeichen enthalten";
   @override
@@ -877,8 +886,6 @@ class $de extends S {
   @override
   String get restore_description_from_backup => "Sie können die gesamte Cake Wallet-App von wiederherstellen Ihre Sicherungsdatei";
   @override
-  String get send_monero_address => "Monero-Adresse";
-  @override
   String get error_text_node_port => "Der Knotenport kann nur Nummern zwischen 0 und 65535 enthalten";
   @override
   String get add_new_word => "Neues Wort hinzufügen";
@@ -925,6 +932,8 @@ class $de extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "Handel für ${provider} wird nicht erstellt. Menge ist mehr als maximal: ${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "${cryptoCurrency}-Adresse";
+  @override
   String min_value(String value, String currency) => "Mindest: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "Authentifizierung fehlgeschlagen. ${state_error}";
@@ -1297,6 +1306,8 @@ class $hi extends S {
   @override
   String get sync_status_syncronized => "सिंक्रनाइज़";
   @override
+  String get template => "खाका";
+  @override
   String get transaction_priority_medium => "मध्यम";
   @override
   String get transaction_details_transaction_id => "लेनदेन आईडी";
@@ -1345,6 +1356,8 @@ class $hi extends S {
   @override
   String get trade_not_created => "व्यापार नहीं बनाया गया.";
   @override
+  String get confirm_delete_wallet => "यह क्रिया इस वॉलेट को हटा देगी। क्या आप जारी रखना चाहते हैं?";
+  @override
   String get restore_wallet_name => "बटुए का नाम";
   @override
   String get widgets_seed => "बीज";
@@ -1353,6 +1366,8 @@ class $hi extends S {
   @override
   String get rename => "नाम बदलें";
   @override
+  String get confirm_delete_template => "यह क्रिया इस टेम्पलेट को हटा देगी। क्या आप जारी रखना चाहते हैं?";
+  @override
   String get restore_active_seed => "सक्रिय बीज";
   @override
   String get send_name => "नाम";
@@ -1413,7 +1428,7 @@ class $hi extends S {
   @override
   String get send => "संदेश";
   @override
-  String get send_title => "संदेश Monero";
+  String get send_title => "संदेश";
   @override
   String get error_text_keys => "वॉलेट कीज़ में हेक्स में केवल 64 वर्ण हो सकते हैं";
   @override
@@ -1497,8 +1512,6 @@ class $hi extends S {
   @override
   String get restore_description_from_backup => "आप से पूरे केक वॉलेट एप्लिकेशन को पुनर्स्थापित कर सकते हैं आपकी बैक-अप फ़ाइल";
   @override
-  String get send_monero_address => "मोनरो पता";
-  @override
   String get error_text_node_port => "नोड पोर्ट में केवल 0 और 65535 के बीच संख्याएँ हो सकती हैं";
   @override
   String get add_new_word => "नया शब्द जोड़ें";
@@ -1545,6 +1558,8 @@ class $hi extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "व्यापार ${provider} के लिए नहीं बनाया गया है। राशि अधिक है तो अधिकतम: ${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "${cryptoCurrency} पता";
+  @override
   String min_value(String value, String currency) => "मिन: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "प्रमाणीकरण विफल. ${state_error}";
@@ -1917,6 +1932,8 @@ class $ru extends S {
   @override
   String get sync_status_syncronized => "СИНХРОНИЗИРОВАН";
   @override
+  String get template => "Шаблон";
+  @override
   String get transaction_priority_medium => "Средний";
   @override
   String get transaction_details_transaction_id => "ID транзакции";
@@ -1965,6 +1982,8 @@ class $ru extends S {
   @override
   String get trade_not_created => "Сделка не создана.";
   @override
+  String get confirm_delete_wallet => "Это действие удалит кошелек. Вы хотите продолжить?";
+  @override
   String get restore_wallet_name => "Имя кошелька";
   @override
   String get widgets_seed => "Мнемоническая фраза";
@@ -1973,6 +1992,8 @@ class $ru extends S {
   @override
   String get rename => "Переименовать";
   @override
+  String get confirm_delete_template => "Это действие удалит шаблон. Вы хотите продолжить?";
+  @override
   String get restore_active_seed => "Активная мнемоническая фраза";
   @override
   String get send_name => "Имя";
@@ -2033,7 +2054,7 @@ class $ru extends S {
   @override
   String get send => "Отправить";
   @override
-  String get send_title => "Отправить Monero";
+  String get send_title => "Отправить";
   @override
   String get error_text_keys => "Ключи кошелька могут содержать только 64 символа в hex";
   @override
@@ -2117,8 +2138,6 @@ class $ru extends S {
   @override
   String get restore_description_from_backup => "Вы можете восстановить Cake Wallet из вашего back-up файла";
   @override
-  String get send_monero_address => "Monero адрес";
-  @override
   String get error_text_node_port => "Порт ноды может содержать только цифры от 0 до 65535";
   @override
   String get add_new_word => "Добавить новое слово";
@@ -2165,6 +2184,8 @@ class $ru extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "Сделка для ${provider} не создана. Сумма больше максимальной: ${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "${cryptoCurrency} адрес";
+  @override
   String min_value(String value, String currency) => "Мин: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "Ошибка аутентификации. ${state_error}";
@@ -2537,6 +2558,8 @@ class $ko extends S {
   @override
   String get sync_status_syncronized => "동기화";
   @override
+  String get template => "주형";
+  @override
   String get transaction_priority_medium => "매질";
   @override
   String get transaction_details_transaction_id => "트랜잭션 ID";
@@ -2585,6 +2608,8 @@ class $ko extends S {
   @override
   String get trade_not_created => "거래가 생성되지 않았습니다.";
   @override
+  String get confirm_delete_wallet => "이 작업은이 지갑을 삭제합니다. 계속 하시겠습니까?";
+  @override
   String get restore_wallet_name => "지갑 이름";
   @override
   String get widgets_seed => "씨";
@@ -2593,6 +2618,8 @@ class $ko extends S {
   @override
   String get rename => "이름 바꾸기";
   @override
+  String get confirm_delete_template => "이 작업은이 템플릿을 삭제합니다. 계속 하시겠습니까?";
+  @override
   String get restore_active_seed => "활성 종자";
   @override
   String get send_name => "이름";
@@ -2653,7 +2680,7 @@ class $ko extends S {
   @override
   String get send => "보내다";
   @override
-  String get send_title => "모네로 보내기";
+  String get send_title => "보내다";
   @override
   String get error_text_keys => "지갑 키는 16 진수로 64 자만 포함 할 수 있습니다";
   @override
@@ -2737,8 +2764,6 @@ class $ko extends S {
   @override
   String get restore_description_from_backup => "백업 파일에서 전체 Cake Wallet 앱을 복원 할 수 있습니다.";
   @override
-  String get send_monero_address => "모네로 주소";
-  @override
   String get error_text_node_port => "노드 포트는 0에서 65535 사이의 숫자 만 포함 할 수 있습니다";
   @override
   String get add_new_word => "새로운 단어 추가";
@@ -2785,6 +2810,8 @@ class $ko extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "거래 ${provider} 가 생성되지 않습니다. 금액이 최대 값보다 많습니다. ${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "${cryptoCurrency} 주소";
+  @override
   String min_value(String value, String currency) => "최소: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "인증 실패. ${state_error}";
@@ -3157,6 +3184,8 @@ class $pt extends S {
   @override
   String get sync_status_syncronized => "SINCRONIZADO";
   @override
+  String get template => "Modelo";
+  @override
   String get transaction_priority_medium => "Média";
   @override
   String get transaction_details_transaction_id => "ID da transação";
@@ -3205,6 +3234,8 @@ class $pt extends S {
   @override
   String get trade_not_created => "Troca não criada.";
   @override
+  String get confirm_delete_wallet => "Esta ação excluirá esta carteira. Você deseja continuar?";
+  @override
   String get restore_wallet_name => "Nome da carteira";
   @override
   String get widgets_seed => "Semente";
@@ -3213,6 +3244,8 @@ class $pt extends S {
   @override
   String get rename => "Renomear";
   @override
+  String get confirm_delete_template => "Esta ação excluirá este modelo. Você deseja continuar?";
+  @override
   String get restore_active_seed => "Semente ativa";
   @override
   String get send_name => "Nome";
@@ -3273,7 +3306,7 @@ class $pt extends S {
   @override
   String get send => "Enviar";
   @override
-  String get send_title => "Enviar Monero";
+  String get send_title => "Enviar";
   @override
   String get error_text_keys => "As chaves da carteira podem conter apenas 64 caracteres em hexadecimal";
   @override
@@ -3357,8 +3390,6 @@ class $pt extends S {
   @override
   String get restore_description_from_backup => "Você pode restaurar todo o aplicativo Cake Wallet de seu arquivo de backup";
   @override
-  String get send_monero_address => "Endereço Monero";
-  @override
   String get error_text_node_port => "A porta do nó deve conter apenas números entre 0 e 65535";
   @override
   String get add_new_word => "Adicionar nova palavra";
@@ -3405,6 +3436,8 @@ class $pt extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "A troca por ${provider} não é criada. O valor é superior ao máximo: ${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "Endereço ${cryptoCurrency}";
+  @override
   String min_value(String value, String currency) => "Mín: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "Falha na autenticação. ${state_error}";
@@ -3777,6 +3810,8 @@ class $uk extends S {
   @override
   String get sync_status_syncronized => "СИНХРОНІЗОВАНИЙ";
   @override
+  String get template => "Шаблон";
+  @override
   String get transaction_priority_medium => "Середній";
   @override
   String get transaction_details_transaction_id => "ID транзакції";
@@ -3825,6 +3860,8 @@ class $uk extends S {
   @override
   String get trade_not_created => "Операція не створена.";
   @override
+  String get confirm_delete_wallet => "Ця дія видалить гаманець. Ви хочете продовжити?";
+  @override
   String get restore_wallet_name => "Ім'я гаманця";
   @override
   String get widgets_seed => "Мнемонічна фраза";
@@ -3833,6 +3870,8 @@ class $uk extends S {
   @override
   String get rename => "Перейменувати";
   @override
+  String get confirm_delete_template => "Ця дія видалить шаблон. Ви хочете продовжити?";
+  @override
   String get restore_active_seed => "Активна мнемонічна фраза";
   @override
   String get send_name => "Ім'я";
@@ -3893,7 +3932,7 @@ class $uk extends S {
   @override
   String get send => "Відправити";
   @override
-  String get send_title => "Відправити Monero";
+  String get send_title => "Відправити";
   @override
   String get error_text_keys => "Ключі гаманця можуть містити тільки 64 символів в hex";
   @override
@@ -3977,8 +4016,6 @@ class $uk extends S {
   @override
   String get restore_description_from_backup => "Ви можете відновити Cake Wallet з вашого резервного файлу";
   @override
-  String get send_monero_address => "Monero адреса";
-  @override
   String get error_text_node_port => "Порт вузла може містити тільки цифри від 0 до 65535";
   @override
   String get add_new_word => "Добавити нове слово";
@@ -4025,6 +4062,8 @@ class $uk extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "Операція для ${provider} не створена. Сума більше максимальної: ${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "${cryptoCurrency} адреса";
+  @override
   String min_value(String value, String currency) => "Мін: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "Помилка аутентифікації. ${state_error}";
@@ -4397,6 +4436,8 @@ class $ja extends S {
   @override
   String get sync_status_syncronized => "同期された";
   @override
+  String get template => "テンプレート";
+  @override
   String get transaction_priority_medium => "中";
   @override
   String get transaction_details_transaction_id => "トランザクションID";
@@ -4445,6 +4486,8 @@ class $ja extends S {
   @override
   String get trade_not_created => "作成されていない取引";
   @override
+  String get confirm_delete_wallet => "このアクションにより、このウォレットが削除されます。 続行しますか？";
+  @override
   String get restore_wallet_name => "ウォレット名";
   @override
   String get widgets_seed => "シード";
@@ -4453,6 +4496,8 @@ class $ja extends S {
   @override
   String get rename => "リネーム";
   @override
+  String get confirm_delete_template => "この操作により、このテンプレートが削除されます。 続行しますか？";
+  @override
   String get restore_active_seed => "アクティブシード";
   @override
   String get send_name => "名前";
@@ -4513,7 +4558,7 @@ class $ja extends S {
   @override
   String get send => "送る";
   @override
-  String get send_title => "Moneroを送信";
+  String get send_title => "を送信";
   @override
   String get error_text_keys => "ウォレットキーには、16進数で64文字しか含めることができません";
   @override
@@ -4597,8 +4642,6 @@ class $ja extends S {
   @override
   String get restore_description_from_backup => "Cake Walletアプリ全体を復元できますバックアップファイル";
   @override
-  String get send_monero_address => "Monero 住所";
-  @override
   String get error_text_node_port => "ノードポートには、0〜65535の数字のみを含めることができます";
   @override
   String get add_new_word => "新しい単語を追加";
@@ -4645,6 +4688,8 @@ class $ja extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "${provider} の取引は作成されません。 金額は最大値を超えています： ${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "${cryptoCurrency} 住所";
+  @override
   String min_value(String value, String currency) => "分: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "認証失敗. ${state_error}";
@@ -5021,6 +5066,8 @@ class $pl extends S {
   @override
   String get sync_status_syncronized => "SYNCHRONIZOWANY";
   @override
+  String get template => "Szablon";
+  @override
   String get transaction_priority_medium => "Średni";
   @override
   String get transaction_details_transaction_id => "Transakcja ID";
@@ -5069,6 +5116,8 @@ class $pl extends S {
   @override
   String get trade_not_created => "Handel nie utworzony.";
   @override
+  String get confirm_delete_wallet => "Ta czynność usunie ten portfel. Czy chcesz kontynuować?";
+  @override
   String get restore_wallet_name => "Nazwa portfela";
   @override
   String get widgets_seed => "Ziarno";
@@ -5077,6 +5126,8 @@ class $pl extends S {
   @override
   String get rename => "Przemianować";
   @override
+  String get confirm_delete_template => "Ta czynność usunie ten szablon. Czy chcesz kontynuować?";
+  @override
   String get restore_active_seed => "Aktywne nasiona";
   @override
   String get send_name => "Imię";
@@ -5137,7 +5188,7 @@ class $pl extends S {
   @override
   String get send => "Wysłać";
   @override
-  String get send_title => "Wyślij Monero";
+  String get send_title => "Wyślij";
   @override
   String get error_text_keys => "Klucze portfela mogą zawierać tylko 64 znaki w systemie szesnastkowym";
   @override
@@ -5221,8 +5272,6 @@ class $pl extends S {
   @override
   String get restore_description_from_backup => "Możesz przywrócić całą aplikację Cake Wallet z plik kopii zapasowej";
   @override
-  String get send_monero_address => "Adres Monero";
-  @override
   String get error_text_node_port => "Port węzła może zawierać tylko liczby od 0 do 65535";
   @override
   String get add_new_word => "Dodaj nowe słowo";
@@ -5269,6 +5318,8 @@ class $pl extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "Wymiana dla ${provider} nie została utworzona. Kwota jest większa niż maksymalna: ${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "Adres ${cryptoCurrency}";
+  @override
   String min_value(String value, String currency) => "Min: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "Nieudane uwierzytelnienie. ${state_error}";
@@ -5641,6 +5692,8 @@ class $es extends S {
   @override
   String get sync_status_syncronized => "SINCRONIZADO";
   @override
+  String get template => "Plantilla";
+  @override
   String get transaction_priority_medium => "Medio";
   @override
   String get transaction_details_transaction_id => "ID de transacción";
@@ -5689,6 +5742,8 @@ class $es extends S {
   @override
   String get trade_not_created => "Comercio no se crea.";
   @override
+  String get confirm_delete_wallet => "Esta acción eliminará esta billetera. ¿Desea continuar?";
+  @override
   String get restore_wallet_name => "Nombre de la billetera";
   @override
   String get widgets_seed => "Semilla";
@@ -5697,6 +5752,8 @@ class $es extends S {
   @override
   String get rename => "Rebautizar";
   @override
+  String get confirm_delete_template => "Esta acción eliminará esta plantilla. ¿Desea continuar?";
+  @override
   String get restore_active_seed => "Semilla activa";
   @override
   String get send_name => "Nombre";
@@ -5757,7 +5814,7 @@ class $es extends S {
   @override
   String get send => "Enviar";
   @override
-  String get send_title => "Enviar Monero";
+  String get send_title => "Enviar";
   @override
   String get error_text_keys => "Las llaves de billetera solo pueden contener 64 caracteres en hexadecimal";
   @override
@@ -5841,8 +5898,6 @@ class $es extends S {
   @override
   String get restore_description_from_backup => "Puede restaurar toda la aplicación Cake Wallet desde ysu archivo de respaldo";
   @override
-  String get send_monero_address => "Dirección de Monero";
-  @override
   String get error_text_node_port => "El puerto de nodo solo puede contener números entre 0 y 65535";
   @override
   String get add_new_word => "Agregar palabra nueva";
@@ -5889,6 +5944,8 @@ class $es extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "El comercio por ${provider} no se crea. La cantidad es más que el máximo: ${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "Dirección de ${cryptoCurrency}";
+  @override
   String min_value(String value, String currency) => "Min: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "Autenticación fallida. ${state_error}";
@@ -6261,6 +6318,8 @@ class $nl extends S {
   @override
   String get sync_status_syncronized => "SYNCHRONIZED";
   @override
+  String get template => "Sjabloon";
+  @override
   String get transaction_priority_medium => "Medium";
   @override
   String get transaction_details_transaction_id => "Transactie ID";
@@ -6309,6 +6368,8 @@ class $nl extends S {
   @override
   String get trade_not_created => "Handel niet gecreëerd.";
   @override
+  String get confirm_delete_wallet => "Met deze actie wordt deze portemonnee verwijderd. Wilt u doorgaan?";
+  @override
   String get restore_wallet_name => "Portemonnee naam";
   @override
   String get widgets_seed => "Zaad";
@@ -6317,6 +6378,8 @@ class $nl extends S {
   @override
   String get rename => "Hernoemen";
   @override
+  String get confirm_delete_template => "Met deze actie wordt deze sjabloon verwijderd. Wilt u doorgaan?";
+  @override
   String get restore_active_seed => "Actief zaad";
   @override
   String get send_name => "Naam";
@@ -6377,7 +6440,7 @@ class $nl extends S {
   @override
   String get send => "Sturen";
   @override
-  String get send_title => "Stuur Monero";
+  String get send_title => "Stuur";
   @override
   String get error_text_keys => "Portefeuillesleutels kunnen maximaal 64 tekens bevatten in hexadecimale volgorde";
   @override
@@ -6461,8 +6524,6 @@ class $nl extends S {
   @override
   String get restore_description_from_backup => "Je kunt de hele Cake Wallet-app herstellen van uw back-upbestand";
   @override
-  String get send_monero_address => "Monero-adres";
-  @override
   String get error_text_node_port => "Knooppuntpoort kan alleen nummers tussen 0 en 65535 bevatten";
   @override
   String get add_new_word => "Nieuw woord toevoegen";
@@ -6509,6 +6570,8 @@ class $nl extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "Ruil voor ${provider} is niet gemaakt. Bedrag is meer dan maximaal: ${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "${cryptoCurrency}-adres";
+  @override
   String min_value(String value, String currency) => "Min: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "Mislukte authenticatie. ${state_error}";
@@ -6881,6 +6944,8 @@ class $zh extends S {
   @override
   String get sync_status_syncronized => "已同步";
   @override
+  String get template => "模板";
+  @override
   String get transaction_priority_medium => "介质";
   @override
   String get transaction_details_transaction_id => "交易编号";
@@ -6929,6 +6994,8 @@ class $zh extends S {
   @override
   String get trade_not_created => "未建立交易.";
   @override
+  String get confirm_delete_wallet => "此操作將刪除此錢包。 你想繼續嗎？";
+  @override
   String get restore_wallet_name => "钱包名称";
   @override
   String get widgets_seed => "种子";
@@ -6937,6 +7004,8 @@ class $zh extends S {
   @override
   String get rename => "改名";
   @override
+  String get confirm_delete_template => "此操作將刪除此模板。 你想繼續嗎？";
+  @override
   String get restore_active_seed => "活性種子";
   @override
   String get send_name => "名稱";
@@ -6997,7 +7066,7 @@ class $zh extends S {
   @override
   String get send => "发送";
   @override
-  String get send_title => "发送门罗币";
+  String get send_title => "發送";
   @override
   String get error_text_keys => "钱包密钥只能包含16个字符的十六进制字符";
   @override
@@ -7081,8 +7150,6 @@ class $zh extends S {
   @override
   String get restore_description_from_backup => "您可以从还原整个Cake Wallet应用您的备份文件";
   @override
-  String get send_monero_address => "门罗地址";
-  @override
   String get error_text_node_port => "节点端口只能包含0到65535之间的数字";
   @override
   String get add_new_word => "添加新词";
@@ -7129,6 +7196,8 @@ class $zh extends S {
   @override
   String error_text_maximum_limit(String provider, String max, String currency) => "未創建 ${provider} 交易。 金額大於最大值：${max} ${currency}";
   @override
+  String send_address(String cryptoCurrency) => "${cryptoCurrency} 地址";
+  @override
   String min_value(String value, String currency) => "敏: ${value} ${currency}";
   @override
   String failed_authentication(String state_error) => "身份验证失败. ${state_error}";
diff --git a/lib/main.dart b/lib/main.dart
index d1be6866d..912099978 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -127,6 +127,8 @@ void main() async {
       contactSource: contacts,
       tradesSource: trades,
       fiatConvertationService: fiatConvertationService,
+      templates: templates,
+      exchangeTemplates: exchangeTemplates,
       initialMigrationVersion: 3);
 
   setReactions(
@@ -169,6 +171,8 @@ Future<void> initialSetup(
     @required Box<Contact> contactSource,
     @required  Box<Trade> tradesSource,
     @required FiatConvertationService fiatConvertationService,
+    @required Box<Template> templates,
+    @required Box<ExchangeTemplate> exchangeTemplates,
       int initialMigrationVersion = 3}) async {
   await defaultSettingsMigration(
       version: initialMigrationVersion,
@@ -178,7 +182,9 @@ Future<void> initialSetup(
       walletInfoSource: walletInfoSource,
       nodeSource: nodes,
       contactSource: contactSource,
-      tradesSource: tradesSource);
+      tradesSource: tradesSource,
+      templates: templates,
+      exchangeTemplates: exchangeTemplates);
   await bootstrap(fiatConvertationService: fiatConvertationService);
   monero_wallet.onStartup();
 }
diff --git a/lib/palette.dart b/lib/palette.dart
index 0daa53148..02b135319 100644
--- a/lib/palette.dart
+++ b/lib/palette.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 class Palette {
   static const Color green = Color.fromRGBO(39, 206, 80, 1.0);
   static const Color red = Color.fromRGBO(255, 51, 51, 1.0);
+  static const Color darkRed = Color.fromRGBO(204, 38, 38, 1.0);
   static const Color blueAlice = Color.fromRGBO(231, 240, 253, 1.0);
   static const Color lightBlue = Color.fromRGBO(172, 203, 238, 1.0);
   static const Color lavender = Color.fromRGBO(237, 245, 252, 1.0);
@@ -41,6 +42,10 @@ class PaletteDark {
   static const Color oceanBlue = Color.fromRGBO(27, 39, 71, 1.0);
   static const Color lightNightBlue = Color.fromRGBO(39, 52, 89, 1.0);
   static const Color wildBlue = Color.fromRGBO(165, 176, 205, 1.0);
+  static const Color buttonNightBlue = Color.fromRGBO(46, 57, 96, 1.0);
+  static const Color lightBlueGrey = Color.fromRGBO(125, 141, 183, 1.0);
+  static const Color lightVioletBlue = Color.fromRGBO(56, 71, 109, 1.0);
+  static const Color darkVioletBlue = Color.fromRGBO(49, 60, 96, 1.0);
 
   // FIXME: Rename.
   static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
diff --git a/lib/router.dart b/lib/router.dart
index 920e13eae..974c6caa3 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -258,12 +258,7 @@ class Router {
 
       case Routes.sendTemplate:
         return CupertinoPageRoute<void>(
-            builder: (_) => Provider(
-                create: (_) => SendStore(
-                    walletService: walletService,
-                    priceStore: priceStore,
-                    transactionDescriptions: transactionDescriptions),
-                child: SendTemplatePage()));
+            fullscreenDialog: true, builder: (_) => getIt.get<SendTemplatePage>());
 
       case Routes.receive:
         return CupertinoPageRoute<void>(
diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart
index 88ad87ea6..e4eacd21c 100644
--- a/lib/src/screens/base_page.dart
+++ b/lib/src/screens/base_page.dart
@@ -23,9 +23,11 @@ abstract class BasePage extends StatelessWidget {
 
   Widget Function(BuildContext, Widget) get rootWrapper => null;
 
-  final _backArrowImage = Image.asset('assets/images/back_arrow.png');
+  final _backArrowImage = Image.asset('assets/images/back_arrow.png',
+  color: Colors.white);
   final _backArrowImageDarkTheme =
-      Image.asset('assets/images/back_arrow_dark_theme.png');
+  Image.asset('assets/images/back_arrow_dark_theme.png',
+  color: Colors.white);
   final _closeButtonImage = Image.asset('assets/images/close_button.png');
   final _closeButtonImageDarkTheme =
       Image.asset('assets/images/close_button_dark_theme.png');
@@ -71,7 +73,7 @@ abstract class BasePage extends StatelessWidget {
             style: TextStyle(
                 fontSize: 18.0,
                 fontWeight: FontWeight.bold,
-                color: Theme.of(context).primaryTextTheme.title.color),
+                color: Colors.white),
           );
   }
 
diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart
index 20c44ba5d..7902370b0 100644
--- a/lib/src/screens/send/send_page.dart
+++ b/lib/src/screens/send/send_page.dart
@@ -1,39 +1,9 @@
-import 'package:cake_wallet/core/address_validator.dart';
-import 'package:cake_wallet/core/amount_validator.dart';
-import 'package:cake_wallet/src/screens/auth/auth_page.dart';
-import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/view_model/send_view_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:mobx/mobx.dart';
-import 'package:provider/provider.dart';
 import 'package:cake_wallet/palette.dart';
-import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/src/widgets/address_text_field.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/src/stores/balance/balance_store.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:cake_wallet/src/stores/send/send_store.dart';
-
-//import 'package:cake_wallet/src/stores/send/sending_state.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/calculate_estimated_fee.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/stores/sync/sync_store.dart';
-import 'package:cake_wallet/src/widgets/top_panel.dart';
-import 'package:dotted_border/dotted_border.dart';
-import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
-import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart';
-import 'package:cake_wallet/src/screens/send/widgets/sending_alert.dart';
-import 'package:cake_wallet/src/widgets/template_tile.dart';
-import 'package:cake_wallet/src/stores/send_template/send_template_store.dart';
-import 'package:cake_wallet/src/widgets/trail_button.dart';
+import 'package:cake_wallet/src/screens/send/widgets/base_send_widget.dart';
 
 class SendPage extends BasePage {
   SendPage({@required this.sendViewModel});
@@ -41,539 +11,18 @@ class SendPage extends BasePage {
   final SendViewModel sendViewModel;
 
   @override
-  String get title => S.current.send_title;
+  String get title => sendViewModel.pageTitle;
 
   @override
-  Color get backgroundLightColor => Palette.lavender;
+  Color get backgroundLightColor => PaletteDark.nightBlue;
 
   @override
-  Color get backgroundDarkColor => PaletteDark.lightNightBlue;
+  Color get backgroundDarkColor => PaletteDark.nightBlue;
 
   @override
   bool get resizeToAvoidBottomPadding => false;
 
   @override
-  Widget trailing(context) {
-//    final sendStore = Provider.of<SendStore>(context);
-
-    return TrailButton(caption: S.of(context).clear, onPressed: () => null);
-  }
-
-  @override
-  Widget body(BuildContext context) => SendForm(sendViewModel: sendViewModel);
-}
-
-class SendForm extends StatefulWidget {
-  SendForm({this.sendViewModel});
-
-  final SendViewModel sendViewModel;
-
-  @override
-  State<StatefulWidget> createState() => SendFormState();
-}
-
-class SendFormState extends State<SendForm> {
-  final _addressController = TextEditingController();
-  final _cryptoAmountController = TextEditingController();
-  final _fiatAmountController = TextEditingController();
-
-  final _focusNode = FocusNode();
-
-  bool _effectsInstalled = false;
-
-  final _formKey = GlobalKey<FormState>();
-
-  @override
-  void initState() {
-    _focusNode.addListener(() {
-      if (!_focusNode.hasFocus && _addressController.text.isNotEmpty) {
-        getOpenaliasRecord(context);
-      }
-    });
-
-    super.initState();
-  }
-
-  Future<void> getOpenaliasRecord(BuildContext context) async {
-    final sendStore = Provider.of<SendStore>(context);
-    final isOpenalias =
-        await sendStore.isOpenaliasRecord(_addressController.text);
-
-    if (isOpenalias) {
-      _addressController.text = sendStore.recordAddress;
-
-      await showDialog<void>(
-          context: context,
-          builder: (BuildContext context) {
-            return AlertWithOneAction(
-                alertTitle: S.of(context).openalias_alert_title,
-                alertContent:
-                    S.of(context).openalias_alert_content(sendStore.recordName),
-                buttonText: S.of(context).ok,
-                buttonAction: () => Navigator.of(context).pop());
-          });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-//    final settingsStore = Provider.of<SettingsStore>(context);
-//    final sendStore = Provider.of<SendStore>(context);
-//    sendStore.settingsStore = settingsStore;
-//    final balanceStore = Provider.of<BalanceStore>(context);
-//    final walletStore = Provider.of<WalletStore>(context);
-//    final syncStore = Provider.of<SyncStore>(context);
-//    final sendTemplateStore = Provider.of<SendTemplateStore>(context);
-
-    _setEffects(context);
-
-    return Container(
-      color: Theme.of(context).backgroundColor,
-      child: ScrollableWithBottomSection(
-        contentPadding: EdgeInsets.only(bottom: 24),
-        content: Column(
-          children: <Widget>[
-            TopPanel(
-              color: Theme.of(context).accentTextTheme.title.backgroundColor,
-              widget: Form(
-                key: _formKey,
-                child: Column(children: <Widget>[
-                  AddressTextField(
-                    controller: _addressController,
-                    placeholder: S.of(context).send_monero_address,
-                    focusNode: _focusNode,
-                    onURIScanned: (uri) {
-                      var address = '';
-                      var amount = '';
-
-                      if (uri != null) {
-                        address = uri.path;
-                        amount = uri.queryParameters['tx_amount'];
-                      } else {
-                        address = uri.toString();
-                      }
-
-                      _addressController.text = address;
-                      _cryptoAmountController.text = amount;
-                    },
-                    options: [
-                      AddressTextFieldOption.qrCode,
-                      AddressTextFieldOption.addressBook
-                    ],
-                    buttonColor: Theme.of(context).accentTextTheme.title.color,
-                    validator: widget.sendViewModel.addressValidator,
-                  ),
-                  Observer(builder: (_) {
-                    return Padding(
-                      padding: const EdgeInsets.only(top: 20),
-                      child: TextFormField(
-                          style: TextStyle(
-                              fontSize: 16.0,
-                              color: Theme.of(context)
-                                  .primaryTextTheme
-                                  .title
-                                  .color),
-                          controller: _cryptoAmountController,
-                          keyboardType: TextInputType.numberWithOptions(
-                              signed: false, decimal: true),
-                          inputFormatters: [
-                            BlacklistingTextInputFormatter(
-                                RegExp('[\\-|\\ |\\,]'))
-                          ],
-                          decoration: InputDecoration(
-                              prefixIcon: Padding(
-                                padding: EdgeInsets.only(top: 12),
-                                child: Text('XMR:',
-                                    style: TextStyle(
-                                      fontSize: 16,
-                                      fontWeight: FontWeight.w500,
-                                      color: Theme.of(context)
-                                          .primaryTextTheme
-                                          .title
-                                          .color,
-                                    )),
-                              ),
-                              suffixIcon: Padding(
-                                padding: EdgeInsets.only(bottom: 5),
-                                child: Row(
-                                  mainAxisSize: MainAxisSize.min,
-                                  mainAxisAlignment:
-                                      MainAxisAlignment.spaceBetween,
-                                  children: <Widget>[
-                                    Container(
-                                      width:
-                                          MediaQuery.of(context).size.width / 2,
-                                      alignment: Alignment.centerLeft,
-                                      child: Text(
-                                          ' / ' + widget.sendViewModel.balance,
-                                          maxLines: 1,
-                                          overflow: TextOverflow.ellipsis,
-                                          style: TextStyle(
-                                              fontSize: 16,
-                                              color: Theme.of(context)
-                                                  .primaryTextTheme
-                                                  .caption
-                                                  .color)),
-                                    ),
-                                    Container(
-                                      height: 32,
-                                      width: 32,
-                                      margin: EdgeInsets.only(
-                                          left: 12, bottom: 7, top: 4),
-                                      decoration: BoxDecoration(
-                                          color: Theme.of(context)
-                                              .accentTextTheme
-                                              .title
-                                              .color,
-                                          borderRadius: BorderRadius.all(
-                                              Radius.circular(6))),
-                                      child: InkWell(
-                                        onTap: () => null,
-                                        // widget.sendViewModel,
-                                        child: Center(
-                                          child: Text(S.of(context).all,
-                                              textAlign: TextAlign.center,
-                                              style: TextStyle(
-                                                  fontSize: 9,
-                                                  fontWeight: FontWeight.bold,
-                                                  color: Theme.of(context)
-                                                      .primaryTextTheme
-                                                      .caption
-                                                      .color)),
-                                        ),
-                                      ),
-                                    )
-                                  ],
-                                ),
-                              ),
-                              hintStyle: TextStyle(
-                                  fontSize: 16.0,
-                                  color: Theme.of(context)
-                                      .primaryTextTheme
-                                      .title
-                                      .color),
-                              hintText: '0.0000',
-                              focusedBorder: UnderlineInputBorder(
-                                  borderSide: BorderSide(
-                                      color: Theme.of(context).dividerColor,
-                                      width: 1.0)),
-                              enabledBorder: UnderlineInputBorder(
-                                  borderSide: BorderSide(
-                                      color: Theme.of(context).dividerColor,
-                                      width: 1.0))),
-                          validator: widget.sendViewModel.amountValidator),
-                    );
-                  }),
-                  Padding(
-                    padding: const EdgeInsets.only(top: 20),
-                    child: TextFormField(
-                        style: TextStyle(
-                            fontSize: 16.0,
-                            color:
-                                Theme.of(context).primaryTextTheme.title.color),
-                        controller: _fiatAmountController,
-                        keyboardType: TextInputType.numberWithOptions(
-                            signed: false, decimal: true),
-                        inputFormatters: [
-                          BlacklistingTextInputFormatter(
-                              RegExp('[\\-|\\ |\\,]'))
-                        ],
-                        decoration: InputDecoration(
-                            prefixIcon: Padding(
-                              padding: EdgeInsets.only(top: 12),
-                              child: Text(
-                                  '${widget.sendViewModel.fiat.toString()}:',
-                                  style: TextStyle(
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.w500,
-                                    color: Theme.of(context)
-                                        .primaryTextTheme
-                                        .title
-                                        .color,
-                                  )),
-                            ),
-                            hintStyle: TextStyle(
-                                fontSize: 16.0,
-                                color: Theme.of(context)
-                                    .primaryTextTheme
-                                    .caption
-                                    .color),
-                            hintText: '0.00',
-                            focusedBorder: UnderlineInputBorder(
-                                borderSide: BorderSide(
-                                    color: Theme.of(context).dividerColor,
-                                    width: 1.0)),
-                            enabledBorder: UnderlineInputBorder(
-                                borderSide: BorderSide(
-                                    color: Theme.of(context).dividerColor,
-                                    width: 1.0)))),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(top: 20),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: <Widget>[
-                        Text(S.of(context).send_estimated_fee,
-                            style: TextStyle(
-                              fontSize: 12,
-                              fontWeight: FontWeight.w600,
-                              color: Theme.of(context)
-                                  .primaryTextTheme
-                                  .title
-                                  .color,
-                            )),
-                        Text(
-                            '${widget.sendViewModel.estimatedFee} ${widget.sendViewModel.currency.toString()}',
-                            style: TextStyle(
-                              fontSize: 12,
-                              fontWeight: FontWeight.w600,
-                              color: Theme.of(context)
-                                  .primaryTextTheme
-                                  .title
-                                  .color,
-                            ))
-                      ],
-                    ),
-                  )
-                ]),
-              ),
-            ),
-//            Padding(
-//              padding: EdgeInsets.only(top: 32, left: 24, bottom: 24),
-//              child: Row(
-//                mainAxisAlignment: MainAxisAlignment.start,
-//                children: <Widget>[
-//                  Text(
-//                    S.of(context).send_templates,
-//                    style: TextStyle(
-//                        fontSize: 18,
-//                        fontWeight: FontWeight.w600,
-//                        color:
-//                            Theme.of(context).primaryTextTheme.caption.color),
-//                  )
-//                ],
-//              ),
-//            ),
-//            Container(
-//              height: 40,
-//              width: double.infinity,
-//              padding: EdgeInsets.only(left: 24),
-//              child: Observer(builder: (_) {
-//                final itemCount = sendTemplateStore.templates.length + 1;
-//
-//                return ListView.builder(
-//                    scrollDirection: Axis.horizontal,
-//                    itemCount: itemCount,
-//                    itemBuilder: (context, index) {
-//                      if (index == 0) {
-//                        return GestureDetector(
-//                          onTap: () => Navigator.of(context)
-//                              .pushNamed(Routes.sendTemplate),
-//                          child: Container(
-//                            padding: EdgeInsets.only(right: 10),
-//                            child: DottedBorder(
-//                                borderType: BorderType.RRect,
-//                                dashPattern: [8, 4],
-//                                color: Theme.of(context)
-//                                    .accentTextTheme
-//                                    .title
-//                                    .backgroundColor,
-//                                strokeWidth: 2,
-//                                radius: Radius.circular(20),
-//                                child: Container(
-//                                  height: 40,
-//                                  width: 75,
-//                                  padding: EdgeInsets.only(left: 10, right: 10),
-//                                  alignment: Alignment.center,
-//                                  decoration: BoxDecoration(
-//                                    borderRadius:
-//                                        BorderRadius.all(Radius.circular(20)),
-//                                    color: Colors.transparent,
-//                                  ),
-//                                  child: Text(
-//                                    S.of(context).send_new,
-//                                    style: TextStyle(
-//                                        fontSize: 14,
-//                                        fontWeight: FontWeight.w600,
-//                                        color: Theme.of(context)
-//                                            .primaryTextTheme
-//                                            .caption
-//                                            .color),
-//                                  ),
-//                                )),
-//                          ),
-//                        );
-//                      }
-//
-//                      index -= 1;
-//
-//                      final template = sendTemplateStore.templates[index];
-//
-//                      return TemplateTile(
-//                          to: template.name,
-//                          amount: template.amount,
-//                          from: template.cryptoCurrency,
-//                          onTap: () {
-//                            _addressController.text = template.address;
-//                            _cryptoAmountController.text = template.amount;
-//                            getOpenaliasRecord(context);
-//                          });
-//                    });
-//              }),
-//            )
-          ],
-        ),
-        bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-        bottomSection: Observer(builder: (_) {
-          return LoadingPrimaryButton(
-              onPressed: () => null,
-//              syncStore.status is SyncedSyncStatus
-//                ? () async {
-//                    // Hack. Don't ask me.
-//                    FocusScope.of(context).requestFocus(FocusNode());
-//
-//                    if (_formKey.currentState.validate()) {
-//                      await showDialog<void>(
-//                          context: context,
-//                          builder: (dialogContext) {
-//                            return AlertWithTwoActions(
-//                                alertTitle:
-//                                    S.of(context).send_creating_transaction,
-//                                alertContent: S.of(context).confirm_sending,
-//                                leftButtonText: S.of(context).send,
-//                                rightButtonText: S.of(context).cancel,
-//                                actionLeftButton: () async {
-//                                  await Navigator.of(dialogContext)
-//                                      .popAndPushNamed(Routes.auth, arguments:
-//                                          (bool isAuthenticatedSuccessfully,
-//                                              AuthPageState auth) {
-//                                    if (!isAuthenticatedSuccessfully) {
-//                                      return;
-//                                    }
-//
-//                                    Navigator.of(auth.context).pop();
-//
-//                                    sendStore.createTransaction(
-//                                        address: _addressController.text,
-//                                        paymentId: '');
-//                                  });
-//                                },
-//                                actionRightButton: () =>
-//                                    Navigator.of(context).pop());
-//                          });
-//                    }
-//                  }
-//                : null,
-              text: S.of(context).send,
-              color: Colors.blue,
-              textColor: Colors.white,
-              isLoading: widget.sendViewModel.state is TransactionIsCreating ||
-                  widget.sendViewModel.state is TransactionCommitting,
-              isDisabled:
-                  false // FIXME !(syncStore.status is SyncedSyncStatus),
-              );
-        }),
-      ),
-    );
-  }
-
-  void _setEffects(BuildContext context) {
-    if (_effectsInstalled) {
-      return;
-    }
-
-//    reaction((_) => widget.sendViewModel.fiatAmount, (String amount) {
-//      if (amount != _fiatAmountController.text) {
-//        _fiatAmountController.text = amount;
-//      }
-//    });
-//
-//    reaction((_) => widget.sendViewModel.cryptoAmount, (String amount) {
-//      if (amount != _cryptoAmountController.text) {
-//        _cryptoAmountController.text = amount;
-//      }
-//    });
-//
-//    reaction((_) => widget.sendViewModel.address, (String address) {
-//      if (address != _addressController.text) {
-//        _addressController.text = address;
-//      }
-//    });
-//
-//    _addressController.addListener(() {
-//      final address = _addressController.text;
-//
-//      if (widget.sendViewModel.address != address) {
-//        widget.sendViewModel.changeAddress(address);
-//      }
-//    });
-
-//    _fiatAmountController.addListener(() {
-//      final fiatAmount = _fiatAmountController.text;
-//
-//      if (sendStore.fiatAmount != fiatAmount) {
-//        sendStore.changeFiatAmount(fiatAmount);
-//      }
-//    });
-
-//    _cryptoAmountController.addListener(() {
-//      final cryptoAmount = _cryptoAmountController.text;
-//
-//      if (sendStore.cryptoAmount != cryptoAmount) {
-//        sendStore.changeCryptoAmount(cryptoAmount);
-//      }
-//    });
-
-    reaction((_) => widget.sendViewModel.state, (SendViewModelState state) {
-      if (state is SendingFailed) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          showDialog<void>(
-              context: context,
-              builder: (BuildContext context) {
-                return AlertWithOneAction(
-                    alertTitle: S.of(context).error,
-                    alertContent: state.error,
-                    buttonText: S.of(context).ok,
-                    buttonAction: () => Navigator.of(context).pop());
-              });
-        });
-      }
-
-      if (state is TransactionCreatedSuccessfully) {
-//        WidgetsBinding.instance.addPostFrameCallback((_) {
-//          showDialog<void>(
-//              context: context,
-//              builder: (BuildContext context) {
-//                return ConfirmSendingAlert(
-//                    alertTitle: S.of(context).confirm_sending,
-//                    amount: S.of(context).send_amount,
-//                    amountValue: sendStore.pendingTransaction.amount,
-//                    fee: S.of(context).send_fee,
-//                    feeValue: sendStore.pendingTransaction.fee,
-//                    leftButtonText: S.of(context).ok,
-//                    rightButtonText: S.of(context).cancel,
-//                    actionLeftButton: () {
-//                      Navigator.of(context).pop();
-//                      sendStore.commitTransaction();
-//                      showDialog<void>(
-//                          context: context,
-//                          builder: (BuildContext context) {
-//                            return SendingAlert(sendStore: sendStore);
-//                          });
-//                    },
-//                    actionRightButton: () => Navigator.of(context).pop());
-//              });
-//        });
-      }
-
-      if (state is TransactionCommitted) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          _addressController.text = '';
-          _cryptoAmountController.text = '';
-        });
-      }
-    });
-
-    _effectsInstalled = true;
-  }
+  Widget body(BuildContext context) =>
+      BaseSendWidget(sendViewModel: sendViewModel);
 }
diff --git a/lib/src/screens/send/send_template_page.dart b/lib/src/screens/send/send_template_page.dart
index 5197f61ab..19f9f8ca8 100644
--- a/lib/src/screens/send/send_template_page.dart
+++ b/lib/src/screens/send/send_template_page.dart
@@ -1,277 +1,29 @@
-import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:mobx/mobx.dart';
-import 'package:provider/provider.dart';
 import 'package:cake_wallet/palette.dart';
-import 'package:cake_wallet/src/widgets/address_text_field.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/src/stores/balance/balance_store.dart';
-import 'package:cake_wallet/src/stores/send/send_store.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/top_panel.dart';
-import 'package:cake_wallet/src/stores/send_template/send_template_store.dart';
+import 'package:cake_wallet/view_model/send_view_model.dart';
+import 'package:cake_wallet/src/screens/send/widgets/base_send_widget.dart';
 
 class SendTemplatePage extends BasePage {
-  @override
-  String get title => S.current.send_title;
+  SendTemplatePage({@required this.sendViewModel});
+
+  final SendViewModel sendViewModel;
 
   @override
-  Color get backgroundLightColor => Palette.lavender;
+  String get title => S.current.exchange_new_template;
 
   @override
-  Color get backgroundDarkColor => PaletteDark.lightNightBlue;
+  Color get backgroundLightColor => PaletteDark.nightBlue;
+
+  @override
+  Color get backgroundDarkColor => PaletteDark.nightBlue;
 
   @override
   bool get resizeToAvoidBottomPadding => false;
 
   @override
-  Widget body(BuildContext context) => SendTemplateForm();
-}
-
-class SendTemplateForm extends StatefulWidget {
-  @override
-  SendTemplateFormState createState() => SendTemplateFormState();
-}
-
-class SendTemplateFormState extends State<SendTemplateForm> {
-  final _nameController = TextEditingController();
-  final _addressController = TextEditingController();
-  final _cryptoAmountController = TextEditingController();
-  final _fiatAmountController = TextEditingController();
-
-  final _formKey = GlobalKey<FormState>();
-
-  bool _effectsInstalled = false;
-
-  @override
-  void dispose() {
-    _nameController.dispose();
-    _addressController.dispose();
-    _cryptoAmountController.dispose();
-    _fiatAmountController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final settingsStore = Provider.of<SettingsStore>(context);
-    final balanceStore = Provider.of<BalanceStore>(context);
-    final sendStore = Provider.of<SendStore>(context);
-    sendStore.settingsStore = settingsStore;
-    final sendTemplateStore = Provider.of<SendTemplateStore>(context);
-
-    _setEffects(context);
-
-    return Container(
-      color: Theme.of(context).backgroundColor,
-      child: ScrollableWithBottomSection(
-        contentPadding: EdgeInsets.only(bottom: 24),
-        content: Column(
-          children: <Widget>[
-            TopPanel(
-              color: Theme.of(context).accentTextTheme.title.backgroundColor,
-              widget: Form(
-                key: _formKey,
-                child: Column(children: <Widget>[
-                  TextFormField(
-                      style: TextStyle(
-                          fontSize: 16.0,
-                          color: Theme.of(context).primaryTextTheme.title.color),
-                      controller: _nameController,
-                      decoration: InputDecoration(
-                          hintStyle: TextStyle(
-                              fontSize: 16.0,
-                              color: Theme.of(context).primaryTextTheme.caption.color),
-                          hintText: S.of(context).send_name,
-                          focusedBorder: UnderlineInputBorder(
-                              borderSide: BorderSide(
-                                  color: Theme.of(context).dividerColor,
-                                  width: 1.0)),
-                          enabledBorder: UnderlineInputBorder(
-                              borderSide: BorderSide(
-                                  color: Theme.of(context).dividerColor,
-                                  width: 1.0))),
-                      validator: (value) {
-                        sendTemplateStore.validateTemplate(value);
-                        return sendTemplateStore.errorMessage;
-                      },
-                  ),
-                  Padding(
-                    padding: EdgeInsets.only(top: 20),
-                    child: AddressTextField(
-                      controller: _addressController,
-                      placeholder: S.of(context).send_monero_address,
-                      onURIScanned: (uri) {
-                        var address = '';
-                        var amount = '';
-
-                        if (uri != null) {
-                          address = uri.path;
-                          amount = uri.queryParameters['tx_amount'];
-                        } else {
-                          address = uri.toString();
-                        }
-
-                        _addressController.text = address;
-                        _cryptoAmountController.text = amount;
-                      },
-                      options: [
-                        AddressTextFieldOption.qrCode,
-                        AddressTextFieldOption.addressBook
-                      ],
-                      buttonColor: Theme.of(context).accentTextTheme.title.color,
-                      validator: (value) {
-                        sendTemplateStore.validateTemplate(value);
-                        return sendTemplateStore.errorMessage;
-                      },
-                    ),
-                  ),
-                  Observer(
-                      builder: (_) {
-                        return Padding(
-                          padding: const EdgeInsets.only(top: 20),
-                          child: TextFormField(
-                              style: TextStyle(
-                                  fontSize: 16.0,
-                                  color: Theme.of(context).primaryTextTheme.title.color
-                              ),
-                              controller: _cryptoAmountController,
-                              keyboardType: TextInputType.numberWithOptions(
-                                  signed: false, decimal: true),
-                              inputFormatters: [
-                                BlacklistingTextInputFormatter(
-                                    RegExp('[\\-|\\ |\\,]'))
-                              ],
-                              decoration: InputDecoration(
-                                  prefixIcon: Padding(
-                                    padding: EdgeInsets.only(top: 12),
-                                    child: Text('XMR:',
-                                        style: TextStyle(
-                                          fontSize: 16,
-                                          fontWeight: FontWeight.bold,
-                                          color: Theme.of(context).primaryTextTheme.title.color,
-                                        )),
-                                  ),
-                                  hintStyle: TextStyle(
-                                      fontSize: 16.0,
-                                      color: Theme.of(context).primaryTextTheme.title.color),
-                                  hintText: '0.0000',
-                                  focusedBorder: UnderlineInputBorder(
-                                      borderSide: BorderSide(
-                                          color: Theme.of(context).dividerColor,
-                                          width: 1.0)),
-                                  enabledBorder: UnderlineInputBorder(
-                                      borderSide: BorderSide(
-                                          color: Theme.of(context).dividerColor,
-                                          width: 1.0))),
-                              ),
-                        );
-                      }
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(top: 20),
-                    child: TextFormField(
-                        style: TextStyle(
-                            fontSize: 16.0,
-                            color: Theme.of(context).primaryTextTheme.title.color),
-                        controller: _fiatAmountController,
-                        keyboardType: TextInputType.numberWithOptions(
-                            signed: false, decimal: true),
-                        inputFormatters: [
-                          BlacklistingTextInputFormatter(
-                              RegExp('[\\-|\\ |\\,]'))
-                        ],
-                        decoration: InputDecoration(
-                            prefixIcon: Padding(
-                              padding: EdgeInsets.only(top: 12),
-                              child: Text(
-                                  '${settingsStore.fiatCurrency.toString()}:',
-                                  style: TextStyle(
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.bold,
-                                    color: Theme.of(context).primaryTextTheme.title.color,
-                                  )),
-                            ),
-                            hintStyle: TextStyle(
-                                fontSize: 16.0,
-                                color: Theme.of(context).primaryTextTheme.caption.color),
-                            hintText: '0.00',
-                            focusedBorder: UnderlineInputBorder(
-                                borderSide: BorderSide(
-                                    color: Theme.of(context).dividerColor,
-                                    width: 1.0)),
-                            enabledBorder: UnderlineInputBorder(
-                                borderSide: BorderSide(
-                                    color: Theme.of(context).dividerColor,
-                                    width: 1.0)))),
-                  ),
-                ]),
-              ),
-            ),
-          ],
-        ),
-        bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-        bottomSection: PrimaryButton(
-          onPressed: () {
-            if (_formKey.currentState.validate()) {
-              sendTemplateStore.addTemplate(
-                name: _nameController.text,
-                address: _addressController.text,
-                cryptoCurrency: 'XMR',
-                amount: _cryptoAmountController.text
-              );
-              sendTemplateStore.update();
-              Navigator.of(context).pop();
-            }
-          },
-          text: S.of(context).save,
-          color: Colors.blue,
-          textColor: Colors.white
-        ),
-      ),
-    );
-  }
-
-  void _setEffects(BuildContext context) {
-    if (_effectsInstalled) {
-      return;
-    }
-
-    final sendStore = Provider.of<SendStore>(context);
-
-    reaction((_) => sendStore.fiatAmount, (String amount) {
-      if (amount != _fiatAmountController.text) {
-        _fiatAmountController.text = amount;
-      }
-    });
-
-    reaction((_) => sendStore.cryptoAmount, (String amount) {
-      if (amount != _cryptoAmountController.text) {
-        _cryptoAmountController.text = amount;
-      }
-    });
-
-    _fiatAmountController.addListener(() {
-      final fiatAmount = _fiatAmountController.text;
-
-      if (sendStore.fiatAmount != fiatAmount) {
-        sendStore.changeFiatAmount(fiatAmount);
-      }
-    });
-
-    _cryptoAmountController.addListener(() {
-      final cryptoAmount = _cryptoAmountController.text;
-
-      if (sendStore.cryptoAmount != cryptoAmount) {
-        sendStore.changeCryptoAmount(cryptoAmount);
-      }
-    });
-
-    _effectsInstalled = true;
-  }
+  Widget body(BuildContext context) =>
+      BaseSendWidget(sendViewModel: sendViewModel, isTemplate: true);
 }
\ No newline at end of file
diff --git a/lib/src/screens/send/widgets/base_send_widget.dart b/lib/src/screens/send/widgets/base_send_widget.dart
new file mode 100644
index 000000000..1bc5a5359
--- /dev/null
+++ b/lib/src/screens/send/widgets/base_send_widget.dart
@@ -0,0 +1,541 @@
+import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/view_model/send_view_model.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/src/widgets/address_text_field.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/widgets/top_panel.dart';
+import 'package:dotted_border/dotted_border.dart';
+import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
+import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart';
+import 'package:cake_wallet/src/screens/send/widgets/sending_alert.dart';
+import 'package:cake_wallet/src/widgets/template_tile.dart';
+import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/routes.dart';
+
+class BaseSendWidget extends StatelessWidget {
+  BaseSendWidget({
+    @required this.sendViewModel,
+    this.isTemplate = false
+  });
+
+  final SendViewModel sendViewModel;
+  final bool isTemplate;
+
+  final _addressController = TextEditingController();
+  final _cryptoAmountController = TextEditingController();
+  final _fiatAmountController = TextEditingController();
+  final _nameController = TextEditingController();
+  final _focusNode = FocusNode();
+  final _formKey = GlobalKey<FormState>();
+
+  bool _effectsInstalled = false;
+
+  @override
+  Widget build(BuildContext context) {
+
+    _setEffects(context);
+
+    return Container(
+      color: PaletteDark.backgroundColor,
+      child: ScrollableWithBottomSection(
+        contentPadding: EdgeInsets.only(bottom: 24),
+        content: Column(
+          children: <Widget>[
+            TopPanel(
+              color: PaletteDark.nightBlue,
+              edgeInsets: EdgeInsets.fromLTRB(24, 24, 24, 32),
+              widget: Form(
+                key: _formKey,
+                child: Column(children: <Widget>[
+                  isTemplate
+                  ? BaseTextFormField(
+                    controller: _nameController,
+                    hintText: S.of(context).send_name,
+                    borderColor: PaletteDark.lightVioletBlue,
+                    textStyle: TextStyle(
+                        fontSize: 14,
+                        fontWeight: FontWeight.w500,
+                        color: Colors.white
+                    ),
+                    placeholderTextStyle: TextStyle(
+                        color: PaletteDark.darkCyanBlue,
+                        fontWeight: FontWeight.w500,
+                        fontSize: 14),
+                    validator: sendViewModel.templateValidator,
+                  )
+                  : Offstage(),
+                  Padding(
+                    padding: EdgeInsets.only(top: isTemplate ? 20 : 0),
+                    child: AddressTextField(
+                      controller: _addressController,
+                      placeholder: S.of(context).send_address(
+                          sendViewModel.cryptoCurrencyTitle),
+                      focusNode: _focusNode,
+                      onURIScanned: (uri) {
+                        var address = '';
+                        var amount = '';
+
+                        if (uri != null) {
+                          address = uri.path;
+                          amount = uri.queryParameters['tx_amount'];
+                        } else {
+                          address = uri.toString();
+                        }
+
+                        _addressController.text = address;
+                        _cryptoAmountController.text = amount;
+                      },
+                      options: [
+                        AddressTextFieldOption.paste,
+                        AddressTextFieldOption.qrCode,
+                        AddressTextFieldOption.addressBook
+                      ],
+                      buttonColor: PaletteDark.buttonNightBlue,
+                      borderColor: PaletteDark.lightVioletBlue,
+                      textStyle: TextStyle(
+                          fontSize: 14,
+                          fontWeight: FontWeight.w500,
+                          color: Colors.white
+                      ),
+                      hintStyle: TextStyle(
+                          fontSize: 14,
+                          fontWeight: FontWeight.w500,
+                          color: PaletteDark.darkCyanBlue
+                      ),
+                      validator: sendViewModel.addressValidator,
+                    ),
+                  ),
+                  Observer(
+                      builder: (_) {
+                        return Padding(
+                            padding: const EdgeInsets.only(top: 20),
+                            child: BaseTextFormField(
+                                controller: _cryptoAmountController,
+                                keyboardType: TextInputType.numberWithOptions(
+                                    signed: false, decimal: true),
+                                inputFormatters: [
+                                  BlacklistingTextInputFormatter(
+                                      RegExp('[\\-|\\ |\\,]'))
+                                ],
+                                prefixIcon: Padding(
+                                  padding: EdgeInsets.only(top: 9),
+                                  child: Text(sendViewModel.currency.title + ':',
+                                      style: TextStyle(
+                                        fontSize: 16,
+                                        fontWeight: FontWeight.w600,
+                                        color: Colors.white,
+                                      )),
+                                ),
+                                suffixIcon: isTemplate
+                                ? Offstage()
+                                : Padding(
+                                  padding: EdgeInsets.only(bottom: 2),
+                                  child: Row(
+                                    mainAxisSize: MainAxisSize.min,
+                                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                    children: <Widget>[
+                                      Container(
+                                        width: MediaQuery.of(context).size.width/2,
+                                        alignment: Alignment.centerLeft,
+                                        child: Text(
+                                            ' / ' + sendViewModel.balance,
+                                            maxLines: 1,
+                                            overflow: TextOverflow.ellipsis,
+                                            style: TextStyle(
+                                                fontSize: 14,
+                                                color: PaletteDark.darkCyanBlue
+                                            )
+                                        ),
+                                      ),
+                                      Container(
+                                        height: 34,
+                                        width: 34,
+                                        margin: EdgeInsets.only(left: 12, bottom: 8),
+                                        decoration: BoxDecoration(
+                                            color: PaletteDark.buttonNightBlue,
+                                            borderRadius: BorderRadius.all(Radius.circular(6))
+                                        ),
+                                        child: InkWell(
+                                          onTap: () => sendViewModel.setSendAll(),
+                                          child: Center(
+                                            child: Text(S.of(context).all,
+                                                textAlign: TextAlign.center,
+                                                style: TextStyle(
+                                                    fontSize: 12,
+                                                    fontWeight: FontWeight.bold,
+                                                    color: PaletteDark.lightBlueGrey
+                                                )
+                                            ),
+                                          ),
+                                        ),
+                                      )
+                                    ],
+                                  ),
+                                ),
+                                hintText: '0.0000',
+                                borderColor: PaletteDark.lightVioletBlue,
+                                textStyle: TextStyle(
+                                    fontSize: 14,
+                                    fontWeight: FontWeight.w500,
+                                    color: Colors.white
+                                ),
+                                placeholderTextStyle: TextStyle(
+                                    color: PaletteDark.darkCyanBlue,
+                                    fontWeight: FontWeight.w500,
+                                    fontSize: 14),
+                                validator: sendViewModel.amountValidator
+                            )
+                        );
+                      }
+                  ),
+                  Padding(
+                      padding: const EdgeInsets.only(top: 20),
+                      child: BaseTextFormField(
+                        controller: _fiatAmountController,
+                        keyboardType: TextInputType.numberWithOptions(
+                            signed: false, decimal: true),
+                        inputFormatters: [
+                          BlacklistingTextInputFormatter(
+                              RegExp('[\\-|\\ |\\,]'))
+                        ],
+                        prefixIcon: Padding(
+                          padding: EdgeInsets.only(top: 9),
+                          child: Text(
+                              sendViewModel.fiat.title + ':',
+                              style: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.white,
+                              )),
+                        ),
+                        hintText: '0.00',
+                        borderColor: PaletteDark.lightVioletBlue,
+                        textStyle: TextStyle(
+                            fontSize: 14,
+                            fontWeight: FontWeight.w500,
+                            color: Colors.white
+                        ),
+                        placeholderTextStyle: TextStyle(
+                            color: PaletteDark.darkCyanBlue,
+                            fontWeight: FontWeight.w500,
+                            fontSize: 14),
+                      )
+                  ),
+                  isTemplate
+                  ? Offstage()
+                  : Padding(
+                    padding: const EdgeInsets.only(top: 24),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: <Widget>[
+                        Text(S.of(context).send_estimated_fee,
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.w500,
+                              color: Colors.white,
+                            )),
+                        Text(
+                            sendViewModel.estimatedFee.toString() + ' '
+                                + sendViewModel.currency.title,
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.w600,
+                              color: Colors.white,
+                            ))
+                      ],
+                    ),
+                  )
+                ]),
+              ),
+            ),
+            isTemplate
+            ? Offstage()
+            : Padding(
+              padding: EdgeInsets.only(
+                  top: 30,
+                  left: 24,
+                  bottom: 24
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: <Widget>[
+                  Text(
+                    S.of(context).send_templates,
+                    style: TextStyle(
+                        fontSize: 18,
+                        fontWeight: FontWeight.w600,
+                        color: PaletteDark.darkCyanBlue
+                    ),
+                  )
+                ],
+              ),
+            ),
+            isTemplate
+            ? Offstage()
+            : Container(
+              height: 40,
+              width: double.infinity,
+              padding: EdgeInsets.only(left: 24),
+              child: SingleChildScrollView(
+                scrollDirection: Axis.horizontal,
+                child: Row(
+                  children: <Widget>[
+                    GestureDetector(
+                      onTap: () => Navigator.of(context)
+                          .pushNamed(Routes.sendTemplate),
+                      child: Container(
+                        padding: EdgeInsets.only(left: 1, right: 10),
+                        child: DottedBorder(
+                            borderType: BorderType.RRect,
+                            dashPattern: [6, 4],
+                            color: PaletteDark.darkCyanBlue,
+                            strokeWidth: 2,
+                            radius: Radius.circular(20),
+                            child: Container(
+                              height: 34,
+                              width: 75,
+                              padding: EdgeInsets.only(left: 10, right: 10),
+                              alignment: Alignment.center,
+                              decoration: BoxDecoration(
+                                borderRadius: BorderRadius.all(Radius.circular(20)),
+                                color: Colors.transparent,
+                              ),
+                              child: Text(
+                                S.of(context).send_new,
+                                style: TextStyle(
+                                    fontSize: 14,
+                                    fontWeight: FontWeight.w600,
+                                    color: PaletteDark.darkCyanBlue
+                                ),
+                              ),
+                            )
+                        ),
+                      ),
+                    ),
+                    Observer(
+                        builder: (_) {
+                          final templates = sendViewModel.templates;
+                          final itemCount = templates.length;
+
+                          return ListView.builder(
+                              scrollDirection: Axis.horizontal,
+                              shrinkWrap: true,
+                              physics: NeverScrollableScrollPhysics(),
+                              itemCount: itemCount,
+                              itemBuilder: (context, index) {
+                                final template = templates[index];
+
+                                return TemplateTile(
+                                  key: UniqueKey(),
+                                  to: template.name,
+                                  amount: template.amount,
+                                  from: template.cryptoCurrency,
+                                  onTap: () {
+                                    _addressController.text = template.address;
+                                    _cryptoAmountController.text = template.amount;
+                                    getOpenaliasRecord(context);
+                                  },
+                                  onRemove: () {
+                                    showDialog<void>(
+                                      context: context,
+                                      builder: (dialogContext) {
+                                        return AlertWithTwoActions(
+                                          alertTitle: S.of(context).template,
+                                          alertContent: S.of(context).confirm_delete_template,
+                                          leftButtonText: S.of(context).delete,
+                                          rightButtonText: S.of(context).cancel,
+                                          actionLeftButton: () {
+                                            Navigator.of(dialogContext).pop();
+                                            sendViewModel.sendTemplateStore.remove(template: template);
+                                            sendViewModel.sendTemplateStore.update();
+                                          },
+                                          actionRightButton: () => Navigator.of(dialogContext).pop()
+                                        );
+                                      }
+                                    );
+                                  },
+                                );
+                              }
+                          );
+                      }
+                    )
+                  ],
+                ),
+              ),
+            )
+          ],
+        ),
+        bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+        bottomSection: isTemplate
+        ? PrimaryButton(
+            onPressed: () {
+              if (_formKey.currentState.validate()) {
+                sendViewModel.sendTemplateStore.addTemplate(
+                    name: _nameController.text,
+                    address: _addressController.text,
+                    cryptoCurrency: sendViewModel.currency.title,
+                    amount: _cryptoAmountController.text
+                );
+                sendViewModel.sendTemplateStore.update();
+                Navigator.of(context).pop();
+              }
+            },
+            text: S.of(context).save,
+            color: Colors.green,
+            textColor: Colors.white)
+        : Observer(builder: (_) {
+          return LoadingPrimaryButton(
+              onPressed: () {
+                if (_formKey.currentState.validate()) {
+                  print('SENT!!!');
+                }
+              },
+              text: S.of(context).send,
+              color: Colors.blue,
+              textColor: Colors.white,
+              isLoading: sendViewModel.state is TransactionIsCreating ||
+                  sendViewModel.state is TransactionCommitting,
+              isDisabled:
+              false // FIXME !(syncStore.status is SyncedSyncStatus),
+          );
+        }),
+      ),
+    );
+  }
+
+  void _setEffects(BuildContext context) {
+    if (_effectsInstalled) {
+      return;
+    }
+
+    reaction((_) => sendViewModel.fiatAmount, (String amount) {
+      if (amount != _fiatAmountController.text) {
+        _fiatAmountController.text = amount;
+      }
+    });
+
+    reaction((_) => sendViewModel.cryptoAmount, (String amount) {
+      if (amount != _cryptoAmountController.text) {
+        _cryptoAmountController.text = amount;
+      }
+    });
+
+    reaction((_) => sendViewModel.address, (String address) {
+      if (address != _addressController.text) {
+        _addressController.text = address;
+      }
+    });
+
+    _addressController.addListener(() {
+      final address = _addressController.text;
+
+      if (sendViewModel.address != address) {
+        sendViewModel.changeAddress(address);
+      }
+    });
+
+    _fiatAmountController.addListener(() {
+      final fiatAmount = _fiatAmountController.text;
+
+      if (sendViewModel.fiatAmount != fiatAmount) {
+        sendViewModel.changeFiatAmount(fiatAmount);
+      }
+    });
+
+    _cryptoAmountController.addListener(() {
+      final cryptoAmount = _cryptoAmountController.text;
+
+      if (sendViewModel.cryptoAmount != cryptoAmount) {
+        sendViewModel.changeCryptoAmount(cryptoAmount);
+      }
+    });
+
+    _focusNode.addListener(() {
+      if (!_focusNode.hasFocus && _addressController.text.isNotEmpty) {
+        getOpenaliasRecord(context);
+      }
+    });
+
+    reaction((_) => sendViewModel.state, (SendViewModelState state) {
+      if (state is SendingFailed) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          showDialog<void>(
+              context: context,
+              builder: (BuildContext context) {
+                return AlertDialog(
+                  title: Text(S.of(context).error),
+                  content: Text(state.error),
+                  actions: <Widget>[
+                    FlatButton(
+                        child: Text(S.of(context).ok),
+                        onPressed: () => Navigator.of(context).pop())
+                  ],
+                );
+              });
+        });
+      }
+
+      if (state is TransactionCreatedSuccessfully) {
+//        WidgetsBinding.instance.addPostFrameCallback((_) {
+//          showDialog<void>(
+//              context: context,
+//              builder: (BuildContext context) {
+//                return ConfirmSendingAlert(
+//                    alertTitle: S.of(context).confirm_sending,
+//                    amount: S.of(context).send_amount,
+//                    amountValue: sendStore.pendingTransaction.amount,
+//                    fee: S.of(context).send_fee,
+//                    feeValue: sendStore.pendingTransaction.fee,
+//                    leftButtonText: S.of(context).ok,
+//                    rightButtonText: S.of(context).cancel,
+//                    actionLeftButton: () {
+//                      Navigator.of(context).pop();
+//                      sendStore.commitTransaction();
+//                      showDialog<void>(
+//                          context: context,
+//                          builder: (BuildContext context) {
+//                            return SendingAlert(sendStore: sendStore);
+//                          });
+//                    },
+//                    actionRightButton: () => Navigator.of(context).pop());
+//              });
+//        });
+      }
+
+      if (state is TransactionCommitted) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          _addressController.text = '';
+          _cryptoAmountController.text = '';
+        });
+      }
+    });
+
+    _effectsInstalled = true;
+  }
+
+  Future<void> getOpenaliasRecord(BuildContext context) async {
+    final isOpenalias = await sendViewModel.isOpenaliasRecord(_addressController.text);
+
+    if (isOpenalias) {
+      _addressController.text = sendViewModel.recordAddress;
+
+      await showDialog<void>(
+          context: context,
+          builder: (BuildContext context) {
+            return AlertWithOneAction(
+                alertTitle: S.of(context).openalias_alert_title,
+                alertContent: S.of(context).openalias_alert_content(sendViewModel.recordName),
+                buttonText: S.of(context).ok,
+                buttonAction: () => Navigator.of(context).pop()
+            );
+          });
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/src/widgets/address_text_field.dart b/lib/src/widgets/address_text_field.dart
index 5a0cf41a2..3e96a9e76 100644
--- a/lib/src/widgets/address_text_field.dart
+++ b/lib/src/widgets/address_text_field.dart
@@ -1,26 +1,31 @@
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/domain/common/contact.dart';
 import 'package:cake_wallet/src/domain/monero/subaddress.dart';
 import 'package:cake_wallet/src/domain/common/qr_scanner.dart';
+import 'package:flutter/services.dart';
 
-enum AddressTextFieldOption { qrCode, addressBook, subaddressList }
+enum AddressTextFieldOption { paste, qrCode, addressBook, subaddressList }
 
 class AddressTextField extends StatelessWidget {
   AddressTextField(
       {@required this.controller,
-      this.isActive = true,
-      this.placeholder,
-      this.options = const [
-        AddressTextFieldOption.qrCode,
-        AddressTextFieldOption.addressBook
-      ],
-      this.onURIScanned,
-      this.focusNode,
-      this.isBorderExist = true,
-      this.buttonColor,
-      this.validator});
+        this.isActive = true,
+        this.placeholder,
+        this.options = const [
+          AddressTextFieldOption.qrCode,
+          AddressTextFieldOption.addressBook
+        ],
+        this.onURIScanned,
+        this.focusNode,
+        this.isBorderExist = true,
+        this.buttonColor,
+        this.borderColor,
+        this.textStyle,
+        this.hintStyle,
+        this.validator});
 
   static const prefixIconWidth = 34.0;
   static const prefixIconHeight = 34.0;
@@ -34,6 +39,9 @@ class AddressTextField extends StatelessWidget {
   final FormFieldValidator<String> validator;
   final bool isBorderExist;
   final Color buttonColor;
+  final Color borderColor;
+  final TextStyle textStyle;
+  final TextStyle hintStyle;
   FocusNode focusNode;
 
   @override
@@ -45,106 +53,125 @@ class AddressTextField extends StatelessWidget {
           enabled: isActive,
           controller: controller,
           focusNode: focusNode,
-          style: TextStyle(
+          style: textStyle ?? TextStyle(
               fontSize: 16,
-              color: Theme.of(context).primaryTextTheme.title.color
+              color: Colors.white
           ),
           decoration: InputDecoration(
             suffixIcon: SizedBox(
               width: prefixIconWidth * options.length +
                   (spaceBetweenPrefixIcons * options.length),
             ),
-            hintStyle: TextStyle(
+            hintStyle: hintStyle ?? TextStyle(
                 fontSize: 16,
-                color: Theme.of(context).primaryTextTheme.caption.color
+                color: PaletteDark.darkCyanBlue
             ),
             hintText: placeholder ?? S.current.widgets_address,
             focusedBorder: isBorderExist
                 ? UnderlineInputBorder(
                 borderSide: BorderSide(
-                    color: Theme.of(context).dividerColor,
+                    color: borderColor ?? Theme.of(context).dividerColor,
                     width: 1.0))
                 : InputBorder.none,
             disabledBorder: isBorderExist
                 ? UnderlineInputBorder(
                 borderSide:
-                BorderSide(color: Theme.of(context).dividerColor, width: 1.0))
+                BorderSide(color: borderColor ?? Theme.of(context).dividerColor, width: 1.0))
                 : InputBorder.none,
             enabledBorder: isBorderExist
                 ? UnderlineInputBorder(
                 borderSide:
-                BorderSide(color: Theme.of(context).dividerColor, width: 1.0))
+                BorderSide(color: borderColor ?? Theme.of(context).dividerColor, width: 1.0))
                 : InputBorder.none,
           ),
           validator: validator,
         ),
         Positioned(
-          bottom: 10,
-          right: 0,
-          child: SizedBox(
-            width: prefixIconWidth * options.length +
-                (spaceBetweenPrefixIcons * options.length),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                SizedBox(width: 5),
-                if (this.options.contains(AddressTextFieldOption.qrCode)) ...[
-                  Container(
-                      width: prefixIconWidth,
-                      height: prefixIconHeight,
-                      padding: EdgeInsets.only(top: 0),
-                      child: InkWell(
-                        onTap: () async => _presentQRScanner(context),
-                        child: Container(
-                            padding: EdgeInsets.all(8),
-                            decoration: BoxDecoration(
-                                color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
-                                borderRadius:
-                                BorderRadius.all(Radius.circular(6))),
-                            child: Image.asset('assets/images/qr_code_icon.png')),
-                      ))
+            top: 2,
+            right: 0,
+            child: SizedBox(
+              width: prefixIconWidth * options.length +
+                  (spaceBetweenPrefixIcons * options.length),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  SizedBox(width: 5),
+                  if (this
+                      .options
+                      .contains(AddressTextFieldOption.paste)) ...[
+                    Container(
+                        width: prefixIconWidth,
+                        height: prefixIconHeight,
+                        padding: EdgeInsets.only(top: 0),
+                        child: InkWell(
+                          onTap: () async => _pasteAddress(context),
+                          child: Container(
+                              padding: EdgeInsets.all(8),
+                              decoration: BoxDecoration(
+                                  color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
+                                  borderRadius:
+                                  BorderRadius.all(Radius.circular(6))),
+                              child: Image.asset(
+                                  'assets/images/duplicate.png')),
+                        )),
+                  ],
+                  if (this.options.contains(AddressTextFieldOption.qrCode)) ...[
+                    Container(
+                        width: prefixIconWidth,
+                        height: prefixIconHeight,
+                        padding: EdgeInsets.only(top: 0),
+                        child: InkWell(
+                          onTap: () async => _presentQRScanner(context),
+                          child: Container(
+                              padding: EdgeInsets.all(8),
+                              decoration: BoxDecoration(
+                                  color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
+                                  borderRadius:
+                                  BorderRadius.all(Radius.circular(6))),
+                              child: Image.asset('assets/images/qr_code_icon.png')),
+                        ))
+                  ],
+                  if (this
+                      .options
+                      .contains(AddressTextFieldOption.addressBook)) ...[
+                    Container(
+                        width: prefixIconWidth,
+                        height: prefixIconHeight,
+                        padding: EdgeInsets.only(top: 0),
+                        child: InkWell(
+                          onTap: () async => _presetAddressBookPicker(context),
+                          child: Container(
+                              padding: EdgeInsets.all(8),
+                              decoration: BoxDecoration(
+                                  color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
+                                  borderRadius:
+                                  BorderRadius.all(Radius.circular(6))),
+                              child: Image.asset(
+                                  'assets/images/open_book.png')),
+                        ))
+                  ],
+                  if (this
+                      .options
+                      .contains(AddressTextFieldOption.subaddressList)) ...[
+                    Container(
+                        width: prefixIconWidth,
+                        height: prefixIconHeight,
+                        padding: EdgeInsets.only(top: 0),
+                        child: InkWell(
+                          onTap: () async => _presetSubaddressListPicker(context),
+                          child: Container(
+                              padding: EdgeInsets.all(8),
+                              decoration: BoxDecoration(
+                                  color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
+                                  borderRadius:
+                                  BorderRadius.all(Radius.circular(6))),
+                              child: Image.asset(
+                                  'assets/images/receive_icon_raw.png')),
+                        )),
+                  ],
                 ],
-                if (this
-                    .options
-                    .contains(AddressTextFieldOption.addressBook)) ...[
-                  Container(
-                      width: prefixIconWidth,
-                      height: prefixIconHeight,
-                      padding: EdgeInsets.only(top: 0),
-                      child: InkWell(
-                        onTap: () async => _presetAddressBookPicker(context),
-                        child: Container(
-                            padding: EdgeInsets.all(8),
-                            decoration: BoxDecoration(
-                                color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
-                                borderRadius:
-                                BorderRadius.all(Radius.circular(6))),
-                            child: Image.asset(
-                                'assets/images/open_book.png')),
-                      ))
-                ],
-                if (this
-                    .options
-                    .contains(AddressTextFieldOption.subaddressList)) ...[
-                  Container(
-                      width: prefixIconWidth,
-                      height: prefixIconHeight,
-                      padding: EdgeInsets.only(top: 0),
-                      child: InkWell(
-                        onTap: () async => _presetSubaddressListPicker(context),
-                        child: Container(
-                            padding: EdgeInsets.all(8),
-                            decoration: BoxDecoration(
-                                color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
-                                borderRadius:
-                                BorderRadius.all(Radius.circular(6))),
-                            child: Image.asset(
-                                'assets/images/receive_icon_raw.png')),
-                      ))
-                ],
-              ],
-            ),
-          )
+              ),
+            )
         )
       ],
     );
@@ -189,4 +216,14 @@ class AddressTextField extends StatelessWidget {
       controller.text = subaddress.address;
     }
   }
-}
+
+  Future<void> _pasteAddress(BuildContext context) async {
+    String address;
+
+    await Clipboard.getData('text/plain').then((value) => address = value.text);
+
+    if (address.isNotEmpty) {
+      controller.text = address;
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/src/widgets/base_text_form_field.dart b/lib/src/widgets/base_text_form_field.dart
index 50e07f7bb..e8b77c22c 100644
--- a/lib/src/widgets/base_text_form_field.dart
+++ b/lib/src/widgets/base_text_form_field.dart
@@ -15,10 +15,12 @@ class BaseTextFormField extends StatelessWidget {
       this.hintColor,
       this.borderColor,
       this.prefix,
+      this.prefixIcon,
       this.suffix,
       this.suffixIcon,
       this.enabled = true,
       this.validator,
+      this.textStyle,
       this.placeholderTextStyle});
 
   final TextEditingController controller;
@@ -33,11 +35,13 @@ class BaseTextFormField extends StatelessWidget {
   final Color hintColor;
   final Color borderColor;
   final Widget prefix;
+  final Widget prefixIcon;
   final Widget suffix;
   final Widget suffixIcon;
   final bool enabled;
   final FormFieldValidator<String> validator;
   final TextStyle placeholderTextStyle;
+  final TextStyle textStyle;
 
   @override
   Widget build(BuildContext context) {
@@ -50,11 +54,12 @@ class BaseTextFormField extends StatelessWidget {
       maxLines: maxLines,
       inputFormatters: inputFormatters,
       enabled: enabled,
-      style: TextStyle(
+      style: textStyle ?? TextStyle(
           fontSize: 16.0,
           color: textColor ?? Theme.of(context).primaryTextTheme.title.color),
       decoration: InputDecoration(
           prefix: prefix,
+          prefixIcon: prefixIcon,
           suffix: suffix,
           suffixIcon: suffixIcon,
           hintStyle: placeholderTextStyle ??
diff --git a/lib/src/widgets/template_tile.dart b/lib/src/widgets/template_tile.dart
index e34a3b97c..ab6724ece 100644
--- a/lib/src/widgets/template_tile.dart
+++ b/lib/src/widgets/template_tile.dart
@@ -1,77 +1,154 @@
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 
-class TemplateTile extends StatelessWidget {
+class TemplateTile extends StatefulWidget {
   TemplateTile({
+    Key key,
     @required this.to,
     @required this.amount,
     @required this.from,
-    @required this.onTap
-  });
+    @required this.onTap,
+    @required this.onRemove
+  }) : super(key: key);
 
   final String to;
   final String amount;
   final String from;
   final VoidCallback onTap;
+  final VoidCallback onRemove;
+
+  @override
+  TemplateTileState createState() => TemplateTileState(
+      to,
+      amount,
+      from,
+      onTap,
+      onRemove
+  );
+}
+
+class TemplateTileState extends State<TemplateTile> {
+  TemplateTileState(
+      this.to,
+      this.amount,
+      this.from,
+      this.onTap,
+      this.onRemove
+      );
+
+  final String to;
+  final String amount;
+  final String from;
+  final VoidCallback onTap;
+  final VoidCallback onRemove;
+  final trash = Image.asset('assets/images/trash.png', height: 16, width: 16, color: Colors.white);
+
+  bool isRemovable = false;
 
   @override
   Widget build(BuildContext context) {
-    final toIcon = Image.asset('assets/images/to_icon.png',
-      color: Theme.of(context).primaryTextTheme.title.color,
-    );
+    //final color = isRemovable ? Colors.white : Theme.of(context).primaryTextTheme.title.color;
+    final color = Colors.white;
+    final toIcon = Image.asset('assets/images/to_icon.png', color: color);
 
-    return Container(
-      padding: EdgeInsets.only(right: 10),
-      child: GestureDetector(
-        onTap: onTap,
-        child: Container(
-          height: 40,
-          padding: EdgeInsets.only(left: 24, right: 24),
-          decoration: BoxDecoration(
-              borderRadius: BorderRadius.all(Radius.circular(20)),
-              color: Theme.of(context).accentTextTheme.title.backgroundColor
-          ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            children: <Widget>[
-              Text(
-                amount,
-                style: TextStyle(
-                    fontSize: 16,
-                    fontWeight: FontWeight.w600,
-                    color: Theme.of(context).primaryTextTheme.title.color
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(left: 5),
-                child: Text(
-                  from,
-                  style: TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).primaryTextTheme.title.color
-                  ),
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(left: 5),
-                child: toIcon,
-              ),
-              Padding(
-                padding: EdgeInsets.only(left: 5),
-                child: Text(
-                  to,
-                  style: TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).primaryTextTheme.title.color
-                  ),
-                ),
-              ),
-            ],
+    final content = Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      mainAxisSize: MainAxisSize.min,
+      children: <Widget>[
+        Text(
+          amount,
+          style: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.w600,
+              color: color
           ),
         ),
-      ),
+        Padding(
+          padding: EdgeInsets.only(left: 5),
+          child: Text(
+            from,
+            style: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w600,
+                color: color
+            ),
+          ),
+        ),
+        Padding(
+          padding: EdgeInsets.only(left: 5),
+          child: toIcon,
+        ),
+        Padding(
+          padding: EdgeInsets.only(left: 5),
+          child: Text(
+            to,
+            style: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w600,
+                color: color
+            ),
+          ),
+        ),
+      ],
     );
+
+    final tile = Container(
+        padding: EdgeInsets.only(right: 10),
+        child: ClipRRect(
+          borderRadius: BorderRadius.all(Radius.circular(20)),
+          child: GestureDetector(
+            onTap: onTap,
+            onLongPress: () {
+              setState(() {
+                isRemovable = true;
+              });
+            },
+            child: Container(
+              height: 40,
+              padding: EdgeInsets.only(left: 24, right: 24),
+              color: PaletteDark.darkVioletBlue,
+              child: content,
+            ),
+          ),
+        )
+    );
+
+    final removableTile = Container(
+        padding: EdgeInsets.only(right: 10),
+        child: ClipRRect(
+            borderRadius: BorderRadius.all(Radius.circular(20)),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                GestureDetector(
+                  onTap: () {
+                    setState(() {
+                      isRemovable = false;
+                    });
+                  },
+                  child: Container(
+                    height: 40,
+                    padding: EdgeInsets.only(left: 24, right: 10),
+                    color: Colors.red,
+                    child: content,
+                  ),
+                ),
+                GestureDetector(
+                  onTap: onRemove,
+                  child: Container(
+                    height: 40,
+                    width: 44,
+                    color: Palette.darkRed,
+                    child: Center(
+                      child: trash,
+                    ),
+                  ),
+                )
+              ],
+            )
+        )
+    );
+
+    return isRemovable ? removableTile : tile;
   }
 }
\ No newline at end of file
diff --git a/lib/store/templates/exchange_template_store.dart b/lib/store/templates/exchange_template_store.dart
new file mode 100644
index 000000000..1311fba91
--- /dev/null
+++ b/lib/store/templates/exchange_template_store.dart
@@ -0,0 +1,40 @@
+import 'dart:async';
+import 'package:mobx/mobx.dart';
+import 'package:hive/hive.dart';
+import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
+
+part 'exchange_template_store.g.dart';
+
+class ExchangeTemplateStore = ExchangeTemplateBase with _$ExchangeTemplateStore;
+
+abstract class ExchangeTemplateBase with Store {
+  ExchangeTemplateBase({this.templateSource}) {
+    templates = ObservableList<ExchangeTemplate>();
+    update();
+  }
+
+  @observable
+  ObservableList<ExchangeTemplate> templates;
+
+  Box<ExchangeTemplate> templateSource;
+
+  @action
+  void update() =>
+      templates.replaceRange(0, templates.length, templateSource.values.toList());
+
+  @action
+  Future addTemplate({String amount, String depositCurrency, String receiveCurrency,
+    String provider, String depositAddress, String receiveAddress}) async {
+    final template = ExchangeTemplate(
+        amount: amount,
+        depositCurrency: depositCurrency,
+        receiveCurrency: receiveCurrency,
+        provider: provider,
+        depositAddress: depositAddress,
+        receiveAddress: receiveAddress);
+    await templateSource.add(template);
+  }
+
+  @action
+  Future remove({ExchangeTemplate template}) async => await template.delete();
+}
\ No newline at end of file
diff --git a/lib/store/templates/send_template_store.dart b/lib/store/templates/send_template_store.dart
new file mode 100644
index 000000000..f672e8041
--- /dev/null
+++ b/lib/store/templates/send_template_store.dart
@@ -0,0 +1,34 @@
+import 'dart:async';
+import 'package:mobx/mobx.dart';
+import 'package:hive/hive.dart';
+import 'package:cake_wallet/src/domain/common/template.dart';
+
+part 'send_template_store.g.dart';
+
+class SendTemplateStore = SendTemplateBase with _$SendTemplateStore;
+
+abstract class SendTemplateBase with Store {
+  SendTemplateBase({this.templateSource}) {
+    templates = ObservableList<Template>();
+    update();
+  }
+
+  @observable
+  ObservableList<Template> templates;
+
+  Box<Template> templateSource;
+
+  @action
+  void update() =>
+      templates.replaceRange(0, templates.length, templateSource.values.toList());
+
+  @action
+  Future addTemplate({String name, String address, String cryptoCurrency, String amount}) async {
+    final template = Template(name: name, address: address,
+                              cryptoCurrency: cryptoCurrency, amount: amount);
+    await templateSource.add(template);
+  }
+
+  @action
+  Future remove({Template template}) async => await template.delete();
+}
\ No newline at end of file
diff --git a/lib/view_model/send_view_model.dart b/lib/view_model/send_view_model.dart
index eada27683..f5018a2b0 100644
--- a/lib/view_model/send_view_model.dart
+++ b/lib/view_model/send_view_model.dart
@@ -1,16 +1,21 @@
 import 'package:cake_wallet/core/address_validator.dart';
 import 'package:cake_wallet/core/amount_validator.dart';
+import 'package:cake_wallet/core/template_validator.dart';
 import 'package:cake_wallet/core/validator.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet.dart';
 import 'package:cake_wallet/monero/monero_wallet.dart';
 import 'package:cake_wallet/src/domain/common/balance.dart';
+import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
 import 'package:cake_wallet/src/domain/common/calculate_estimated_fee.dart';
 import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
 import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
+import 'package:cake_wallet/src/domain/common/sync_status.dart';
 import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/store/templates/send_template_store.dart';
 import 'package:flutter/foundation.dart';
+import 'package:intl/intl.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/monero/monero_wallet_service.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet_creation_credentials.dart';
@@ -18,6 +23,10 @@ import 'package:cake_wallet/core/wallet_creation_service.dart';
 import 'package:cake_wallet/core/wallet_credentials.dart';
 import 'package:cake_wallet/src/domain/common/wallet_type.dart';
 import 'package:cake_wallet/view_model/wallet_creation_vm.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/domain/common/openalias_record.dart';
+import 'package:cake_wallet/store/dashboard/fiat_convertation_store.dart';
+import 'package:cake_wallet/src/domain/common/template.dart';
 
 part 'send_view_model.g.dart';
 
@@ -42,8 +51,20 @@ class SendingFailed extends SendViewModelState {
 class SendViewModel = SendViewModelBase with _$SendViewModel;
 
 abstract class SendViewModelBase with Store {
-  SendViewModelBase(this._wallet, this._settingsStore)
-      : state = InitialSendViewModelState();
+  SendViewModelBase(
+      this._wallet,
+      this._settingsStore,
+      this._fiatConvertationStore,
+      this.sendTemplateStore) {
+
+    state = InitialSendViewModelState();
+
+    _cryptoNumberFormat = NumberFormat()..maximumFractionDigits = 12;
+    _fiatNumberFormat = NumberFormat()..maximumFractionDigits = 2;
+  }
+
+  NumberFormat _cryptoNumberFormat;
+  NumberFormat _fiatNumberFormat;
 
   @observable
   SendViewModelState state;
@@ -57,6 +78,22 @@ abstract class SendViewModelBase with Store {
   @observable
   String address;
 
+  String get cryptoCurrencyTitle {
+    var _currencyTitle = '';
+
+    if (_wallet is MoneroWallet) {
+      _currencyTitle = 'Monero';
+    }
+
+    if (_wallet is BitcoinWallet) {
+      _currencyTitle = 'Bitcoin';
+    }
+
+    return _currencyTitle;
+  }
+
+  String get pageTitle => S.current.send_title + ' ' + cryptoCurrencyTitle;
+
   FiatCurrency get fiat => _settingsStore.fiatCurrency;
 
   TransactionPriority get transactionPriority =>
@@ -65,30 +102,120 @@ abstract class SendViewModelBase with Store {
   double get estimatedFee =>
       calculateEstimatedFee(priority: transactionPriority);
 
+  String get name => _wallet.name;
+
   CryptoCurrency get currency => _wallet.currency;
 
   Validator get amountValidator => AmountValidator(type: _wallet.type);
 
   Validator get addressValidator => AddressValidator(type: _wallet.currency);
 
+  Validator get templateValidator => TemplateValidator();
+
+  @computed
+  double get price => _fiatConvertationStore.price;
+
+  @computed
+  ObservableList<Template> get templates => ObservableList.of(
+      sendTemplateStore.templates.where((item)
+      => item.cryptoCurrency == _wallet.currency.title).toList());
+
   @computed
   String get balance {
+    var _balance = '0.0';
+
     if (_wallet is MoneroWallet) {
-      _wallet.balance.formattedUnlockedBalance;
+      _balance = _wallet.balance.formattedUnlockedBalance.toString();
     }
 
     if (_wallet is BitcoinWallet) {
-      _wallet.balance.confirmedFormatted;
+      _balance = _wallet.balance.confirmedFormatted.toString();
     }
 
-    return '0.0';
+    return _settingsStore.balanceDisplayMode == BalanceDisplayMode.hiddenBalance
+        ? '---'
+        : _balance;
   }
 
-  WalletBase _wallet;
+  @computed
+  SyncStatus get status => _wallet.syncStatus;
 
-  SettingsStore _settingsStore;
+  @action
+  void changeCryptoAmount(String amount) {
+    cryptoAmount = amount;
+
+    if (cryptoAmount != null && cryptoAmount.isNotEmpty) {
+      _calculateFiatAmount();
+    } else {
+      fiatAmount = '';
+    }
+  }
+
+  @action
+  void changeFiatAmount(String amount) {
+    fiatAmount = amount;
+
+    if (fiatAmount != null && fiatAmount.isNotEmpty) {
+      _calculateCryptoAmount();
+    } else {
+      cryptoAmount = '';
+    }
+  }
+
+  @action
+  Future _calculateFiatAmount() async {
+    try {
+      final amount = double.parse(cryptoAmount) * price;
+      fiatAmount = _fiatNumberFormat.format(amount);
+    } catch (e) {
+      fiatAmount = '0.00';
+    }
+  }
+
+  @action
+  Future _calculateCryptoAmount() async {
+    try {
+      final amount = double.parse(fiatAmount) / price;
+      cryptoAmount = _cryptoNumberFormat.format(amount);
+    } catch (e) {
+      cryptoAmount = '0.00';
+    }
+  }
+
+  @action
+  void changeAddress(String address) {
+    this.address = address;
+  }
+
+  @action
+  void setSendAll() {
+    cryptoAmount = 'ALL';
+    fiatAmount = '';
+  }
+
+  final WalletBase _wallet;
+
+  final SettingsStore _settingsStore;
+
+  final FiatConvertationStore _fiatConvertationStore;
+
+  final SendTemplateStore sendTemplateStore;
+
+  String recordName;
+
+  String recordAddress;
+
+  Future<bool> isOpenaliasRecord(String name) async {
+    final _openaliasRecord = await OpenaliasRecord
+        .fetchAddressAndName(OpenaliasRecord.formatDomainName(name));
+
+    recordAddress = _openaliasRecord.address;
+    recordName = _openaliasRecord.name;
+
+    return recordAddress != name;
+  }
 
   Future<void> createTransaction() async {}
 
   Future<void> commitTransaction() async {}
-}
+}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index cbc8b5c67..bda604b55 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -112,6 +112,7 @@ flutter:
       fonts:
         - asset: assets/fonts/Poppins-Regular.ttf
         - asset: assets/fonts/Poppins-Medium.ttf
+        - asset: assets/fonts/Poppins-SemiBold.ttf
         - asset: assets/fonts/Poppins-Bold.ttf
 
 
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index d5734da89..20c7988bd 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "Spanisch",
 
 
-  "send_title" : "Senden Sie Monero",
+  "send_title" : "Senden Sie",
   "send_your_wallet" : "Deine Geldbörse",
-  "send_monero_address" : "Monero-Adresse",
+  "send_address" : "${cryptoCurrency}-Adresse",
   "send_payment_id" : "Zahlungs ID (wahlweise)",
   "all" : "ALLE",
   "send_error_minimum_value" : "Der Mindestbetrag beträgt 0,01",
@@ -377,5 +377,9 @@
   "buy" : "Kaufen",
 
   "placeholder_transactions" : "Ihre Transaktionen werden hier angezeigt",
-  "placeholder_contacts" : "Ihre Kontakte werden hier angezeigt"
+  "placeholder_contacts" : "Ihre Kontakte werden hier angezeigt",
+
+  "template" : "Vorlage",
+  "confirm_delete_template" : "Diese Aktion löscht diese Vorlage. Möchten Sie fortfahren?",
+  "confirm_delete_wallet" : "Diese Aktion löscht diese Brieftasche. Möchten Sie fortfahren?"
 }
\ No newline at end of file
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 64f3722a8..4048513a2 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -183,9 +183,9 @@
   "seed_language_spanish" : "Spanish",
 
 
-  "send_title" : "Send Monero",
+  "send_title" : "Send",
   "send_your_wallet" : "Your wallet",
-  "send_monero_address" : "Monero address",
+  "send_address" : "${cryptoCurrency} address",
   "send_payment_id" : "Payment ID (optional)",
   "all" : "ALL",
   "send_error_minimum_value" : "Minimum value of amount is 0.01",
@@ -378,5 +378,9 @@
   "buy" : "Buy",
 
   "placeholder_transactions" : "Your transactions will be displayed here",
-  "placeholder_contacts" : "Your contacts will be displayed here"
+  "placeholder_contacts" : "Your contacts will be displayed here",
+
+  "template" : "Template",
+  "confirm_delete_template" : "This action will delete this template. Do you wish to continue?",
+  "confirm_delete_wallet" : "This action will delete this wallet. Do you wish to continue?"
 }
\ No newline at end of file
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 47df624e1..625d93254 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "Español",
 
 
-  "send_title" : "Enviar Monero",
+  "send_title" : "Enviar",
   "send_your_wallet" : "Tu billetera",
-  "send_monero_address" : "Dirección de Monero",
+  "send_address" : "Dirección de ${cryptoCurrency}",
   "send_payment_id" : "ID de pago (opcional)",
   "all" : "TODOS",
   "send_error_minimum_value" : "El valor mínimo de la cantidad es 0.01",
@@ -377,5 +377,9 @@
   "buy" : "Comprar",
 
   "placeholder_transactions" : "Sus transacciones se mostrarán aquí",
-  "placeholder_contacts" : "Tus contactos se mostrarán aquí"
+  "placeholder_contacts" : "Tus contactos se mostrarán aquí",
+
+  "template" : "Plantilla",
+  "confirm_delete_template" : "Esta acción eliminará esta plantilla. ¿Desea continuar?",
+  "confirm_delete_wallet" : "Esta acción eliminará esta billetera. ¿Desea continuar?"
 }
\ No newline at end of file
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 309918d7f..5a5ee3551 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "स्पेनिश",
 
 
-  "send_title" : "संदेश Monero",
+  "send_title" : "संदेश",
   "send_your_wallet" : "आपका बटुआ",
-  "send_monero_address" : "मोनरो पता",
+  "send_address" : "${cryptoCurrency} पता",
   "send_payment_id" : "भुगतान ID (ऐच्छिक)",
   "all" : "सब",
   "send_error_minimum_value" : "राशि का न्यूनतम मूल्य 0.01 है",
@@ -377,5 +377,9 @@
   "buy" : "खरीदें",
 
   "placeholder_transactions" : "आपके लेनदेन यहां प्रदर्शित होंगे",
-  "placeholder_contacts" : "आपके संपर्क यहां प्रदर्शित होंगे"
+  "placeholder_contacts" : "आपके संपर्क यहां प्रदर्शित होंगे",
+
+  "template" : "खाका",
+  "confirm_delete_template" : "यह क्रिया इस टेम्पलेट को हटा देगी। क्या आप जारी रखना चाहते हैं?",
+  "confirm_delete_wallet" : "यह क्रिया इस वॉलेट को हटा देगी। क्या आप जारी रखना चाहते हैं?"
 }
\ No newline at end of file
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 91dc1e5ab..c8fb80b86 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "スペイン語",
 
 
-  "send_title" : "Moneroを送信",
+  "send_title" : "を送信",
   "send_your_wallet" : "あなたの財布",
-  "send_monero_address" : "Monero 住所",
+  "send_address" : "${cryptoCurrency} 住所",
   "send_payment_id" : "支払いID (オプショナル)",
   "all" : "すべて",
   "send_error_minimum_value" : "金額の最小値は0.01です",
@@ -377,5 +377,9 @@
   "buy" : "購入",
 
   "placeholder_transactions" : "あなたの取引はここに表示されます",
-  "placeholder_contacts" : "連絡先はここに表示されます"
+  "placeholder_contacts" : "連絡先はここに表示されます",
+
+  "template" : "テンプレート",
+  "confirm_delete_template" : "この操作により、このテンプレートが削除されます。 続行しますか？",
+  "confirm_delete_wallet" : "このアクションにより、このウォレットが削除されます。 続行しますか？"
 }
\ No newline at end of file
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 896aae13a..061016ecd 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "스페인의",
 
 
-  "send_title" : "모네로 보내기",
+  "send_title" : "보내다",
   "send_your_wallet" : "지갑",
-  "send_monero_address" : "모네로 주소",
+  "send_address" : "${cryptoCurrency} 주소",
   "send_payment_id" : "지불 ID (optional)",
   "all" : "모든",
   "send_error_minimum_value" : "금액의 최소값은 0.01입니다",
@@ -377,5 +377,9 @@
   "buy" : "구입",
 
   "placeholder_transactions" : "거래가 여기에 표시됩니다",
-  "placeholder_contacts" : "연락처가 여기에 표시됩니다"
+  "placeholder_contacts" : "연락처가 여기에 표시됩니다",
+
+  "template" : "주형",
+  "confirm_delete_template" : "이 작업은이 템플릿을 삭제합니다. 계속 하시겠습니까?",
+  "confirm_delete_wallet" : "이 작업은이 지갑을 삭제합니다. 계속 하시겠습니까?"
 }
\ No newline at end of file
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index f53b1d0b6..ca10484da 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "Spaans",
 
 
-  "send_title" : "Stuur Monero",
+  "send_title" : "Stuur",
   "send_your_wallet" : "Uw portemonnee",
-  "send_monero_address" : "Monero-adres",
+  "send_address" : "${cryptoCurrency}-adres",
   "send_payment_id" : "Betaling ID (facultatief)",
   "all" : "ALLE",
   "send_error_minimum_value" : "Minimale waarde van bedrag is 0,01",
@@ -377,5 +377,9 @@
   "buy" : "Kopen",
 
   "placeholder_transactions" : "Uw transacties worden hier weergegeven",
-  "placeholder_contacts" : "Je contacten worden hier weergegeven"
+  "placeholder_contacts" : "Je contacten worden hier weergegeven",
+
+  "template" : "Sjabloon",
+  "confirm_delete_template" : "Met deze actie wordt deze sjabloon verwijderd. Wilt u doorgaan?",
+  "confirm_delete_wallet" : "Met deze actie wordt deze portemonnee verwijderd. Wilt u doorgaan?"
 }
\ No newline at end of file
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 9a8685746..3319d6745 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "Hiszpański",
 
 
-  "send_title" : "Wyślij Monero",
+  "send_title" : "Wyślij",
   "send_your_wallet" : "Twój portfel",
-  "send_monero_address" : "Adres Monero",
+  "send_address" : "Adres ${cryptoCurrency}",
   "send_payment_id" : "Identyfikator płatności (opcjonalny)",
   "all" : "WSZYSTKO",
   "send_error_minimum_value" : "Minimalna wartość kwoty to 0,01",
@@ -377,5 +377,9 @@
   "buy" : "Kup",
 
   "placeholder_transactions" : "Twoje transakcje zostaną wyświetlone tutaj",
-  "placeholder_contacts" : "Twoje kontakty zostaną wyświetlone tutaj"
+  "placeholder_contacts" : "Twoje kontakty zostaną wyświetlone tutaj",
+
+  "template" : "Szablon",
+  "confirm_delete_template" : "Ta czynność usunie ten szablon. Czy chcesz kontynuować?",
+  "confirm_delete_wallet" : "Ta czynność usunie ten portfel. Czy chcesz kontynuować?"
 }
\ No newline at end of file
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 9e86dbd3a..c1f4e110a 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "Espanhola",
 
 
-  "send_title" : "Enviar Monero",
+  "send_title" : "Enviar",
   "send_your_wallet" : "Sua carteira",
-  "send_monero_address" : "Endereço Monero",
+  "send_address" : "Endereço ${cryptoCurrency}",
   "send_payment_id" : "ID de pagamento (opcional)",
   "all" : "TUDO",
   "send_error_minimum_value" : "O valor mínimo da quantia é 0,01",
@@ -377,5 +377,9 @@
   "buy" : "Comprar",
 
   "placeholder_transactions" : "Suas transações serão exibidas aqui",
-  "placeholder_contacts" : "Seus contatos serão exibidos aqui"
+  "placeholder_contacts" : "Seus contatos serão exibidos aqui",
+
+  "template" : "Modelo",
+  "confirm_delete_template" : "Esta ação excluirá este modelo. Você deseja continuar?",
+  "confirm_delete_wallet" : "Esta ação excluirá esta carteira. Você deseja continuar?"
 }
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 2ac29cd73..22d77e0be 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "Испанский",
 
 
-  "send_title" : "Отправить Monero",
+  "send_title" : "Отправить",
   "send_your_wallet" : "Ваш кошелёк",
-  "send_monero_address" : "Monero адрес",
+  "send_address" : "${cryptoCurrency} адрес",
   "send_payment_id" : "ID платежа (опционально)",
   "all" : "ВСЕ",
   "send_error_minimum_value" : "Mинимальная сумма 0.01",
@@ -377,5 +377,9 @@
   "buy" : "Купить",
 
   "placeholder_transactions" : "Ваши транзакции будут отображаться здесь",
-  "placeholder_contacts" : "Ваши контакты будут отображаться здесь"
+  "placeholder_contacts" : "Ваши контакты будут отображаться здесь",
+
+  "template" : "Шаблон",
+  "confirm_delete_template" : "Это действие удалит шаблон. Вы хотите продолжить?",
+  "confirm_delete_wallet" : "Это действие удалит кошелек. Вы хотите продолжить?"
 }
\ No newline at end of file
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index cb22979fe..326ec25ec 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "Іспанська",
 
 
-  "send_title" : "Відправити Monero",
+  "send_title" : "Відправити",
   "send_your_wallet" : "Ваш гаманець",
-  "send_monero_address" : "Monero адреса",
+  "send_address" : "${cryptoCurrency} адреса",
   "send_payment_id" : "ID платежу (опційно)",
   "all" : "ВСЕ",
   "send_error_minimum_value" : "Мінімальна сума 0.01",
@@ -377,5 +377,9 @@
   "buy" : "Купити",
 
   "placeholder_transactions" : "Тут відображатимуться ваші транзакції",
-  "placeholder_contacts" : "Тут будуть показані ваші контакти"
+  "placeholder_contacts" : "Тут будуть показані ваші контакти",
+
+  "template" : "Шаблон",
+  "confirm_delete_template" : "Ця дія видалить шаблон. Ви хочете продовжити?",
+  "confirm_delete_wallet" : "Ця дія видалить гаманець. Ви хочете продовжити?"
 }
\ No newline at end of file
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 026880af4..bf1b410a9 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -182,9 +182,9 @@
   "seed_language_spanish" : "西班牙文",
 
 
-  "send_title" : "发送门罗币",
+  "send_title" : "發送",
   "send_your_wallet" : "你的钱包",
-  "send_monero_address" : "门罗地址",
+  "send_address" : "${cryptoCurrency} 地址",
   "send_payment_id" : "付款编号 (可选的)",
   "all" : "所有",
   "send_error_minimum_value" : "最小金额为0.01",
@@ -377,5 +377,9 @@
   "buy" : "購買",
 
   "placeholder_transactions" : "您的交易將顯示在這裡",
-  "placeholder_contacts" : "您的聯繫人將顯示在這裡"
+  "placeholder_contacts" : "您的聯繫人將顯示在這裡",
+
+  "template" : "模板",
+  "confirm_delete_template" : "此操作將刪除此模板。 你想繼續嗎？",
+  "confirm_delete_wallet" : "此操作將刪除此錢包。 你想繼續嗎？"
 }
\ No newline at end of file

From 33209c3cd621cfbc4e7b28b00b193f3019f53d76 Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Fri, 31 Jul 2020 18:29:21 +0300
Subject: [PATCH 02/15] CAKE-20 | updated exchange and exchange template pages;
 created exchange_view_model and applied to exchange and exchange template
 pages; applied new design to menu widget; changed text validator and amount
 validator

---
 assets/images/2.0x/eye_menu.png               | Bin 0 -> 939 bytes
 assets/images/2.0x/key_menu.png               | Bin 0 -> 923 bytes
 assets/images/2.0x/monero_menu.png            | Bin 0 -> 2804 bytes
 assets/images/2.0x/nodes_menu.png             | Bin 0 -> 1085 bytes
 assets/images/2.0x/open_book_menu.png         | Bin 0 -> 735 bytes
 assets/images/2.0x/reconnect_menu.png         | Bin 0 -> 875 bytes
 assets/images/2.0x/settings_menu.png          | Bin 0 -> 1051 bytes
 assets/images/2.0x/wallet_menu.png            | Bin 0 -> 659 bytes
 assets/images/3.0x/eye_menu.png               | Bin 0 -> 1398 bytes
 assets/images/3.0x/key_menu.png               | Bin 0 -> 1353 bytes
 assets/images/3.0x/monero_menu.png            | Bin 0 -> 4077 bytes
 assets/images/3.0x/nodes_menu.png             | Bin 0 -> 1476 bytes
 assets/images/3.0x/open_book_menu.png         | Bin 0 -> 994 bytes
 assets/images/3.0x/reconnect_menu.png         | Bin 0 -> 1281 bytes
 assets/images/3.0x/settings_menu.png          | Bin 0 -> 1444 bytes
 assets/images/3.0x/wallet_menu.png            | Bin 0 -> 920 bytes
 assets/images/eye_menu.png                    | Bin 0 -> 536 bytes
 assets/images/key_menu.png                    | Bin 0 -> 518 bytes
 assets/images/monero_menu.png                 | Bin 0 -> 1411 bytes
 assets/images/nodes_menu.png                  | Bin 0 -> 597 bytes
 assets/images/open_book_menu.png              | Bin 0 -> 454 bytes
 assets/images/reconnect_menu.png              | Bin 0 -> 495 bytes
 assets/images/settings_menu.png               | Bin 0 -> 594 bytes
 assets/images/wallet_menu.png                 | Bin 0 -> 358 bytes
 lib/core/amount_validator.dart                |   3 +-
 lib/core/validator.dart                       |   4 +-
 lib/di.dart                                   |  16 +
 lib/generated/i18n.dart                       |  23 ++
 lib/palette.dart                              |  10 +-
 lib/router.dart                               |  41 +-
 lib/src/screens/base_page.dart                |   8 +
 lib/src/screens/dashboard/dashboard_page.dart |  15 +-
 lib/src/screens/dashboard/wallet_menu.dart    |  14 +-
 .../dashboard/widgets/menu_widget.dart        | 293 ++++++--------
 lib/src/screens/exchange/exchange_page.dart   |  58 +--
 .../exchange/exchange_template_page.dart      |  45 +--
 .../widgets/base_exchange_widget.dart         | 378 +++++++++---------
 .../exchange/widgets/exchange_card.dart       | 110 ++++-
 .../widgets/present_provider_picker.dart      |  33 +-
 lib/src/screens/receive/receive_page.dart     |   2 +-
 lib/src/widgets/base_text_form_field.dart     |   4 +
 lib/src/widgets/nav_bar.dart                  |   2 +
 lib/src/widgets/trail_button.dart             |   3 +-
 .../exchange/exchange_view_model.dart         | 306 ++++++++++++++
 res/values/strings_de.arb                     |   1 +
 res/values/strings_en.arb                     |   1 +
 res/values/strings_es.arb                     |   1 +
 res/values/strings_hi.arb                     |   1 +
 res/values/strings_ja.arb                     |   1 +
 res/values/strings_ko.arb                     |   1 +
 res/values/strings_nl.arb                     |   1 +
 res/values/strings_pl.arb                     |   1 +
 res/values/strings_pt.arb                     |   1 +
 res/values/strings_ru.arb                     |   1 +
 res/values/strings_uk.arb                     |   1 +
 res/values/strings_zh.arb                     |   1 +
 56 files changed, 856 insertions(+), 524 deletions(-)
 create mode 100644 assets/images/2.0x/eye_menu.png
 create mode 100644 assets/images/2.0x/key_menu.png
 create mode 100644 assets/images/2.0x/monero_menu.png
 create mode 100644 assets/images/2.0x/nodes_menu.png
 create mode 100644 assets/images/2.0x/open_book_menu.png
 create mode 100644 assets/images/2.0x/reconnect_menu.png
 create mode 100644 assets/images/2.0x/settings_menu.png
 create mode 100644 assets/images/2.0x/wallet_menu.png
 create mode 100644 assets/images/3.0x/eye_menu.png
 create mode 100644 assets/images/3.0x/key_menu.png
 create mode 100644 assets/images/3.0x/monero_menu.png
 create mode 100644 assets/images/3.0x/nodes_menu.png
 create mode 100644 assets/images/3.0x/open_book_menu.png
 create mode 100644 assets/images/3.0x/reconnect_menu.png
 create mode 100644 assets/images/3.0x/settings_menu.png
 create mode 100644 assets/images/3.0x/wallet_menu.png
 create mode 100644 assets/images/eye_menu.png
 create mode 100644 assets/images/key_menu.png
 create mode 100644 assets/images/monero_menu.png
 create mode 100644 assets/images/nodes_menu.png
 create mode 100644 assets/images/open_book_menu.png
 create mode 100644 assets/images/reconnect_menu.png
 create mode 100644 assets/images/settings_menu.png
 create mode 100644 assets/images/wallet_menu.png
 create mode 100644 lib/view_model/exchange/exchange_view_model.dart

diff --git a/assets/images/2.0x/eye_menu.png b/assets/images/2.0x/eye_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..82e097023cf02ace3a854ddab8b06989149becd7
GIT binary patch
literal 939
zcmV;c162HpP)<h;3K|Lk000e1NJLTq001KZ000^Y1^@s6J*?$C00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH13*bcK~#7FrB_RG
z(?AgI9tpOX8~6q>CqS&J!tn{>>?lZxv!_bZ2{8Fk?2?>7`5YkT1Ti-dH}F2vG~L2-
zG^5eS<ZW!t^o(BrTL@d?AiN6{=zvh|Akc^ahUFdtF8MjtsIPOafBlRnDQp4kBQy(>
zL8kmYB-jO@0D1!#OziSJ9AEX4?h-f%lU;@0x2grU2c?gs-*s84k&IX)M?cxl674{u
z_#_@jP5a8V_$f?A8oh@OA}a!lJj!36MjtSz{0)Gfx5xt_hF_wahmT=0bnVwHa~LL5
zV7Kt!0W@FRXm(M=D->y^<vgz(L@wHium%XTCjbA4C!A3jK`U_h0@b~3p$!?)Xidb%
zqWZwDS)PRB8)$(~+4rt{T!acT9IQhhy~I9ENHc!Bk(OLbQs}@uo~+pahMe}jsl-^F
z(31fQGC6voow`EgEF9M~)Ev0*pE!%gv2eAPgM;WUEXW*&w^RO|8bnxwk_bVbR`-~F
z038rZ+sd7Peg8*(IrEOeav4|hnUoU6(YR+4fyG*b0zSafde@K(VE`@Apr+=XWZc2!
zU;?Iv2O0WD%C03D<@?oV@qbMdR2NOPLJ~phi9rTU*T|hL6B&1MpYzuYH>vC?^%kt)
zBg$h$FQ^<XGU0Q46O|27$h~BX*hHkJhzwZZYCNi~9Y(iO;AWMz)gxC^yN)>IdO;&i
z?MCS;j3TGle-fyM|6Za>B%rFo5_qglukKqy62T_oE+dqRoSKUT2x9XR9OeI7f&p%F
zj#}Zwid{RYCPGPsd)|F*0zjM=KjkyK;U4N~yO79V2eEN!hKjQg1HM3fKPU)D<{@7D
zI=gb6aS<uX$eJ`(ga^{8>vK!LS)>gz6QR53U9$T(*^7PH7lIwLhzo^+pd!w&BgeKu
zq(<h6kV+(O>gS2)TZp>m+e(@X3C9GW=cm!`vAx<j>2;?vE<h?P!S8~m!dGm)Ave;1
z<6zWus;TF-k|_vr-{RRNeBS(9zKE6?>3x}Znq@j5ZsRl;b8lVn*5K0r)Og#_>r-Vz
z3OxQ^q9b(1lL=|KO=<pYGBz=-)Q%>_A8|C?T!y&h54==yfcGU(#b1xpxYRCHtf>G1
N002ovPDHLkV1l;8tfl|}

literal 0
HcmV?d00001

diff --git a/assets/images/2.0x/key_menu.png b/assets/images/2.0x/key_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc69ce578e24cf9f3a8dc41ffd3b876a2baa7182
GIT binary patch
literal 923
zcmV;M17!S(P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH129QMK~#7F#h0;i
z+CUJ7cTdDMd4ec!K)Q66A0P(0birLFF|qvwl4jDI2~H-Rp-YExCbe;yD$Wx`kDxwC
z>s=XP=@0^)vH4~|(h8k^_I7Xg5Vpi8ckB`35dek%Dc<|;w*#>&*a9;#E}zx`(6-QW
z(|b=YC?f`nL_DdWA~6h4S>(f03tA#ZsPBO4q!$)!SIixV&g<Q``1|_D1YtX3LVj^b
z0CvtwaPp{vy6)vMAe?IEFrsL0hmSE@SDL8s(FAqfQ3udE*X=Ck)i=L=Bj+F7QG-+d
z3X=2}D0q~hUM5DUfoi4aB22u+UYf`!qPV?r4;{Lr7NRvO`wbHLU;L(5cn>zn;uOpY
zbz6+o`RX=@`WQ7R;n*G3r%-DkQuA&=tV``7z<@L2`pkbbStUkZOmX~Izo!U$d{|GA
z2#G-*M_l|6DDwhJzEO_s+paebkYE@C-XOxcE{1@-)C)Y72l=U_u;|?jL4D}{bT}RV
z+!wzx(3an^m{F0KGp{)>31@!$f+&)p4IoK*@CrxFUX*1=6?8FGm<uY&4sq=OQSsUl
z@wrteiXDE?Sy*Wk;$Gitoq!>UAdVTkVAV_pw>U+6e!FnK552LAfSzU!Es9<)duA0$
z3`N`^>0%^1<e!!eoJ<Qv2b#Ig<DG&bDBj@#{$-6-W1y&Jv6r5kcu7TIIe8NWRRgl`
z@AqceGiR!5@4x`Xy-4oCW$Czz7?Xu=4wnZ93{bqt*;#|Es$f7Zo{lwB0}N1lFsH3S
zReG~+Oa>ba*vdAj3=x#egpZ$py#NEG{%I!TbtpeYky$WKwQMDQTvI`c;tm*qTDGF8
zAg;iAb~s$u9H@YF2<($q*2b;r5DZY<7EJg!$r`zkp1<c6e4PPgrB_I~4ng{3(`-$$
zj51r<nI!ues;gC^X1&uwQJyZ=x3#%%KZ+~2Fd)KV4W>6zo9^3MIMSy{ct|gl6D061
zb3j^fR%Fok_Km$G<Q7KWnsnqJf)Ub~Jxq*HxDAplQ{2kZ8q2=~Fi)S?clWPh1C;K|
xy8h)Zzfru_;P^_5C2xZ$;OhxLeX%JaDYuJzc}cdZNe2J`002ovPDHLkV1jyYn0x>L

literal 0
HcmV?d00001

diff --git a/assets/images/2.0x/monero_menu.png b/assets/images/2.0x/monero_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..b92733a165a0f14ebdd26f537ac5a8a0352ea476
GIT binary patch
literal 2804
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
GLSTYgtvc-h

literal 0
HcmV?d00001

diff --git a/assets/images/2.0x/nodes_menu.png b/assets/images/2.0x/nodes_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb07fcd827287f32d3a1cb6643d785af8948e4a2
GIT binary patch
literal 1085
zcmV-D1j74?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1JX%EK~#7FrB}Uj
z6G04?_RLJWxTECKGQ;3BwAdv@e%w%B8j4JQJG#4TX>f30=#o5von)wOh6hNfDY)SQ
z7*oNJ+zH9{IrpP=Y@?aPYgzkAD`_Py0@JR4aexT>1mFT-|H<Qrhp%2fy9Ns#_?>Eu
z&Rbq?j#*uY;=@+h9N6}3`<<GD72ZQN1dL)#TJQahGi2o+Ae<EB2R9V2ehizD2DTTR
zUlCxf!0xw$^#<q$yKL|kFRNL8g5()Kxv%W0K0s$*1KaU0>xy!rdi&%{UE9OT{i1Rq
zL+F{2+f`Ee2xOCoZ$Ex6>%X9Fk8Ai}U;Bj+RlWmp7cBHQNxrIBHXQ(wi8*<AT}mE9
zi6_Zc<V&IvP*4V=K+74yFpz9QnFhBMZ{b)-l0;(eGSD@<WmDpevZkb=W%oFF<t9}5
zv)=aCKWoYpG`$pyKl^-YUc)sX{Om*6yhg>c(ngyRd%?x`rKJb%o7XRJQ4FIQAcC@C
zY;{e5v~URh{&TbN0jvhhYs8|;ry4Me5ea88jQ$o<E`%@x6@lLc8>^aJS|MjuE>zK!
z#o)*-h>pXxzVHNy`3*55Mrft7+y18-U$JT`N0b~Pnthvc4Lj$7J^wu50+cDu6x}db
z@qWv-P0;DxRZ(4T8g}X>lRZsd`B2Q|o=|L5kXN3{nI2e3YDN)TLM0t_;(^`ZLW;_P
z2Eam*xUC(mHKZ9KlB$f0%c>NY-Qcp9?HM#`MA{7+RA2_8VTDYFF-^b>xF4u;j&YVp
z29rCb$>nI`fgQiYCv$p=^6qi4-pul(0+tmJduU@t(P71AI-TUeaoFsan+!#_qh^&O
zLvaH$_diWSu#ko=9g>HhP^;l?V$4&H`5@b1#$#AVx~Ifhc)Q`n^EiorO}_gb@1AQ|
z!k)Vj!IaT!kwRqd6DU?e9zL6Q3NNoDA0}W6^bRwR^5UsDt~F`L>Gwq%7%rk*M(hgb
zL$(selr+;^`0sXnA3$FD@Eop#rjwp_9#0fUvMQHMQRvx}PpgE)*Hf;X?I0YpbH;xJ
zqj$%V^o~mL(SSr!r@`(zvc}XHlN-ykU37SZ5GL;l?lB&RvSDJZoPbiNx#V`WxK$wT
zgEB=+9%y5^V6XwFWqGJN+>AH}sIL4d9?)JtLqI5x@&ld)4sGq2y{cj{)lI&n=E%l}
zcGx`Sda%m5u*sFr<Mj&1z6*A;6eNl&9P*>_e4pDONdi--H9BnsGY}hi#ChgH>2V5y
zX@~1A&bqDC6VfEO-cOxw<|Q#!Fy+xRW<`W_AkXuEp=Qud#IfYg00000NkvXXu0mjf
D2WR;<

literal 0
HcmV?d00001

diff --git a/assets/images/2.0x/open_book_menu.png b/assets/images/2.0x/open_book_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f7c2c0f674c1b478cc6b45f35df7bb05ff759c9
GIT binary patch
literal 735
zcmV<50wDc~P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0(414K~#7F?U+4o
z+dvS7XO>K_oFK{xq8o^*4O`R+tTHfS$L<4AJV6ZDG156V5NRWIs1t-bLF5~-w{|Bp
z6h%vnewMZh7kt2y5*NGk?QmGU0cd0=l*@TAY8g=HfOt#*Z2+3`R6+#t40QS<>`!42
zk~kV1pQC=@!2VM#iX5WwGVEt1)Y&lpLx3IFNRBB1F(k&<;b8(bAZFlp5UB_G{^V_r
zL8&71QNZvtxEt`3Tc{<@B0>ZPCRNCj;8#Z}(?tTGA>^Pf+g&*^!|UN;=py15&H~gE
zc^uS}Jf9BlGJ)i0l6nTwt=iia;%p807P>S)O{quH@82lr9d9h}yu)$59eZ&m$OlVt
zycFdSoN34C2aV3(rRla@-0GsDsAY`hfBq3D)#ZBf1(1q`HIx}(091)GkMW|I7vfC+
zx4_-CW3fqG41sL(7bLHai#N|=wPrE~Px(uZ$WhVvuLloMQ#+y7Ku-Dgvlw#Hl?u8V
z9=(MZO2I2s17)iQ%2o}Otr{p>HBh!{plsDZ*{XrERRd+KR|zG?LEK8|NZ1J6N)N#W
zomB16zO-cLk1JEz0xE@7!#O~N0oy1ByieGwB<vu^b$STv^f|cq6c~?Cb+tI`^)@=m
zp)~0W2c6%r*7M8aReNsGL}c8_O?Z%QgZRY$&{b|PxA%EtgIbjLQ#N~gcIOvz$N4En
zzC!0)J@-3r7x9llW#aOw&10>MN&KteXk0=qbQZ=vvFFlXz%8wzJ!#4#DtZc&<@&`<
zE0*ke_nAF}s>+^%b}-py=MgM*5{$U-<aU8b8XY!$r?RJD%xruU_EXzf{{S?V1ZpQ&
RlBoay002ovPDHLkV1g@~Mo9nw

literal 0
HcmV?d00001

diff --git a/assets/images/2.0x/reconnect_menu.png b/assets/images/2.0x/reconnect_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..17a08ecdc1a9e15e5f0f3227b899cfd4588c32c3
GIT binary patch
literal 875
zcmV-x1C;!UP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0{}@xK~#7F#h5*E
z+CUV?-;;1ArE`Li8`xD+%5`RJRHg!VnTc`834~4%JS3iUCS@u<ascBtO}IgH1nLCs
z<~{K-t7V1Q1&03&w)Txy`my`I7K8)pCi)p5$}0q@Nr39YJO#k9Kr#3lU47T*ARIug
zsDGNG|3H_u&3DQql_I>4!^y#b2&O8~e^geaR03sVxmtS#a)DV&%Jkw(9F9HMlZs#v
z<b?hNzD!?q+n1Qi^qkB+eLkZ1Fu(tRF#KYIxHipcM*RlN{Y-(9H6M-u!}|5~WAZw9
zcS@IU6r|@nZJ8^~Qsg&7&2;9xWgOZB^V=0>sb+g5)v@ym3Gmvx!tj^UZB9VERTA+d
z>;S`>fgh-2NfGG;lxh#+j7wqt2`uFyd{)N@=mtcq^D;LEuh)sgDOl(>8us)p|0mOU
zZ;8<w2C=T0d*9+PaRWk_=7%zXEoFw039k-cIRRC~Om7>4o2Va@%`1ix7rZ*oKns5v
zt2RVGg3U0UG8k6HG?~Mi`k5@OX({j239CoZ5)(wAn1W_BYIWnwj_H|1d{qX+@=P#X
z4)~HkC+IzbLEI|Pzd`<`5WT1Qru!+Pk}{YzAaiZPDinxv4<|y^!B0;LwvO%%iRzlR
zt>sH`Zi30)wi$*cI^A}yFzN9&ftKKCn_m^ZuuR@&7%m63jTw01Gh@|O!Acz*l>w0h
zN4peC+J>Aj+2o})pw`?88{i1TqP(Q{HC1qwm##UXOl+(6UwD>lBdBUy)wLWDRoFAt
zfS855m3$O>)lR@s9(|h}kSD|wScuC3Xg)*dtN}P`Eiu}(5vJNi!C^ciZw-XG49e&6
z@*-IT!~QpOXw-5*lDah2fNM2pdzhkfU<HIIdYY;AAs*I`0mI5l$8CG`$CMaT>EGSQ
zZzp^@m_g;tqiB*^RPGaI1;l=X^9paN{lc)aD9c)jdF4JT%nFFrjl&-QGNDIZfd-pe
zh+SknN>fWgzf1r}TR@*>Sx6X!?1OG}X_Y)}^dGn%q&lwF;h_Kk002ovPDHLkV1hL=
BiQ)hN

literal 0
HcmV?d00001

diff --git a/assets/images/2.0x/settings_menu.png b/assets/images/2.0x/settings_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..9456a57c05abf797f818a388076c663753db4b9e
GIT binary patch
literal 1051
zcmV+$1mydPP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1F%U%K~#7Fy;n<e
z+CUKP9+6a*<OcEyf=>{90n3~qc<cCsPax?8;7?N7Sv~;}SJrk;U~&TM2&`i?oo)eD
z(l8@|D&<#Y1M};i{>^KI9We;UZ4GJwr~(4&$QT07GSs7YT2DuDZ@$ZUxXa?xaD1fD
z8xnwTUqPuxh`xovJ#2}s6yRI?8Mf|NKo_>d<dw3^A8{|OTZlD+b8{172n~Qlu>w7+
za*J|JoP|I88G0`+;q3p&qwFL9?a6oR8s3|sdj1+uzqsUVSl}cacRXwjUFK&0KP@Ob
zHqE<olk7XP@1xm*bkE#}g#*Og5o>(`R!|Cv{hRRcH&j3@hX|oNQ1!@T*R0)wYwb09
zkB&`q)_&9?eYH!9okr7;(=!6cWnM`ih&5WdP7dJ}=58;b)j=SCxeocD#jL2{Z4|`3
z?w;dFVyIs}8U6RD#{6X;#bj)UJ5xiOxeI>o^3OJGBH{FlO@&=<VRsMkEP8k}0&c>Q
zeQcVW58>(up+j)_e(dAxIEc*g^KhE5&|*eBaT+em=^9c%OyRsSV&TJWgbO77@;wH)
zCJc<BjxrCmna@!RQq3mk&k09zYEyzsceglZ3F3AOYOwNM5p!Y}-NwBM7>b%!LR1o4
zdsXMFs>%HJM&M+W9hkxeH}PR2bLCO=&*NzTO%>oPn46RDac|~YE^}n$J`whzsRFop
z`zxpeEzC;Ufu;(Oks(#LUxVHAWDNPxRDriZoeR?9Z!@iII0=81tR}A@G*y5Ds=OIn
zpP>dGW~JAZAEXqTDuAey@?jJSUvRBo&Gn088fgMe6}S$Asp$rfUrrmt5yC2S<xxuO
z2x_qsN}1fK^_r_5mJe<#!sINHTCdneG-oBdw&z?JGSon=1m_3KKY8nm3nZ=VoDcmK
z{p#Df1Z~iBdCrYxb5WoaXiOl6=3zoET*T9YIUx;Xk0HEmp3RES*qUetNuSO8V)|JQ
z6b1~-7tk(v*$?dBhC!)fo`w%yW?j$xwM1B1(In@D=h5_;Q_dFMR)&+`MtPqQl)t=*
zPCcFdF`wJ&hKACcDA?PElsXxX3x$S8YC_v4d`(JAw0uP%2livP>-)sq3h8bqT5f3X
zFPO2S-6aBR-&fZ^3d81<zBC^+XKz^7V2E4(f=)hg@YVE>bFPL1m*r}kQ?|y1yTPc2
zq;6e9vrBvK?E5wa+Z&q33anAz_fbluFKwLhzbGKcvjw~(E+QA}KwZ80lU@5q!9N5K
VBu)%jROSEx002ovPDHLkV1mY-<ud>P

literal 0
HcmV?d00001

diff --git a/assets/images/2.0x/wallet_menu.png b/assets/images/2.0x/wallet_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5b622fed65e3d58b63a3f490d361252aeaebe32
GIT binary patch
literal 659
zcmV;E0&M+>P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0w_sDK~#7F?U+qY
z+dve@|IbeLxk23<zzygciI5v)T|VmWD~(6$zCl3MUCRj|AolbG$qg_kAWI||4{w4)
zCdMd+@kbW?Br6_&$p6fH{`<`%ScKv<P~?9jU|RzLDuh5|4L!csO8$|(cz!%(Pn?H5
z61>|%-DrG2lv{&mL8+KuXp&SErD3{8^GrB=>n#=|vL`g@sFfrq1KFFP0(cTS3jTH)
zm05~(+9rSZql*zI*V^pjgmnK{bWczNIjItRwirV@NrtEiAL?J`P~c@Rswzx*<UPy7
ziqS#^n54aXr=OK7Xjfcp5Sy#wylgiuXkQE?whIAAO39%oG2|@9;5<W5PM<3#Mlk}E
zDd?rs>lj4+L$US0$o+fKxwgm7A>%S)!B`VQR8&kJ&VsT|@A}zUIb-|~w2Tsxdhzw%
z6{j0;poFBxnLQ@*{(cpgYj`KlKBTo868Yi$2n9Z=5&O%8XK!gKqcdaY89I`^D}ME(
zoKqdMlv=i-Y(Y~|QCGeq>dln)mKjk>`|JF#ui!wb_0Vs*Ip&`)W`F1B<)<R|cn>N@
zRf24ee{9|qxsH>6VZ8drXzF3qMBcN!tkd#}vX7dWu3jxnH>8z1?cCV7NZ*meTeD!S
zcq!dayDiqEX*_E-jL<|ICIdGcK6?YxEYgr@7+$f2rg1e*>S?ox`!i?;(`^ZlMEAf9
t$Uc*XPnfbaTPs&U%-b1<>A-I3Jp%QL-mW#C5y1ce002ovPDHLkV1oEqBf<ax

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/eye_menu.png b/assets/images/3.0x/eye_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..cae06bb91e4181e20e8aaf82a2c023787d9e49ff
GIT binary patch
literal 1398
zcmV-+1&R8JP)<h;3K|Lk000e1NJLTq001=r001Wl1^@s6ulNAq00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1q(?;K~#7F#aT^m
z+g1>sA(?FJ8&pS7ZlJ7#TG9!u?uy1~<b45>K=)B<C+N=d2_z-xI`Ro3pP=jww64WB
zogqa-7CDc6l$?BkEc%gr<Tw8_LO3GE;p}7sK^Kww0N6pGE&-fC{>gv<2>~Vmv?7Ar
z4Wz5T;$Z?u1j2#HiTFK4e9JG|g&hJ8udy^}rl~Qv#~|36l#nstjVUA3hDasW{F&cV
z8XrQg6{+9CMRa5`B_L7!ADC$ya!#bq!_Per>6-nd1K$Lc7=-9U*uQbPt1&6o&Sa~d
z?}4dL>BS@-uA5w3ONxD`lVWhqQtN>m)&w*$WELOe;Yt>M4QE{+e2$I~x@((~donMZ
zn4^`H5Hje0aeV>4ei=|Y)FdlGCPhD#LvX{IDE;{=9?oqSsiZQgG9hpb214j6I(^yX
z+Beasci>J84ARKvXI|A}TS8(Y8<u3#tJzOtNygv^k8t`rUYx1t_ZQj|65!G$1dDkZ
z#0j*3jo2en;zI%YGq4b1=Z_#yk|m^+z6VDHW^<!I3nQ?AiA_WarS;u^>VksU@>SH2
zK_Oj4ITwhwG!rzmS+Jm9fFeYB4<EhRFRYB+#RpPZ9;zWE&N<%OU<V1bL|)*Q;d}lM
zA}HTV3_H)zzusNRNJ*t&ORT%mW}^E{2U-Ga{8ygI8k2~sX{`4q{PYk-Gg4CeXd8+T
zRfNyV&8zIY4wADdukK6mO?p=xi^j+nSvjH0UUKL$!;!`8rduD{N2Tw081%srDfolx
zGnDKnZ%Mk_Kvjj44F;LDd4PDPZ7MB5<rxm$RqNaojtglug_KOnnPt`LR>(```6K!E
zKvBI^$6C$_NDaeM{>-2uvKB_M67HVWQiv2`Gdi#T`1?oksY=O`F?Y(1MX*>Zr+Zxf
zl)~&TM4Q{HU(pgJe}?^qc7KpZTD4*i@|i(dT7F(|4z(LO8eQ-;UzO8?XXtgA+&m@!
z=41RS^Fbl{9J~=%5oh-F0TEch9rp+nWqkPk)xUTieGXA^K34P4RuQ)?NNX^?j84@k
zm$yRxKel^4_75p-DpiS`)NE$N8(i?0wGD6sCDIIPXNy)yy&YjHU!H_bj%Hd>dBSG&
z#TL>0Ja-&{Sl$HMx?5>hZRzJSJiV2JEcuGI^cDbFIyy0V3D(%ql0TY&+jaB8R^fAC
znd;s5<Mi{;ByL*{&G97%th^dYig|3<WO>sbG=MaeoTs8f!Wx7Ssrj_rG(PHlv-%0)
z9q6yoXikum3(iEc{D9p7C!0E~P%09Hc^#R&?GI+Q`G{D^e$`WI=g*@BM?+g5LkW?Q
zIl&U15Dn)eb20t>#Zu=hta*@VnX~bXoF69D06Y=IVmNGnwGk3`@Rb5r9lX@pagKJw
zMh(&e<+Y%F99QSx))85~DL!no<X<r2tN5oSv_MlbTg*j6wt!VT%xq3f!2X8b#2D|k
zD2+5oQV+bKj|79}gHkiOj0P8VS2Y?tpNBJ^q5G~gbe1HpgeYWD4|x_r9bP-xl5lBJ
zc<Mysre@xFmcFgIq{tn?H-zLenI*c6-WroCAf0l%S-3OSgq(xIzVq14nN)!%B$xfL
z5RiG_^jD63v?f&`n{gn$<zV7GblC&<bu>MMOo4+*705~>j%M714P0tJ{>$|rF6&Ar
z7aWb$KC%Lthmi<g$B;xlnKtD^%Z<6ed(N6UR3jSx2j8Trt0RZ$Z2$lO07*qoM6N<$
Ef+9tQR{#J2

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/key_menu.png b/assets/images/3.0x/key_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b423d7c4aad86db16f1eee51053d3f18541f8ff
GIT binary patch
literal 1353
zcmV-P1-AN$P)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1l~zRK~#7F)tbL^
z+cp%(A3$dJe_-W5ke9Au=3FCd>t=Q9wYKB#y(4+oJ!<Uax>eq~SxT<6<+Y2|zo7Jg
zpgE@S@*YV!v;^>%z*zd+`799-jIRJZeDPobJIK%eRo4;jTLAO~h?&ATya@Z_d>sKh
zMk>m=rk8v9=l8gH{%6>amhUC(5NG~XM<<GLrQ6HD-x*;nN*P2Y;N#~zA#5oM0Xn8S
zF~*nq_ggQliYNpT<kuIo)xo2RsEj!UkAs~E9yLTUd(VWt{)s-be6W=xR#Q|CjP6mr
z<dNGtVI*pgMBUaGwImg{Rl-tHl155&O?4135UB1zIDZv1HFaT2s4D6r=!N|HIGF5{
zoeB(9JqNacx}unWr+?pk=lwuILU@|m(N;u71#(y<ikQc!E>|D2P!_!UoYv>)$=BGa
zKN+DAN98rYM!eOM6aV7?1ssu>xe_>j@AodBR9JOUOE7X!9Sp<%ysYMvO+^wltS5>Q
z9bSvPCd+C*i7*lskf=ANa+*ewsf^d+LO54YLZhk3*2M*<3sUUoj|&3vj{b0T5q>{4
zeKr&2gRw(6leCs%A>R~)a}WX#-}$|Xsl4(&me?GS18VW;!4)8`_KG_OC&5R4Ggd++
z3mIyP%GOXwdli_(DU=*VC+4;)2%@3q&J3Ut7%2gPqu_ZBQ4g2`3`M^|{!3eLuK)_8
zXH<hbQ@U6;!yL+)RdF;=rWe8MmqjgVg(XgaH_h5ns|m%TmYjx@9#20h)U0T2Em;#*
z#opMXny4nM1&>AQnoC8Im6?(F87=N;`Ha>Hf6jwSQ@1@)%p+k*)B-pxs6Qt`Lv-EI
z``=#OnJTfx5wtd&pQ$$IVJc?P?|*YeoP9>suk#I4xb}<oB4T=85(Jv^;5?LYi+1yo
zY%p!ueJ?1<LN86;&O7$6JZOPr#E$(>9_{4U`U*IE7xWHb1Gw`dO?K*NWz>=p6X{;1
z0VAG%upx9|Fr{BZLvbskCeM<T6?(ctb_}+nmV=AXWNv9Rdte#40LRl8VN_&U>cUn@
zffyNz2VfaVi|B>ENKC;pF2;WtiuQi_{hxiXh~&eYu7HBc7%ao1#us(EGG`H6bvh&r
zwGGBf-9ZbmW6?b)Z`uKia8%UVpATVw1}%U&3${{V^#rj~H=1=|VOm#EC1KJ8+VERG
z+oech5cat>11mb9?TE5E^(7jjl$7oZXa&6)pnjC*3hO|^Kr4(gPKRI__M~74R_Fff
z8?cB3j7<$%_i(f~YEuoI!vM?3%%INo9dUfHMCwWP)(HiUz%og=r}=Gk-btovL$X^+
z!?6XUXG)bOXX=s&%RHQZ@d|jm>6GL=iYZONS3XrP8S0V<<Aw`Hji=;wlab?*Itf1U
zNEreVM!I`18$3$Cod%QJlC<0Cp3YTO&S;#_;n9YIj8$1ScM~27%Mv=bP?|nV^YW<N
z|2~ATX4z-=VsN_>l$YJ4l(eCS=fUBx&=PA2Q`5iAS!PUmj*U|eMXZ@%cJ-85;^d0;
z1)VXXG{KM1GR8}Z=Kmd2M7z^3kMY<-kus8$6V%<x*9Rl|3cYV7im7y?nY$z7uw8lW
zu~lMM(N^RuqV`oSU*{kSk2>8I>E*>z=sf$GQB<5N72mXV3a`Q!Y=>fcnxCT&00000
LNkvXXu0mjflvQ(O

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/monero_menu.png b/assets/images/3.0x/monero_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d81566f554143862b10626dfeea7139b9453295
GIT binary patch
literal 4077
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

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/nodes_menu.png b/assets/images/3.0x/nodes_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..d97ca64e155a269e975506548ee0022056daeff1
GIT binary patch
literal 1476
zcmV;#1v~nQP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1zAZ%K~#7F&00Ti
z+g1?2Bkg9X5w%0m04<<=19xgS%TtFImbA5#>8Wkt#Lm<XEl7TXD6w6%Q`s$>|MUZx
z9@|OZpbAi+K$Z%~XoxR&kCaSF<a<Yv4)OzJQsVL6-Mjbh&pRVz*!TbJAc7B|Hq&2l
zm|zl}_}xFCA{KbHh*w;f7lLXNpRocpyjGL&*RVg*Qu3e2{&}Df{UQdaRQNpX1|Y=S
z;spwx9ECdreB@tvq{i<iM)&S*ct1bfw$7e}*T?ra`agWTeFhEiQfjj80OBrK@aolT
z4<r!q`uD%r2OvPY1kF(B?mBeofE^MVXo}aNf7((2Z5tg4-=PnT;oU<^O2`TfZA85D
zL5A2ypae97)WcXOmUxXE+6bYI5Xq&21PZJhU7?CV1dMGI%*#0r`!UUMV4?NcrCDfz
z+*)Mf#m^+MARSBfOf*woE`RwuesT5L);BLnqc+X<M=1fsn3_8cY>1uDx4y=|u3p3@
z##3J8MY15q7F0u}lJAeh-ftifKJWWk4kx{BWr7bC!jC6G_gTu@g8kr}q96v-@6uqD
z_u~mV-iiN}Xy)gISHW@6)k~Z`6JKe6%<T=w#*`W4mjw?XSx!}95}v_=FAC4FD!{mH
zC2Yc*AX0#FTT0Xso*`C%(X<kEg=bV!fYFo^O$g7ZtN=rzgbR}x$@}nUl3ZWqpEV^s
z!|Fy&Sah)z)%z3}jj8g!f6=2DaXNdahVYD)EHK4_B_f;f`kip+jADt733Y{M6k33T
zMgq<u=l5A!%l`K)U&`h2I6Ut@_q*rQ?+^XcO&8q*)T#4w8OYf8PkR!DnGSL7psYN_
z0^!>Ux|b#S_;^B9&@W-XG`XV)Op3$PqGuo8y%UB{z6d}FNqM@Yz@y-T!@pO`71YR8
z$)`n8k(HmI`wtkvWgsVzV1cxxTw4;rC_DpM$fq=b_AJ-rZKg|ueixO2kktg~cy6a~
z6e=l|g%{Fza|)C(D*(@q$2Tsn^L3;d0&XfW59{PgN<Ci5EZc<7uvyCs6%1=F1xdjs
zOW4+&1vvQ7tO(vq2ILv^M$QMRtX%X=Z|18z9xq8PxC}KpRAf;TudHU72W{d@FrFN!
z(NWNSQ1pac9-X4OmtX+7(+5Sacu5YyCQeX!OH0UAlReDVbOFeXCjF9UpuG#7n3X-}
zz$Fo$AuUgr6yOs9hujn0Mma^s8}HvaD~kbqewiD1K$E~0in7y;Q9}1Lo1J{r<&**}
z(DVxS@+TR5uTz$cSFK!#F%33V&OPa!h~C+)dRAJ5S_&*>m4YCZrUvdTnX9YB$_m(0
z;(U<G2Rp{92L(k~DGo^T`B{*nkL#>&<)1ZK*;Q7csbZulB`PT(6+Z2%sM#^Pqmtft
zw4@g4novTlfK+&<BjGO>qG)fOveY8s>M9}H#8Tm<DR7aeT6JSvEl_FA3pzAdl5($V
ziJ1k`*<%6HE(<4JStRv9B0T6k>VL2|C&ov?&Ie@=7cBuC#R1zl-JkiAQd>Z4s!e~>
zB2sA$>PdyqAnB|aX%;P!%8+kesg9#Cnp(%<nJ;Z+-XIdX%GgFA>Got}MMgd(GiSe|
zE+q&WZYftuhXw{90=BIbw4a=t&b$#F0gX<9r)NGTsL-t!bv&CcDFMj!d7J_-)D&at
z{v6Wg-GgSKOG;jo9TQcBE~N%rf-VsskX^68clYF{FJD4+#CEwLUgIt$ttB&|c-_t;
zJ3Csfi0A!;76l|-N@-`YX-G@Txj;rUy^C2_lFT#w<o?Dp$v<Y?CUSChfcFx~MTcI&
ek-wu)L*4+yvw6JbszO!(0000<MNUMnLSTaRnW%dJ

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/open_book_menu.png b/assets/images/3.0x/open_book_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e7c79133a98398b18816aeede058792a5cc194c
GIT binary patch
literal 994
zcmV<810DQ{P)<h;3K|Lk000e1NJLTq001`t001`#1^@s6sN2#;00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH19wS8K~#7F?V3$e
z+dvS7yGJ5xAHg@kIf0cm6>LrrvP)4RG5b{6IsqmSDobvF4V5+W4a5mzP7r4stm$-1
zvQdl-k}L;A%~vIj^<z!HnVyl$^8gHnX9p$^I^FYnfYxU|*(QKGpPKM3K7aOrV07ZX
z_23El*u8W>!6p*40jR;JYFv&vM(>sa_q)3@PToHkx8J?!@X_HT&lj<tMm->HU!S^L
zKCF=s+}O6VTS%c079?Vp!}qyg-BxdYEW3=tQixiO2!>M#{Kb~b3ujJk3YLQi%|!O(
z3<(a7-R-`7#5fgyLJ44)!o*^6m^FnZ)f8xlP&GL+2TCBI;Pt7y<J&UEpd=_72Mt8(
z?DsAp>{WyTXt<t<y-T&(xS<+_2}Dp97FzGP@NEvDQRajHg&Y>)NbD?j5}&LAt*gE{
zGCmJ%1gfW1C0#3}Qg)MrX>)w>>{OUlzB^;WvHE~G;JAHD2RBQGR9$xVvZvt2t6$%~
zY~6r74B$x4?YkE&G#uy+7VE%&fK%P)vFvg04_M4~-`$xcuSe;hjtx0D?rx8`kS(0q
zv{Fr;Jfv5hLNi-B6Adf`m8bOWa8XPia*0b4S2~Qh=m!8#<J`h6h<Y_^8qQOVEH#L;
zr4$N_TcjVo<Ids@_PXZ{8L#|e?Wf((>DEI;FV2RwP@1?!<UPZM&toE0+)1zH!kSU=
zf-&N%ilQa6+Q#jl-%xR+=TgP3@_u<Pm@!vXjJT>|#8nj|uBsSuRmF&_Dn?vYG2*I<
z5m!}=xT<2rRTU$ys=R1%vV<l7EZ_UrS-dH{nCPwBNK+JXMZ5yldB{2-;v{(I-W7yH
z3j$tq9*)a2(iBCOskyP+9M|T|fU`_kXy;;V;=u7ia|_maw~Gk78(_hw-eqnhO%WnD
zku9E<me@&xM2wFaJqYPcO53LCkw$Ab>w^6<BaPN-v}y|Pb${?uvu=t3hs89w(QC6>
zvqR$zt;2PCj2?R4u+X}K)x9Ef<6EHhNK%*^AT_e%-ZmyutqB>7Ygy_KD0mYuS>L(#
z#Erl`cvYh10%GG^J?#otJT9{?8D~=p-Y4e-T)gQij5I|NK^WRRV36jDz=yuPMk7s8
z#=H#>m7m3cgOGz2j5I}&;CaI0NvnVXCzrTIW=5LW_~t+fMDHl_$}r&k1-%K27afQ9
QcmMzZ07*qoM6N<$g7*}~m;e9(

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/reconnect_menu.png b/assets/images/3.0x/reconnect_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebc7672cf14479f051bd368b66f4fb7c1750747f
GIT binary patch
literal 1281
zcmV+c1^)VpP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1eQreK~#7F&6=@t
z+eQ$EcL8W7CG!T*8z@cMKo4M%Y}1(TG9JmHp8&uUNVb(sI@4t;Qp%(b)uoH`1i>Sq
z%!~l6cL9<Xr90qA-jVudG?K97kw5NkvHJrE&y4f<j|h?a2pADi$cK7z904){%m`st
zRK?A2=`d>>2jQ7;5#Nsa+r+RCV!-5{%2X%t;KIi7G%PXr2tW~R0TQL}(|+>gI2@4I
z@$|$;|1U6~B^@)L%2!wEFkc?<;6PXuB@9aRFCQK_h%n2dmW(cv*-G5rg_(#VfH|T!
zssca!kes3X@TQ44G?DD6AKe?v`103Y_n46=r15p!f2WH#$;RhoQwvow=M!<dH(@5C
zDx}dbasLw-aFN`~Sdl8miR9b8EJfR*1j&N@D_6w|FL>#LV_b+5{=WM?|33Qh8&u31
zAN$|wjJXoEf{Hs$<iwdU+2jHGQ*b4U2>?E8LZLHZ70(o>?NA@zO_cDk(s+y$VQ=D_
z#I-2lb^PavCX`zj#!IjVh%a?<TcQLXN~JJ9sh_P2E5RS=W=k%<wnPcov^h_Yb9G{W
zDI)eYkx5%cu_@BOX_q^~#Kj)#={^iBaS=~PJl>@`O4*0_?9RF{Y})xJRKA~q1sYLx
zt*E3zNaVMJ8AD|X_RHb~cBD&`%+_)bTNlO#jPjyMgc0n3iKu(3PM81L7lx>-21fOz
zU<<lML0(cdd}!=g7Zy~7E}i!Z41R_UF%wmu{+bTgPN<W9tfg1V*)sdC%M)C39#03@
z)SEh#q68-;6|vu^3H6TJ&;A<NKEqm3^?RX%ru7Ie8{dyIqU!B+I-GUAudTyn;io*t
z96ETD-2SJz2)Bw7T4(HQKeaS7F_fjjOC*9079Fk<HflbaBoa~^H=Uvct+2Kxk;UoC
zrWM>$h}WK|qZpbb5;-}KTqz?_f>M|*-!Guzoz5=f3T50iYjSelCuhfEz448T0Si4g
z5!H<U2oq79*^W2JZ2YC_@tz<vdY!yT!2xSCX6jLxiV_w{LYZt#W^G$m!d!Y3yoBCr
zLcM$MsB^z=!%CP-kK(GHVN_otsEWV=wJ>hlMy@>yB2vDem*dV=zlvIzuEiE?c@zPZ
znhF8k>@m6LyAO||fFM+U22c(T@c8<mag->t=~3uE2i*vhDnJ!jw%9hPZ=7>Kri$^Z
zn1BOVn0oV4Rs9PVXg6NiuB)m$aDXHa<>oalUE1hw6056CF7}(CErNHg2uwT*pU6o$
zC3w0bwcuMZuq7t#ycjQSHx+ip<3d!u<S_UFw!qY*aJ2-Nc!V%l1*AaziR(w$fNhNz
z7kF*1(kA}Ia}p)g{aBkn!OXe;deydc77uu7Q#$Nflu!#>^kM(#Uq%_fbk1(>r|a~^
zT#m>xJpw;!?uE5J;I(&A!m5MjS(7t92D=<Yl(1$EusCTn2VjSTi4xW>&<o3~(=#;S
zprQn&VS1k2#Hh8-+K~smijHKn542A3;$bXlKu2Ik&Xsy%v(?#!PK#Rv7GBWj-hO~h
rLmDnZIX8(J&+ME>naS-@ct(5yqlRu^_s2$100000NkvXXu0mjf9X3&s

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/settings_menu.png b/assets/images/3.0x/settings_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..2da43a238955b8fdfcf75ea75505fd74d3f1c0f0
GIT binary patch
literal 1444
zcmV;V1zY-wP)<h;3K|Lk000e1NJLTq001xm001@!1^@s6fm<4y00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1vyDXK~#7F&05`Y
z+eQ%H1?hLD1Ezw=6__d@B3Xgxw~R-$s0sj7V9Hc7c@td$MS1cpx`HSjARX{ICa~Eh
z0S!#w0lOd`{LN^L;T`Vo!+m%AXM~n<6@DHd(j@{62%s;&A>cDVCq(q=F1~nx7J<+b
z4hx46fCkk)DM=|C{}GR$p#_{wU>2_WDRw^a;|Oe6ex)@2Gae^!0!||EK3qqHc+HPJ
zXof8k-F}RR5i~?20wR|H>AukT>7az=H~Sb4*I<N+zzK5E!YnHl0bY17gJ5Qm%Qi!r
zy~?uv7fqovk^`>YF_u-Vl~pYPt6T^u>QZ()kH_2c@3MP44ETD*2vndXLx_G4ho7o?
zc?lfk(!H<07W3%<Hakk+)@^@2F3XU#GOUypIwmm6h1fu4H+S*aWT2+u<D?B)eM8_~
zxH{`%XQdo;%W|2!<f4UqESA-^MOI%aJ1_6X3jtYt2Rl!o`084@Xp!G;Y{g-s=)O%U
zJufUdmInA6Y8OulAWjzH#TU>mY(JiMhYYgX^0{~|A8=1#8hu{X94eJuaz}2+gN}|D
zad7D9nF!gT`*l+>7hFZ_P$8?$BDy%oe9|XhFO6KT!qq5X1E;sl^;e`uR>V@mY4mvS
z>%_)rQZq@9uf&!1s&$~&^0KUEynP=$&GUe_>de(52C41~W&3l}c=3YCD-51~<FR}l
z7V*WL{Bjxvyig~B9c6Wke`?2>!+sr!F70kTO})VPQq{JKh1S}N{I3Q=qI2(St++V+
z1bmRIu39#1nGt6lN`K;8V*kg_KeHy^^6ixP--E$k??%WWCRYPb>~=F)_x`V+%@@(=
z1}ac<MQ(+x>x=u=Y1#pCi+ziiLtnRe!Cf?rrLU*Cw+p(LV1P|Rh|a;qK*_>DiM;Q|
zIR%j^SW*)>xCL(QBWoUvU?b!sJSbcc4b%j7&^>dvP@?sX%3$|<<2%$@5WE2;^b!i-
z7k2|T&hL;%MjVgyK?ywpa(k+D5&=xWFqaEvJMg1HPXOH(m2aRvGz6c4Gs|2q=m})>
zuV;V(Gz5D5F#cUFOErNmq#I9DpW}f67$I?p&nR}X^dC?{O&~Y#8&?}10uK`ckB=`m
zlO;)DI>hXx`BEnXN%Vpe`=qc(K7_Oc155<E*-l~v_hCj1H6*ytT>83ODJjyC>NQz9
z%hs~X8~Z{$S=cmMUrM~2X4#h_rr76y*hveBW>s;7ytjyKIVKYUfrNPM+77{c`(U5L
zyd?+u;sWm%ld_k|P8v|fxT5{KJg5sIAt&Q1hl+jny5OWh50vRi$$a=)XBFWlUj}Xh
zJM3QjUScUFfuuBaBx>+|y6_n68%>;Vvc2Hl2ItMf#w4l=@d^_BxP*of*>os-U7c20
zO?-!5l4U4H2oE_?A2hieQ>Iyy(N?AR5e9i`@lgo)JA$riGL0YK@MoRK9q-6DB_O+v
z@K6;$Xw&<moV(~^Y)<ZKswU;d$iG_4YN!T%o7@#x((BMtjkkcY8uWd7y*!X5<0i5S
zIF)irfx}u2I<E3NYh=pw_RF9aS-s3*%V>Mk`!z*Ab=5@hz_Pkg7WrB$9@dswn-t^z
zgKT*`VM#7Z*IQQ&swGgMiLA<n?%V-X70E5dLp1?G16f(2l3^Jp0tMd3>mmEj^EUsp
zhoyK}Mk4|Ra#@MLq|W0UVJ{a;UiBC!5fGdpE3;f&IGI3!ci~@L<xgv?{BkX#L|zT#
y;zDZ#3ds53TCg~D{gOkMWV~<=K9+4Qyukl$!aDPGSgdXU0000<MNUMnLSTY*ypCu9

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/wallet_menu.png b/assets/images/3.0x/wallet_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..7884a4e2384ecd656abe25758c8a2bb8ca6ca1e2
GIT binary patch
literal 920
zcmV;J184k+P)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH11(8JK~#7F?V8_F
z+dvS;zm-g$DZ!~Aq=J|Nf^i4rEt3IaDv(qGV$5XnMpA*nDIlZ*=m3?#bAq(lJ?xB0
z?mQFWJ4+t_W;BR93-tN!_V&*a92_R!dPLkOV4s0)JYJ1}K(`FOWu~v^+1qRTXa3?t
zGTw=)a|&<|t$>SPT<w0&2E}}9H2=#{G8x7c-?T@RLftKj@ATcDw9al!2jLWLhH)~=
z_Hw;7!iLGXTZ(F|0VS8OKV^ekGZia}zhh01rDSFuO|73x*u7Yvyu;O5o(=BN0L<({
zEboj&taaD+8Rl}Aj?&46+#guFt=6U~OqY)sI_ox+N3tjE*dDA1X;VchGJ^^R<&N(C
zNT!-qSXos+&~Q5ZaOUXRj$98ld9-FMSodyWZD%8_ZFI0=#B6W>#EWi(s%G@S*4C8>
zQ!y1H@lB(CDONc~iDeU9m^#~~cnvTcE5jE-g&ikXITJo20Ktrhh)S6#h$tn<h{^Oj
z;K%6~j3C0Mp7<if??Zt)e;er8+Pw=iqvZ%MNE0$d!%?zV+b@;q#QL52A2Fi7-THA6
zNm!Jpe&Rgu!epv+ZL%~h8m0b%SMOHQ6&7t()fGIlGGEbms$t{Zw~dXkWuqQGJmOs#
zIXsF7U<V!vVD52kYbS~>e2$v`5hK2I^hm-px_K{&Px$!1E?;Yu?h%&6aXPtk`HSWy
zOd$_7_ceRTD~NYrad|=%k6ryP@8mfIv5M!}K&NAlfCMx5GPO?-P+ZV`%!re!Bh?Hl
z|A*ikw3bpMsb7h}cUt*}CsvYI%pVILU-Z(wtc>DUs0-Wo$(3h<r{T+UQUliZjT789
z)>@d=mGK=`EQ8?!KU0e9c3}_H36_qoiyn)xwd*z_#dTP{Z%JkjeR<x?Ku3!lX>)a|
z=`b1h$ayk{3(f!O34*2++h?`4X@SGOTnIfAn#f+D!g^Q>xEQ7Vm&PiV5>{YM(9=Zv
z(+JbkV(Oft<uLJZwq%|}$!$KfsG`o3{-2XN|AhZ)ZS<JmqENm`XtGEnbTjMbaOO3R
uvdJ5H>OjMG*FmxsaX-B-<?SzBwYA^OojR<Ej-NpQ0000<MNUMnLSTX`{H-Mb

literal 0
HcmV?d00001

diff --git a/assets/images/eye_menu.png b/assets/images/eye_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..7676b4dbcd7e2dc58ef23c08aa45fb35fd4f2de7
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000sI000dL1^@s6q)t8=00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0j)_yK~#7FbyLA{
z!Y~lLll)IgARRazPyxXeBz%()=s<P_n1RXU7dkMI$s1DvqytLeogiKAWSKDx+(**+
zw0pZcBV34A^VLR#0RqJY(Bjk{0Jjd^%sRLJ$dcXp9c&(+O%ZF1MgY`?t3f*;98a=N
z-ps0c(>KeZM!ji*5ZPpsc2JYO<L<VByT$aQe!47%rno%;5)k<qa{Fp=`7}%BvddYD
zB9}B|?0D%qRI4Kpqqb@g0!q28^u<`Mb>x*Vp2U&u2^ay!{dDf{DvQx)4Kht1GVg&e
zR&f)^69R~oJ$G6jSa#jZt0~&5_9P-V4!$g^_G$Q%Egoh6Y`$ZbQ3Omc_dQG4GxU3<
z)Qxyl%E6-coe5hd5pEUXj7=qtb|W&R+dr~d@b!t$UD^LS_oMhldO>^l%`8$6CK3sH
zbbKlQJ=f&!Wrk$Vn!ZX7tJY<H^eT8zGHdVB&`AgxA(~TP8v`j|5$YmLvc!xC77p}I
zfo&<7a>PL(I{`TXs$Yh^61FF}5=>O`?~_hUXWh)>rD6d*sOW*8kj*6S0QX$D<?8u4
aKpp=>tk|&_;$+hR0000<MNUMnLSTZow&NlI

literal 0
HcmV?d00001

diff --git a/assets/images/key_menu.png b/assets/images/key_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..929f153918608d6aad596e44fbe18633997d2dcb
GIT binary patch
literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0h>ugK~#7Fos&IM
z!!QtqcV$DJk}}*NlvIQZka0sBA0TA7ft3@G3@}6Iq@)TC2Y__x;v3*2xW|&%wep82
z%HNx@$CB5d-jmh{C+aa8*EM=y1|WTwcY%Ntv;nEpFy}dhBUOQrO!jN^?NOjj2!csV
z3}Ay{2ZO3klu=jb0GUE>Oml}tBS?)P^K~3pMSAN68ISzU4<4dP2#77R-5|>u7c1ip
zG#0Ui@K^^vikKt$=(p*!-U`IF75Xt1HaWGiE0(K!s6ta3Upt`spdd(LiqX<U8LcZP
zKg$&jioWs0hfu0c#E@R|1sYBG8ns5Q_-NxmT+O^xM<x*hN_xyaqb~csAm0WOv?p!5
zBFHL)^&(rm2j6tn3V?>g5P`~l0XWk-0k=}?-@n-b+ArGdd|!>A-Ol)7mu;$P+G3qL
zK^kyqi^LN*UbUb+4BHl&(0b|w`KB1KD{e4_V%~{9oBV>I-6)avL^&P|T_?71z3q?w
zFKSV_I6bF4zRjlZ`Ss0xLd{s?zNWsppy`~zGeigpGJ-w&1M!m0g38S!`~Uy|07*qo
IM6N<$f_^R9S^xk5

literal 0
HcmV?d00001

diff --git a/assets/images/monero_menu.png b/assets/images/monero_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bb420a807c8b33ab40cde4da0bcacccad02f5ec
GIT binary patch
literal 1411
zcmV-}1$_F6P)<h;3K|Lk000e1NJLTq001Ze001cn1^@s6N1|)U00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1sF+0K~#7F-I!5&
zn??|TXMnux2=oM%Phj}~wW1T4zV&OJL_Ps<f-14ouW!L8kmdG0@(Ci}fFtl8!E^?8
zVL?cMq=$Z)@54syGW#>Lvpcg0N6M}L&jc*^83`r`G$w!%6qiVXfH6OlYXbx?58*Fs
zI6`np=efTeWnj$-@q+==Qz+))*54@&{|;wy-?w@J3RsHvpM2}>>7uO_TMS-UlSXXC
z@t*!sU(im#cmDI7d-+heSR#Y)^Cvq?Ul-vl+53L@e912Mc%TV`yHyLt8A9;cpFYB|
zfbad)Lb-F0(!H?$vxoe#b<k{aAH2PTA%OW@L+dLUE+U}dA()2EzE!Z0>CS{dEQSnT
z+k)dZSo!S!pn{-{McGxGCt3mD2di%t9K|VRv%kXG#`pl2=cHKHgYICFL7$p)?stDV
zcF<mGYYOD2V0zIBSa&PM-}%e5Vim<f-R*;<798@S8QNbfm+!i}1}JlcpL}V9Yku+Z
zvh&e(NP@fj@OrTW*zA~6dZFDaa5lHW;I(hBB&`3cq5qq1vnl;a&qqtY!E>sNE(r+z
zvVfl%PGlrH1x$X(SX2d#UUQ)Y6bL96VTyIMYO9_Z&VaO*GOy)_L)(w+&RDg1zZFac
zpjc18CF`8NH?1mB24|8=7xHR=`Pkx8A}E(J2c4S|P*(ZkF~xcju3MGC!FmEpe}xkz
zL-KN6rC4)qEe?(die*VYVxG6kLR&>9uJvoCRkhrQv*;8^fot1^-V|%9mPq{{-TKRk
z#i*BM6PAsJRnG&t4^D}vZ-~-W`4pW?i$TgQN;ZD^U$^S%kR5O$xwYiRk^E8fah@rF
zZcfe<x7-VPZ-ox&3)us%5X;HO6b2)j#}<RRinrXTdE<AXhjc;qh68ae8Houe8ikA`
zit}{{RrKfv=qdXkhrsQMWZxBFp|B2kP-M^kBV66=gKWaR^OxNJ-y7&HSQ<zG)w(k*
z39tyGHpn(OK>JIlzIG2Lj<{B82osRgsSVG=E}a?@G*Av{NMATLW~}eAsB0u}V-6D3
zVeRUD5wh(o^pvJ0kAW+os;!j4#>F!fz-ryusx|Q;oUM6IM&<>yAG!(I3CFsc`tSYg
z7ir2%h!PYx4tIWGWyM#ZJ>`FEx&Ito585rXyRD4VjSkDP0c0<JYHLHJ8{>X$iM61b
zpdOqc0y)I3ZDJ-aVpS)<1zhkP2>5m+t}-*46zoZhmP;5YT(wPjdD^LgQb;#CIhN(C
znYiSDoGd<a_7W6|AYibS+V+y&I`(LhddI6j;yRn)O8-)0<s!vZ&Le*oMFA73ZtfPH
z59)ccrE~@Z7V!a+n8g!UlYwD~NIx%k5-wEkph^}4vt9tB?ObqDG?|qhsm!{l`qDD9
zE&+3w8Y#Eb3st5&i$tN3Wt<>#5KvWgM%|N(lpJP(Z<(*EdQ{b<=)U3O4-F{_EmjOw
z#(RWh3!AcwCY)KgHxmqOQ`0>9Fz1R^tV)8n(C_FYKMB)|vB=R!9|~aS@QC;3@KZPq
zntkPXP5Ma=nHjJs`#BHVc088{L^<b<I6Nu`51yrfo>x!)C&zEyN{i!MB78h__AH**
zf-~kVOSVuC8i$~Se5B`3Kf(d&1XKg*Ip?)2K|Z?3=Ney>NPw~1+ye`IB+J^Nli5o5
z0MVek$GN?P^G;f9DSJHoA$ptS!9h4-i%rylxeG=ntgekziySa(GlG98`42GBI57*`
R7Bv6>002ovPDHLkV1j`^l5YS2

literal 0
HcmV?d00001

diff --git a/assets/images/nodes_menu.png b/assets/images/nodes_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..b743f91073016fce2c785f5a89804fbbae26a6b9
GIT binary patch
literal 597
zcmV-b0;>IqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0qRLaK~#7FbyLx8
z+dvE@PioMgAR56NG#kVVG`2RVe~TuuCy+Ej?8fk~n+asQ1K6FQ$p)SvI0VQ~>=W~-
z+$n<L93ULUBOl*A^7uMi=E8hKM4L$5U|ggYHVw0~<2d?HB-Tll&WiMb{JP5juHio?
zp~4_JgD=6?-<dDH5QJp!=MHmp6a2rjRUgUS`iv<vS~(m><ZQ5k{@B<oO$@&m^C7fh
zHLi<gPlzpv{Ats@%2#u2_Ab91>Hp8HJdZgl0XRgt#8kUwtOvid-qHu85t~wX1p(+b
zR13*_ap^4o(1Yn<X`q5A6XWStV9_ME#B2b(;+a;Q=HCkiQGZOP50THDxO@F?u9mHa
z$o#ewS8%H>T@ShtaT6%79T~oh#W~6TA8~xaBptYZ_*iR#(PCwNlKr45$>F*0gRMo3
zWIw_cwgSgA@6}g0k^Mb<iTWz3YLRESp1;Cl#dIN3O^%8f1Z#^Jggq+avE&n?Eg0w=
zBpC7Zm8f$JgwcV-QPdX|gy}Z43PW@oM8q2FFohO_`alP1T3jxS<9H4pb7m?lJf=g6
z?Ntw#@CY4RYdngq<5v5~7;_eE(4MG>r>9@(>G@^y31&Bj%40^K^<mukk*+xx=@#4I
jFe4_naTG7Ku;#u2`Cbr}@_kU~00000NkvXXu0mjfuGt7c

literal 0
HcmV?d00001

diff --git a/assets/images/open_book_menu.png b/assets/images/open_book_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..34721682e48723564ae7f209f46e408a990da1b2
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq000vJ000vR1^@s6a!@wR00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0b5B#K~#7F?UYYW
z!cY*#znRwq)EjUE>j~ODA;Jw@6G=FLN$CmH1li&ZC=l1y8`K-r6Ug55jq?f>8WA^y
z6<_lD{&eQ|<}Ky}jwtHKv%n*7Dv&_8nGjM~ypNMkwlCo}UPfSClAwz!M^>fS-X!Ve
z-WKE}kp@K|U@%&&9Ndyk3G9<pF%IBE8uj>0Jk`aOSA&d{7nV5`p{}wbjc;jUmvxV3
zcA+CB;+*Z*yd?8Upo-zu5f4dEE5Up-FpOud62?_It!gG3isAI>uKlq~)))M&J^Ues
z7dky_a0MI3ok#p5#u0Ufonfbdxejn`<PS#6SLYbk^4lb7=ZBK|@k_vL!;N$3i4<#?
zAkqH2uN}issr@!D){Y@r-Q$CJaieh|D(5I0&S427H<SD9G<CRjjDuQPbq+(EIp^4z
w#2WVd8MDB^1p4<{w~;&33vv*p`<$cJHytdCO%b{$ga7~l07*qoM6N<$g2O4lsQ>@~

literal 0
HcmV?d00001

diff --git a/assets/images/reconnect_menu.png b/assets/images/reconnect_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..d94a875e7e2f1d17f33277b979a4053a0355a41f
GIT binary patch
literal 495
zcmV<L0TBL)P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0fb3JK~#7Fm6YF6
zgFq0*cMrzrlz<&19V87Ht-$fsNeotSqyq8JgKyFSCXUah1MNUc$g|<H?s5<r1Ohw5
zu*0#x`)<DlgdTCDR{<bi5`YIl2>@<(WR}m%iv)W>B4Wt@6-pf1k5mUn3BoE6#*e`n
z8ZskRk+3Q+MR$RHAUoPm<QT=;OvhtH=Y!KN9)W}mS=2#_m<MZ;dn3r#v1icvmYf@U
zS_hfw^*JKM1oYL|qZC|E?!4Wm4k8;VggdZuqDGJlX=2}jAr}p*kUjUtjsZkZdU~&_
zQj4O{s@U)~Fo?SRUKzp;UdgiqNZgV0rpi6c3R`?@Gv$jz#dC(dGA=A2x$<_4*%j%7
zFY35(0u7<&dhItsBpm((@^lC-p)enNK9*nS&JUb;`GK}=AeUz#+v!11SJg%9j)`UB
z_=?&<((G)fax?!RC5waUvK2&tp(Kdv<yyZFE%a?%XK`Dg%ncWP=0(-$1j!Wf;B6Hd
lu{E;4g)9>8UC<RG@e6rW(9o1U(!>A&002ovPDHLkV1k4L&7S}O

literal 0
HcmV?d00001

diff --git a/assets/images/settings_menu.png b/assets/images/settings_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..35ef51aeeaf2f65fad0e3b86f667fa81feea3293
GIT binary patch
literal 594
zcmV-Y0<HatP)<h;3K|Lk000e1NJLTq000mG000sQ1^@s6QafI100009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0q03XK~#7Fg;PON
z+dvT9UMp2O>Iu#ZLS7K(p2Fw_h-+dJ=LM^M0S1#)ZZ<El4V5#_3*!91KR|b^9cEU$
zSQZAhN>x*%nV#O>9;iKMXlAKXdPu<ckec69Wq;dj-L6GDacZuIoHZP#yMJiypo*WS
zf3+82U~YOE?u--;e7RD~4OJ&^Ij+zVz&rv~<g#BjTRj4NGmFudF0B=ikImuV7PB18
zjDfp##*N0s(GN75OHwpS$eqjYjZTh1#B7i{xOt>LC>90^Ma>cgPK)b1xi5?KPDEk>
zyAGY(?WC;+_vAiF&A`lh;2IgKqgYYl*bGH0K<7N>gzw4!(0zl>L~1T=whXALZq5)P
z>&dj%Jnh1Kz8c%Zsix|KOyjR7)0;gz04(Xp5X?t5D`Psu)4C&h{}Mo{UOTkwk6i$_
z`5&TO+!)gmvkpgo259*#KoCd1w1WQk)h>?Z{T=je)TZqZ0r0e=I30FhR9zFMe630C
z&iWYxqi*OgF(_`>7*u$AME1h=eJqo?x$mS1SS4=bjnr7ORNUyT%w{?h;GojprKxv?
zCQqy!3%-~?2MMZK!+}#-;d+@8HW2kZOEwrY7)CAjt#fN>9#2W2;?nfbo5?2tQKYcK
g{^{b9HO&>z161hx`rZsv5&!@I07*qoM6N<$f`z*SB>(^b

literal 0
HcmV?d00001

diff --git a/assets/images/wallet_menu.png b/assets/images/wallet_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..47f9681935734d2f2dad279795c77671da61b135
GIT binary patch
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|&H|6fVg?3oVGw3ym^DWND9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~z5|F@@$V@L(#(vVoLLk2v4ZR{V|-q|(nZraDG
z^lJA7-kSM`-$vRr8ho(($|mO^KKbTP<7IE}u%|{|u2G4<q-5|+D_-eP6GKe~>m^pF
z87m(&_!zOZ*p@IJTy=b=hLCjT%vB1R!unGSgbdfWhEKgb&1FNkTXgcTy=INUrC;{{
zoYUdM*>(2ceV1jD8-HHqb+1uZiZ*_hsF(L4$7S8w4MIB)d9}Dr5Bea#A<KoOQ*zgg
zuK_+aKR@hFQ*m~8Sa@=c{;a+F&wE%hC0zb=rp>;*;N9nS=5KvM6r=gif3?;7?)XA0
zO*qbQ$;ZlO>je%{)lYfVW+Z(6aeG1Pqo;|xnK?a^`$F<XJ%GW$;OXk;vd$@?2>`_G
BjG+Jk

literal 0
HcmV?d00001

diff --git a/lib/core/amount_validator.dart b/lib/core/amount_validator.dart
index 0aa0aba23..8ed81e0a6 100644
--- a/lib/core/amount_validator.dart
+++ b/lib/core/amount_validator.dart
@@ -3,10 +3,11 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/domain/common/wallet_type.dart';
 
 class AmountValidator extends TextValidator {
-  AmountValidator({WalletType type})
+  AmountValidator({WalletType type, bool isAutovalidate = false})
       : super(
             errorMessage: S.current.error_text_amount,
             pattern: _pattern(type),
+            isAutovalidate: isAutovalidate,
             minLength: 0,
             maxLength: 0);
 
diff --git a/lib/core/validator.dart b/lib/core/validator.dart
index 312c7f356..fa867c1d6 100644
--- a/lib/core/validator.dart
+++ b/lib/core/validator.dart
@@ -16,18 +16,20 @@ class TextValidator extends Validator<String> {
       this.maxLength,
       this.pattern,
       this.length,
+      this.isAutovalidate = false,
       String errorMessage})
       : super(errorMessage: errorMessage);
 
   final int minLength;
   final int maxLength;
   final List<int> length;
+  final bool isAutovalidate;
   String pattern;
 
   @override
   bool isValid(String value) {
     if (value == null || value.isEmpty) {
-      return false;
+      return isAutovalidate ? true : false;
     }
 
     return value.length > (minLength ?? 0) &&
diff --git a/lib/di.dart b/lib/di.dart
index 56e5eeb3a..fff785d99 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -10,6 +10,8 @@ import 'package:cake_wallet/src/screens/seed/wallet_seed_page.dart';
 import 'package:cake_wallet/src/screens/send/send_template_page.dart';
 import 'package:cake_wallet/src/screens/settings/settings.dart';
 import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
+import 'package:cake_wallet/src/screens/exchange/exchange_page.dart';
+import 'package:cake_wallet/src/screens/exchange/exchange_template_page.dart';
 import 'package:cake_wallet/store/contact_list_store.dart';
 import 'package:cake_wallet/store/node_list_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
@@ -42,6 +44,7 @@ import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_keys_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
+import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
 import 'package:flutter/foundation.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hive/hive.dart';
@@ -299,4 +302,17 @@ Future setup(
 
   getIt.registerFactory(
       () => NodeCreateOrEditPage(getIt.get<NodeCreateOrEditViewModel>()));
+
+  getIt.registerFactory(() =>
+      ExchangeViewModel(
+        wallet: getIt.get<AppStore>().wallet,
+        exchangeTemplateStore: getIt.get<ExchangeTemplateStore>(),
+        trades: tradesSource
+      ));
+
+  getIt.registerFactory(() =>
+      ExchangePage(getIt.get<ExchangeViewModel>()));
+
+  getIt.registerFactory(() =>
+      ExchangeTemplatePage(getIt.get<ExchangeViewModel>()));
 }
diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart
index 261e73f6d..7dcdbd306 100644
--- a/lib/generated/i18n.dart
+++ b/lib/generated/i18n.dart
@@ -135,6 +135,7 @@ class S implements WidgetsLocalizations {
   String get reconnect => "Reconnect";
   String get reconnect_alert_text => "Are you sure to reconnect?";
   String get reconnection => "Reconnection";
+  String get refund_address => "Refund address";
   String get remove => "Remove";
   String get remove_node => "Remove node";
   String get remove_node_message => "Are you sure that you want to remove selected node?";
@@ -372,6 +373,8 @@ class $de extends S {
   @override
   String get trade_state_underpaid => "Unterbezahlt";
   @override
+  String get refund_address => "Rückerstattungsadresse";
+  @override
   String get welcome => "Willkommen zu";
   @override
   String get share_address => "Adresse teilen ";
@@ -998,6 +1001,8 @@ class $hi extends S {
   @override
   String get trade_state_underpaid => "के तहत भुगतान किया";
   @override
+  String get refund_address => "वापसी का पता";
+  @override
   String get welcome => "स्वागत हे सेवा मेरे";
   @override
   String get share_address => "पता साझा करें";
@@ -1624,6 +1629,8 @@ class $ru extends S {
   @override
   String get trade_state_underpaid => "Недоплаченная";
   @override
+  String get refund_address => "Адрес возврата";
+  @override
   String get welcome => "Приветствуем в";
   @override
   String get share_address => "Поделиться адресом";
@@ -2250,6 +2257,8 @@ class $ko extends S {
   @override
   String get trade_state_underpaid => "미지급";
   @override
+  String get refund_address => "환불 주소";
+  @override
   String get welcome => "환영 에";
   @override
   String get share_address => "주소 공유";
@@ -2876,6 +2885,8 @@ class $pt extends S {
   @override
   String get trade_state_underpaid => "Parcialmente paga";
   @override
+  String get refund_address => "Endereço de reembolso";
+  @override
   String get welcome => "Bem-vindo ao";
   @override
   String get share_address => "Compartilhar endereço";
@@ -3502,6 +3513,8 @@ class $uk extends S {
   @override
   String get trade_state_underpaid => "Недоплачена";
   @override
+  String get refund_address => "Адреса повернення коштів";
+  @override
   String get welcome => "Вітаємо в";
   @override
   String get share_address => "Поділитися адресою";
@@ -4128,6 +4141,8 @@ class $ja extends S {
   @override
   String get trade_state_underpaid => "支払不足";
   @override
+  String get refund_address => "払い戻し住所";
+  @override
   String get welcome => "ようこそ に";
   @override
   String get share_address => "住所を共有する";
@@ -4758,6 +4773,8 @@ class $pl extends S {
   @override
   String get trade_state_underpaid => "Niedopłacone";
   @override
+  String get refund_address => "Adres zwrotu";
+  @override
   String get welcome => "Witamy w";
   @override
   String get share_address => "Udostępnij adres";
@@ -5384,6 +5401,8 @@ class $es extends S {
   @override
   String get trade_state_underpaid => "Poco pagado";
   @override
+  String get refund_address => "Dirección de reembolso";
+  @override
   String get welcome => "Bienvenido";
   @override
   String get share_address => "Compartir dirección";
@@ -6010,6 +6029,8 @@ class $nl extends S {
   @override
   String get trade_state_underpaid => "Slecht betaald";
   @override
+  String get refund_address => "Adres voor terugbetaling";
+  @override
   String get welcome => "Welkom bij";
   @override
   String get share_address => "Deel adres";
@@ -6636,6 +6657,8 @@ class $zh extends S {
   @override
   String get trade_state_underpaid => "支付不足";
   @override
+  String get refund_address => "退款地址";
+  @override
   String get welcome => "歡迎來到";
   @override
   String get share_address => "分享地址";
diff --git a/lib/palette.dart b/lib/palette.dart
index 02b135319..f5f3becc1 100644
--- a/lib/palette.dart
+++ b/lib/palette.dart
@@ -23,8 +23,8 @@ class PaletteDark {
   static const Color lightDistantBlue = Color.fromRGBO(81, 96, 147, 1.0); // borderCardColor
   static const Color gray = Color.fromRGBO(140, 153, 201, 1.0); // walletCardText
   static const Color violetBlue = Color.fromRGBO(51, 63, 104, 1.0); // walletCardAddressField
-  static const Color moderateBlue = Color.fromRGBO(63, 77, 122, 1.0); // walletCardSubAddressField
-  static const Color darkNightBlue = Color.fromRGBO(33, 43, 73, 1.0); // historyPanel
+  //static const Color moderateBlue = Color.fromRGBO(63, 77, 122, 1.0); // walletCardSubAddressField
+  //static const Color darkNightBlue = Color.fromRGBO(33, 43, 73, 1.0); // historyPanel
   static const Color pigeonBlue = Color.fromRGBO(91, 112, 146, 1.0); // historyPanelText
   static const Color moderateNightBlue = Color.fromRGBO(39, 53, 96, 1.0); // historyPanelButton
   static const Color headerNightBlue = Color.fromRGBO(41, 52, 84, 1.0); // menuHeader
@@ -46,6 +46,12 @@ class PaletteDark {
   static const Color lightBlueGrey = Color.fromRGBO(125, 141, 183, 1.0);
   static const Color lightVioletBlue = Color.fromRGBO(56, 71, 109, 1.0);
   static const Color darkVioletBlue = Color.fromRGBO(49, 60, 96, 1.0);
+  static const Color wildVioletBlue = Color.fromRGBO(45, 60, 97, 1.0);
+  static const Color darkNightBlue = Color.fromRGBO(33, 45, 76, 1.0);
+  static const Color blueGrey = Color.fromRGBO(87, 98, 138, 1.0);
+  static const Color moderateBlue = Color.fromRGBO(60, 73, 118, 1.0);
+  static const Color deepPurpleBlue = Color.fromRGBO(19, 29, 56, 1.0);
+  static const Color lightOceanBlue = Color.fromRGBO(30, 42, 73, 1.0);
 
   // FIXME: Rename.
   static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
diff --git a/lib/router.dart b/lib/router.dart
index 974c6caa3..6c03dc1dd 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -411,45 +411,12 @@ class Router {
                 walletRestorationFromSeedVM: walletRestorationFromSeedVM));
 
       case Routes.exchange:
-        return MaterialPageRoute<void>(
-            builder: (_) => MultiProvider(providers: [
-                  Provider(create: (_) {
-                    final xmrtoprovider = XMRTOExchangeProvider();
-
-                    return ExchangeStore(
-                        initialProvider: xmrtoprovider,
-                        initialDepositCurrency: CryptoCurrency.xmr,
-                        initialReceiveCurrency: CryptoCurrency.btc,
-                        trades: trades,
-                        providerList: [
-                          xmrtoprovider,
-                          ChangeNowExchangeProvider(),
-                          MorphTokenExchangeProvider(trades: trades)
-                        ],
-                        walletStore: walletStore);
-                  }),
-                ], child: ExchangePage()));
+        return CupertinoPageRoute<void>(
+            builder: (_) => getIt.get<ExchangePage>());
 
       case Routes.exchangeTemplate:
-        return MaterialPageRoute<void>(
-            builder: (_) => Provider(
-                  create: (_) {
-                    final xmrtoprovider = XMRTOExchangeProvider();
-
-                    return ExchangeStore(
-                        initialProvider: xmrtoprovider,
-                        initialDepositCurrency: CryptoCurrency.xmr,
-                        initialReceiveCurrency: CryptoCurrency.btc,
-                        trades: trades,
-                        providerList: [
-                          xmrtoprovider,
-                          ChangeNowExchangeProvider(),
-                          MorphTokenExchangeProvider(trades: trades)
-                        ],
-                        walletStore: walletStore);
-                  },
-                  child: ExchangeTemplatePage(),
-                ));
+        return CupertinoPageRoute<void>(
+            builder: (_) => getIt.get<ExchangeTemplatePage>());
 
       case Routes.settings:
         return MaterialPageRoute<void>(
diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart
index e4eacd21c..30136815d 100644
--- a/lib/src/screens/base_page.dart
+++ b/lib/src/screens/base_page.dart
@@ -19,10 +19,14 @@ abstract class BasePage extends StatelessWidget {
 
   bool get resizeToAvoidBottomPadding => true;
 
+  Widget get endDrawer => null;
+
   AppBarStyle get appBarStyle => AppBarStyle.regular;
 
   Widget Function(BuildContext, Widget) get rootWrapper => null;
 
+  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
+
   final _backArrowImage = Image.asset('assets/images/back_arrow.png',
   color: Colors.white);
   final _backArrowImageDarkTheme =
@@ -32,6 +36,8 @@ abstract class BasePage extends StatelessWidget {
   final _closeButtonImageDarkTheme =
       Image.asset('assets/images/close_button_dark_theme.png');
 
+  void onOpenEndDrawer() => _scaffoldKey.currentState.openEndDrawer();
+
   void onClose(BuildContext context) => Navigator.of(context).pop();
 
   Widget leading(BuildContext context) {
@@ -123,9 +129,11 @@ abstract class BasePage extends StatelessWidget {
     final _isDarkTheme = _themeChanger.getTheme() == Themes.darkTheme;
 
     final root = Scaffold(
+        key: _scaffoldKey,
         backgroundColor:
             _isDarkTheme ? backgroundDarkColor : backgroundLightColor,
         resizeToAvoidBottomPadding: resizeToAvoidBottomPadding,
+        endDrawer: endDrawer,
         appBar: appBar(context),
         body: body(context), //SafeArea(child: ),
         floatingActionButton: floatingActionButton(context));
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index b32b72e64..5b7939c92 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -23,6 +23,12 @@ class DashboardPage extends BasePage {
   @override
   Color get backgroundDarkColor => PaletteDark.backgroundColor;
 
+  @override
+  Widget get endDrawer => MenuWidget(
+      name: walletViewModel.name,
+      subname: walletViewModel.subname,
+      type: walletViewModel.type);
+
   @override
   Widget middle(BuildContext context) {
     return SyncIndicator(dashboardViewModel: walletViewModel);
@@ -40,14 +46,7 @@ class DashboardPage extends BasePage {
         highlightColor: Colors.transparent,
         splashColor: Colors.transparent,
         padding: EdgeInsets.all(0),
-        onPressed: () async {
-          await showDialog<void>(
-            builder: (_) => MenuWidget(
-              name: walletViewModel.name,
-              subname: walletViewModel.subname,
-              type: walletViewModel.type),
-            context: context);
-        },
+        onPressed: () => onOpenEndDrawer(),
         child: menuButton
       )
     );
diff --git a/lib/src/screens/dashboard/wallet_menu.dart b/lib/src/screens/dashboard/wallet_menu.dart
index 2190a8d34..a3c4666f0 100644
--- a/lib/src/screens/dashboard/wallet_menu.dart
+++ b/lib/src/screens/dashboard/wallet_menu.dart
@@ -20,13 +20,13 @@ class WalletMenu {
   ];
 
   final List<Image> images = [
-    Image.asset('assets/images/reconnect.png'),
-    Image.asset('assets/images/wallet.png'),
-    Image.asset('assets/images/nodes.png'),
-    Image.asset('assets/images/eye.png'),
-    Image.asset('assets/images/key.png'),
-    Image.asset('assets/images/open_book.png'),
-    Image.asset('assets/images/settings.png'),
+    Image.asset('assets/images/reconnect_menu.png', height: 16, width: 16),
+    Image.asset('assets/images/wallet_menu.png', height: 16, width: 16),
+    Image.asset('assets/images/nodes_menu.png', height: 16, width: 16),
+    Image.asset('assets/images/eye_menu.png', height: 16, width: 16),
+    Image.asset('assets/images/key_menu.png', height: 16, width: 16),
+    Image.asset('assets/images/open_book_menu.png', height: 16, width: 16),
+    Image.asset('assets/images/settings_menu.png', height: 16, width: 16),
   ];
 
   final BuildContext context;
diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart
index fdd9a704c..9a461c085 100644
--- a/lib/src/screens/dashboard/widgets/menu_widget.dart
+++ b/lib/src/screens/dashboard/widgets/menu_widget.dart
@@ -1,4 +1,5 @@
 import 'dart:ui';
+import 'package:cake_wallet/palette.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/domain/common/wallet_type.dart';
 import 'package:cake_wallet/src/screens/dashboard/wallet_menu.dart';
@@ -15,7 +16,7 @@ class MenuWidget extends StatefulWidget {
 }
 
 class MenuWidgetState extends State<MenuWidget> {
-  final moneroIcon = Image.asset('assets/images/monero.png');
+  final moneroIcon = Image.asset('assets/images/monero_menu.png');
   final bitcoinIcon = Image.asset('assets/images/bitcoin.png');
   final largeScreen = 731;
 
@@ -36,10 +37,10 @@ class MenuWidgetState extends State<MenuWidget> {
     screenHeight = 0;
     opacity = 0;
 
-    headerHeight = 120;
+    headerHeight = 125;
     tileHeight = 75;
     fromTopEdge = 50;
-    fromBottomEdge = 30;
+    fromBottomEdge = 21;//30;
 
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback(afterLayout);
@@ -66,189 +67,139 @@ class MenuWidgetState extends State<MenuWidget> {
   @override
   Widget build(BuildContext context) {
     final walletMenu = WalletMenu(context);
-//    final walletStore = Provider.of<WalletStore>(context);
     final itemCount = walletMenu.items.length;
 
-    return Row(
-      mainAxisSize: MainAxisSize.max,
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: <Widget>[
-        Padding(
+    return SafeArea(
+      child: Row(
+        mainAxisSize: MainAxisSize.max,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: <Widget>[
+          Padding(
             padding: EdgeInsets.only(left: 24),
             child: Container(
               height: 60,
               width: 4,
               decoration: BoxDecoration(
-                  borderRadius: BorderRadius.all(Radius.circular(2)),
-                  color: Theme.of(context).hintColor),
+                borderRadius: BorderRadius.all(Radius.circular(2)),
+                color: Theme.of(context).hintColor),
             )),
-        SizedBox(width: 12),
-        Expanded(
-            child: GestureDetector(
-          onTap: () => null,
-          child: Container(
-            width: menuWidth,
-            height: double.infinity,
-            decoration: BoxDecoration(
+          SizedBox(width: 12),
+          Expanded(
+              child: ClipRRect(
                 borderRadius: BorderRadius.only(
-                    topLeft: Radius.circular(24),
-                    bottomLeft: Radius.circular(24)),
-                color: Theme.of(context).primaryTextTheme.display1.color),
-            child: ClipRRect(
-              borderRadius: BorderRadius.only(
                   topLeft: Radius.circular(24),
                   bottomLeft: Radius.circular(24)),
-              child: ListView.separated(
-                  itemBuilder: (_, index) {
-                    if (index == 0) {
-                      return Container(
-                        height: headerHeight,
-                        padding: EdgeInsets.only(
-                            left: 24,
-                            top: fromTopEdge,
-                            right: 24,
-                            bottom: fromBottomEdge),
-                        decoration: BoxDecoration(
-                            borderRadius:
-                                BorderRadius.only(topLeft: Radius.circular(24)),
-                            color: Theme.of(context)
-                                .primaryTextTheme
-                                .display2
-                                .color),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          children: <Widget>[
-                            _iconFor(type: widget.type),
-                            SizedBox(width: 16),
-                            Expanded(
-                                child: Container(
-                              height: 40,
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                mainAxisAlignment: widget.subname != null
-                                    ? MainAxisAlignment.spaceBetween
-                                    : MainAxisAlignment.center,
-                                children: <Widget>[
-                                  Text(
-                                    widget.name,
-                                    style: TextStyle(
-                                        color: Theme.of(context)
-                                            .primaryTextTheme
-                                            .title
-                                            .color,
-                                        decoration: TextDecoration.none,
-                                        fontFamily: 'Avenir Next',
-                                        fontSize: 20,
-                                        fontWeight: FontWeight.bold),
-                                  ),
-                                  if (widget.subname != null)
-                                    Text(
-                                      widget.subname,
-                                      style: TextStyle(
-                                          color: Theme.of(context)
-                                              .primaryTextTheme
-                                              .caption
-                                              .color,
-                                          decoration: TextDecoration.none,
-                                          fontFamily: 'Avenir Next',
-                                          fontSize: 12),
-                                    )
-                                ],
-                              ),
-                            ))
-                          ],
+                child: Container(
+                  width: menuWidth,
+                  height: double.infinity,
+                  color: PaletteDark.deepPurpleBlue,
+                  child: SingleChildScrollView(
+                    child: Column(
+                      children: <Widget>[
+                        Container(
+                          height: headerHeight,
+                          padding: EdgeInsets.only(
+                              left: 24,
+                              top: fromTopEdge,
+                              right: 24,
+                              bottom: fromBottomEdge),
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.start,
+                            children: <Widget>[
+                              _iconFor(type: widget.type),
+                              SizedBox(width: 12),
+                              Expanded(
+                                  child: Container(
+                                    height: 42,
+                                    child: Column(
+                                      crossAxisAlignment: CrossAxisAlignment.start,
+                                      mainAxisAlignment: widget.subname != null
+                                          ? MainAxisAlignment.spaceBetween
+                                          : MainAxisAlignment.center,
+                                      children: <Widget>[
+                                        Text(
+                                          widget.name,
+                                          style: TextStyle(
+                                              color: Colors.white,
+                                              fontSize: 16,
+                                              fontWeight: FontWeight.bold),
+                                        ),
+                                        if (widget.subname != null)
+                                          Text(
+                                            widget.subname,
+                                            style: TextStyle(
+                                                color: PaletteDark.darkCyanBlue,
+                                                fontWeight: FontWeight.w500,
+                                                fontSize: 12),
+                                          )
+                                      ],
+                                    ),
+                                  ))
+                            ],
+                          ),
                         ),
-                      );
-                    }
+                        Container(
+                          height: 1,
+                          color: PaletteDark.lightOceanBlue,
+                        ),
+                        ListView.separated(
+                            shrinkWrap: true,
+                            physics: NeverScrollableScrollPhysics(),
+                            itemBuilder: (_, index) {
 
-                    index -= 1;
-                    final item = walletMenu.items[index];
-                    final image = walletMenu.images[index] ?? Offstage();
+                              final item = walletMenu.items[index];
+                              final image = walletMenu.images[index] ?? Offstage();
+                              final isLastTile = index == itemCount - 1;
 
-                    return GestureDetector(
-                      onTap: () {
-                        Navigator.of(context).pop();
-                        walletMenu.action(index);
-                      },
-                      child: index == itemCount - 1
-                          ? Container(
-                              height: headerHeight,
-                              padding: EdgeInsets.only(
-                                  left: 24,
-                                  right: 24,
-                                  top: fromBottomEdge,
-                                  bottom: fromTopEdge),
-                              alignment: Alignment.topLeft,
-                              decoration: BoxDecoration(
-                                borderRadius: BorderRadius.only(
-                                    bottomLeft: Radius.circular(24)),
-                                color: Theme.of(context)
-                                    .primaryTextTheme
-                                    .display1
-                                    .color,
-                              ),
-                              child: Row(
-                                mainAxisAlignment: MainAxisAlignment.start,
-                                crossAxisAlignment: CrossAxisAlignment.center,
-                                children: <Widget>[
-                                  image,
-                                  SizedBox(width: 16),
-                                  Expanded(
-                                      child: Text(
-                                    item,
-                                    style: TextStyle(
-                                        decoration: TextDecoration.none,
-                                        color: Theme.of(context)
-                                            .primaryTextTheme
-                                            .title
-                                            .color,
-                                        fontFamily: 'Avenir Next',
-                                        fontSize: 20,
-                                        fontWeight: FontWeight.bold),
-                                  ))
-                                ],
-                              ),
-                            )
-                          : Container(
-                              height: tileHeight,
-                              padding: EdgeInsets.only(left: 24, right: 24),
-                              color: Theme.of(context)
-                                  .primaryTextTheme
-                                  .display1
-                                  .color,
-                              child: Row(
-                                mainAxisAlignment: MainAxisAlignment.start,
-                                crossAxisAlignment: CrossAxisAlignment.center,
-                                children: <Widget>[
-                                  image,
-                                  SizedBox(width: 16),
-                                  Expanded(
-                                      child: Text(
-                                    item,
-                                    style: TextStyle(
-                                        decoration: TextDecoration.none,
-                                        color: Theme.of(context)
-                                            .primaryTextTheme
-                                            .title
-                                            .color,
-                                        fontFamily: 'Avenir Next',
-                                        fontSize: 20,
-                                        fontWeight: FontWeight.bold),
-                                  ))
-                                ],
-                              ),
+                              return GestureDetector(
+                                onTap: () {
+                                  Navigator.of(context).pop();
+                                  walletMenu.action(index);
+                                },
+                                child: Container(
+                                  height: isLastTile
+                                          ? headerHeight
+                                          : tileHeight,
+                                  padding: isLastTile
+                                           ? EdgeInsets.only(
+                                               left: 24,
+                                               right: 24,
+                                               top: fromBottomEdge,
+                                               bottom: fromTopEdge)
+                                           : EdgeInsets.only(left: 24, right: 24),
+                                  alignment: isLastTile ? Alignment.topLeft : null,
+                                  child: Row(
+                                    mainAxisAlignment: MainAxisAlignment.start,
+                                    crossAxisAlignment: CrossAxisAlignment.center,
+                                    children: <Widget>[
+                                      image,
+                                      SizedBox(width: 16),
+                                      Expanded(
+                                          child: Text(
+                                            item,
+                                            style: TextStyle(
+                                                color: Colors.white,
+                                                fontSize: 16,
+                                                fontWeight: FontWeight.bold),
+                                          ))
+                                    ],
+                                  ),
+                                )
+                              );
+                            },
+                            separatorBuilder: (_, index) => Container(
+                              height: 1,
+                              color: PaletteDark.lightOceanBlue,
                             ),
-                    );
-                  },
-                  separatorBuilder: (_, index) => Container(
-                        height: 1,
-                        color: Theme.of(context).dividerColor,
-                      ),
-                  itemCount: itemCount + 1),
-            ),
-          ),
-        ))
-      ],
+                            itemCount: itemCount)
+                      ],
+                    ),
+                  ),
+                ),
+              )
+          )
+        ],
+      )
     );
   }
 
diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart
index c5226e8f7..cc47033b4 100644
--- a/lib/src/screens/exchange/exchange_page.dart
+++ b/lib/src/screens/exchange/exchange_page.dart
@@ -1,66 +1,40 @@
 import 'dart:ui';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:cake_wallet/src/stores/exchange/exchange_store.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/base_exchange_widget.dart';
 import 'package:cake_wallet/src/widgets/trail_button.dart';
+import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
 
 class ExchangePage extends BasePage {
+  ExchangePage(this.exchangeViewModel);
+
+  final ExchangeViewModel exchangeViewModel;
+
   @override
   String get title => S.current.exchange;
 
   @override
-  Color get backgroundLightColor => Palette.darkLavender;
+  Color get backgroundLightColor => PaletteDark.wildVioletBlue;
 
   @override
-  Color get backgroundDarkColor => PaletteDark.moderateBlue;
+  Color get backgroundDarkColor => PaletteDark.wildVioletBlue;
 
   @override
-  Widget middle(BuildContext context) {
-    final exchangeStore = Provider.of<ExchangeStore>(context);
-
-    return PresentProviderPicker(exchangeStore: exchangeStore);
-  }
+  Widget middle(BuildContext context) =>
+      PresentProviderPicker(exchangeViewModel: exchangeViewModel);
 
   @override
-  Widget trailing(BuildContext context) {
-    final exchangeStore = Provider.of<ExchangeStore>(context);
-
-    return TrailButton(
-      caption: S.of(context).reset,
-      onPressed: () => exchangeStore.reset()
-    );
-  }
+  Widget trailing(BuildContext context) =>
+      TrailButton(
+          caption: S.of(context).reset,
+          onPressed: () => exchangeViewModel.reset()
+      );
 
   @override
-  Widget body(BuildContext context) => ExchangeForm();
-}
-
-class ExchangeForm extends StatefulWidget {
-  @override
-  State<StatefulWidget> createState() => ExchangeFormState();
-}
-
-class ExchangeFormState extends State<ExchangeForm> {
-
-  @override
-  Widget build(BuildContext context) {
-    final exchangeStore = Provider.of<ExchangeStore>(context);
-    final walletStore = Provider.of<WalletStore>(context);
-    final exchangeTemplateStore = Provider.of<ExchangeTemplateStore>(context);
-
-    return BaseExchangeWidget(
-        exchangeStore: exchangeStore,
-        walletStore: walletStore,
-        exchangeTemplateStore: exchangeTemplateStore,
-        isTemplate: false
-    );
-  }
+  Widget body(BuildContext context) =>
+      BaseExchangeWidget(exchangeViewModel: exchangeViewModel);
 }
diff --git a/lib/src/screens/exchange/exchange_template_page.dart b/lib/src/screens/exchange/exchange_template_page.dart
index db2a6965b..139a1e4cd 100644
--- a/lib/src/screens/exchange/exchange_template_page.dart
+++ b/lib/src/screens/exchange/exchange_template_page.dart
@@ -1,55 +1,32 @@
 import 'dart:ui';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 import 'package:cake_wallet/palette.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:cake_wallet/src/stores/exchange/exchange_store.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker.dart';
-import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/base_exchange_widget.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
 
 class ExchangeTemplatePage extends BasePage {
+  ExchangeTemplatePage(this.exchangeViewModel);
+
+  final ExchangeViewModel exchangeViewModel;
+
   @override
   String get title => S.current.exchange_new_template;
 
   @override
-  Color get backgroundLightColor => Palette.darkLavender;
+  Color get backgroundLightColor => PaletteDark.wildVioletBlue;
 
   @override
-  Color get backgroundDarkColor => PaletteDark.moderateBlue;
+  Color get backgroundDarkColor => PaletteDark.wildVioletBlue;
 
   @override
-  Widget trailing(BuildContext context) {
-    final exchangeStore = Provider.of<ExchangeStore>(context);
-
-    return PresentProviderPicker(exchangeStore: exchangeStore);
-  }
+  Widget trailing(BuildContext context) =>
+      PresentProviderPicker(exchangeViewModel: exchangeViewModel);
 
   @override
-  Widget body(BuildContext context) => ExchangeTemplateForm();
-}
-
-class ExchangeTemplateForm extends StatefulWidget{
-  @override
-  ExchangeTemplateFormState createState() => ExchangeTemplateFormState();
-}
-
-class ExchangeTemplateFormState extends State<ExchangeTemplateForm> {
-
-  @override
-  Widget build(BuildContext context) {
-    final exchangeStore = Provider.of<ExchangeStore>(context);
-    final walletStore = Provider.of<WalletStore>(context);
-    final exchangeTemplateStore = Provider.of<ExchangeTemplateStore>(context);
-
-    return BaseExchangeWidget(
-        exchangeStore: exchangeStore,
-        walletStore: walletStore,
-        exchangeTemplateStore: exchangeTemplateStore,
-        isTemplate: true
-    );
-  }
+  Widget body(BuildContext context) =>
+      BaseExchangeWidget(exchangeViewModel: exchangeViewModel, isTemplate: true);
 }
\ No newline at end of file
diff --git a/lib/src/screens/exchange/widgets/base_exchange_widget.dart b/lib/src/screens/exchange/widgets/base_exchange_widget.dart
index 5500ffda7..57a24a162 100644
--- a/lib/src/screens/exchange/widgets/base_exchange_widget.dart
+++ b/lib/src/screens/exchange/widgets/base_exchange_widget.dart
@@ -1,5 +1,7 @@
 import 'dart:ui';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
+import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/template_tile.dart';
 import 'package:dotted_border/dotted_border.dart';
 import 'package:flutter/cupertino.dart';
@@ -12,49 +14,37 @@ import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
 import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.dart';
 import 'package:cake_wallet/src/stores/exchange/exchange_trade_state.dart';
 import 'package:cake_wallet/src/stores/exchange/limits_state.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:cake_wallet/src/stores/exchange/exchange_store.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/exchange_card.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/top_panel.dart';
-import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
 
 class BaseExchangeWidget extends StatefulWidget {
   BaseExchangeWidget({
-    @ required this.exchangeStore,
-    @ required this.walletStore,
-    @ required this.exchangeTemplateStore,
-    @ required this.isTemplate,
+    @ required this.exchangeViewModel,
+    this.isTemplate = false,
   });
 
-  final ExchangeStore exchangeStore;
-  final WalletStore walletStore;
-  final ExchangeTemplateStore exchangeTemplateStore;
+  final ExchangeViewModel exchangeViewModel;
   final bool isTemplate;
 
   @override
   BaseExchangeWidgetState createState() =>
   BaseExchangeWidgetState(
-    exchangeStore: exchangeStore,
-    walletStore: walletStore,
-    exchangeTemplateStore: exchangeTemplateStore,
+    exchangeViewModel: exchangeViewModel,
     isTemplate: isTemplate
   );
 }
 
 class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
   BaseExchangeWidgetState({
-    @ required this.exchangeStore,
-    @ required this.walletStore,
-    @ required this.exchangeTemplateStore,
+    @ required this.exchangeViewModel,
     @ required this.isTemplate,
   });
 
-  final ExchangeStore exchangeStore;
-  final WalletStore walletStore;
-  final ExchangeTemplateStore exchangeTemplateStore;
+  final ExchangeViewModel exchangeViewModel;
   final bool isTemplate;
 
   final depositKey = GlobalKey<ExchangeCardState>();
@@ -64,31 +54,31 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
 
   @override
   Widget build(BuildContext context) {
-    final Image arrowBottomPurple = Image.asset(
+    final arrowBottomPurple = Image.asset(
       'assets/images/arrow_bottom_purple_icon.png',
-      color: Theme.of(context).primaryTextTheme.title.color,
+      color: Colors.white,
       height: 8,
     );
-    final Image arrowBottomCakeGreen = Image.asset(
+    final arrowBottomCakeGreen = Image.asset(
       'assets/images/arrow_bottom_cake_green.png',
-      color: Theme.of(context).primaryTextTheme.title.color,
+      color: Colors.white,
       height: 8,
     );
 
     final depositWalletName =
-    exchangeStore.depositCurrency == CryptoCurrency.xmr
-        ? walletStore.name
+    exchangeViewModel.depositCurrency == CryptoCurrency.xmr
+        ? exchangeViewModel.wallet.name
         : null;
     final receiveWalletName =
-    exchangeStore.receiveCurrency == CryptoCurrency.xmr
-        ? walletStore.name
+    exchangeViewModel.receiveCurrency == CryptoCurrency.xmr
+        ? exchangeViewModel.wallet.name
         : null;
 
     WidgetsBinding.instance.addPostFrameCallback(
-            (_) => _setReactions(context, exchangeStore, walletStore));
+            (_) => _setReactions(context, exchangeViewModel));
 
     return Container(
-      color: Theme.of(context).backgroundColor,
+      color: PaletteDark.backgroundColor,
       child: Form(
           key: _formKey,
           child: ScrollableWithBottomSection(
@@ -96,73 +86,60 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
             content: Column(
               children: <Widget>[
                 TopPanel(
-                    color: Theme.of(context).accentTextTheme.title.backgroundColor,
-                    edgeInsets: EdgeInsets.only(bottom: 24),
+                    color: PaletteDark.darkNightBlue,
+                    edgeInsets: EdgeInsets.only(bottom: 32),
                     widget: Column(
                       children: <Widget>[
                         TopPanel(
-                            color: Theme.of(context).accentTextTheme.title.color,
+                            edgeInsets: EdgeInsets.fromLTRB(24, 29, 24, 32),
+                            color: PaletteDark.wildVioletBlue,
                             widget: Observer(
                               builder: (_) => ExchangeCard(
                                 key: depositKey,
                                 title: S.of(context).you_will_send,
-                                initialCurrency: exchangeStore.depositCurrency,
+                                initialCurrency: exchangeViewModel.depositCurrency,
                                 initialWalletName: depositWalletName,
                                 initialAddress:
-                                exchangeStore.depositCurrency == walletStore.type
-                                    ? walletStore.address
-                                    : exchangeStore.depositAddress,
+                                exchangeViewModel.depositCurrency == exchangeViewModel.wallet.currency
+                                    ? exchangeViewModel.wallet.address
+                                    : exchangeViewModel.depositAddress,
                                 initialIsAmountEditable: true,
-                                initialIsAddressEditable: exchangeStore.isDepositAddressEnabled,
+                                initialIsAddressEditable: exchangeViewModel.isDepositAddressEnabled,
                                 isAmountEstimated: false,
                                 currencies: CryptoCurrency.all,
                                 onCurrencySelected: (currency) =>
-                                    exchangeStore.changeDepositCurrency(currency: currency),
+                                    exchangeViewModel.changeDepositCurrency(currency: currency),
                                 imageArrow: arrowBottomPurple,
-                                currencyButtonColor: Theme.of(context).accentTextTheme.title.color,
-                                addressButtonsColor: Theme.of(context).accentTextTheme.title.backgroundColor,
-                                currencyValueValidator: (value) {
-                                  exchangeStore.validateCryptoCurrency(value);
-                                  return exchangeStore.errorMessage;
-                                },
-                                addressTextFieldValidator: (value) {
-                                  exchangeStore.validateAddress(value,
-                                      cryptoCurrency: exchangeStore.depositCurrency);
-                                  return exchangeStore.errorMessage;
-                                },
+                                currencyButtonColor: PaletteDark.wildVioletBlue,
+                                addressButtonsColor: PaletteDark.moderateBlue,
+                                currencyValueValidator: exchangeViewModel.amountValidator,
+                                addressTextFieldValidator: exchangeViewModel.addressValidator,
                               ),
                             )
                         ),
                         Padding(
-                          padding: EdgeInsets.only(top: 32, left: 24, right: 24),
+                          padding: EdgeInsets.only(top: 29, left: 24, right: 24),
                           child: Observer(
                               builder: (_) => ExchangeCard(
                                 key: receiveKey,
                                 title: S.of(context).you_will_get,
-                                initialCurrency: exchangeStore.receiveCurrency,
+                                initialCurrency: exchangeViewModel.receiveCurrency,
                                 initialWalletName: receiveWalletName,
                                 initialAddress:
-                                exchangeStore.receiveCurrency == walletStore.type
-                                    ? walletStore.address
-                                    : exchangeStore.receiveAddress,
+                                exchangeViewModel.receiveCurrency == exchangeViewModel.wallet.currency
+                                    ? exchangeViewModel.wallet.address
+                                    : exchangeViewModel.receiveAddress,
                                 initialIsAmountEditable: false,
-                                initialIsAddressEditable: exchangeStore.isReceiveAddressEnabled,
+                                initialIsAddressEditable: exchangeViewModel.isReceiveAddressEnabled,
                                 isAmountEstimated: true,
                                 currencies: CryptoCurrency.all,
-                                onCurrencySelected: (currency) => exchangeStore
+                                onCurrencySelected: (currency) => exchangeViewModel
                                     .changeReceiveCurrency(currency: currency),
                                 imageArrow: arrowBottomCakeGreen,
-                                currencyButtonColor: Theme.of(context).accentTextTheme.title.backgroundColor,
-                                addressButtonsColor: Theme.of(context).accentTextTheme.title.color,
-                                currencyValueValidator: (value) {
-                                  exchangeStore.validateCryptoCurrency(value);
-                                  return exchangeStore.errorMessage;
-                                },
-                                addressTextFieldValidator: (value) {
-                                  exchangeStore.validateAddress(value,
-                                      cryptoCurrency: exchangeStore.receiveCurrency);
-                                  return exchangeStore.errorMessage;
-                                },
+                                currencyButtonColor: PaletteDark.darkNightBlue,
+                                addressButtonsColor: PaletteDark.moderateBlue,
+                                currencyValueValidator: exchangeViewModel.amountValidator,
+                                addressTextFieldValidator: exchangeViewModel.addressValidator,
                               )),
                         )
                       ],
@@ -172,7 +149,7 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                 ? Offstage()
                 : Padding(
                   padding: EdgeInsets.only(
-                      top: 32,
+                      top: 30,
                       left: 24,
                       bottom: 24
                   ),
@@ -184,7 +161,7 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                         style: TextStyle(
                             fontSize: 18,
                             fontWeight: FontWeight.w600,
-                            color: Theme.of(context).primaryTextTheme.caption.color
+                            color: PaletteDark.darkCyanBlue
                         ),
                       )
                     ],
@@ -196,66 +173,90 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                   height: 40,
                   width: double.infinity,
                   padding: EdgeInsets.only(left: 24),
-                  child: Observer(
-                      builder: (_) {
-                        final itemCount = exchangeTemplateStore.templates.length + 1;
-
-                        return ListView.builder(
-                            scrollDirection: Axis.horizontal,
-                            itemCount: itemCount,
-                            itemBuilder: (context, index) {
-
-                              if (index == 0) {
-                                return GestureDetector(
-                                  onTap: () => Navigator.of(context)
-                                      .pushNamed(Routes.exchangeTemplate),
-                                  child: Container(
-                                    padding: EdgeInsets.only(right: 10),
-                                    child: DottedBorder(
-                                        borderType: BorderType.RRect,
-                                        dashPattern: [8, 4],
-                                        color: Theme.of(context).accentTextTheme.title.backgroundColor,
-                                        strokeWidth: 2,
-                                        radius: Radius.circular(20),
-                                        child: Container(
-                                          height: 40,
-                                          width: 75,
-                                          padding: EdgeInsets.only(left: 10, right: 10),
-                                          alignment: Alignment.center,
-                                          decoration: BoxDecoration(
-                                            borderRadius: BorderRadius.all(Radius.circular(20)),
-                                            color: Colors.transparent,
-                                          ),
-                                          child: Text(
-                                            S.of(context).send_new,
-                                            style: TextStyle(
-                                                fontSize: 14,
-                                                fontWeight: FontWeight.w600,
-                                                color: Theme.of(context).primaryTextTheme.caption.color
-                                            ),
-                                          ),
-                                        )
+                  child: SingleChildScrollView(
+                    scrollDirection: Axis.horizontal,
+                    child: Row(
+                      children: <Widget>[
+                        GestureDetector(
+                          onTap: () => Navigator.of(context)
+                              .pushNamed(Routes.exchangeTemplate),
+                          child: Container(
+                            padding: EdgeInsets.only(left: 1, right: 10),
+                            child: DottedBorder(
+                                borderType: BorderType.RRect,
+                                dashPattern: [6, 4],
+                                color: PaletteDark.darkCyanBlue,
+                                strokeWidth: 2,
+                                radius: Radius.circular(20),
+                                child: Container(
+                                  height: 34,
+                                  width: 75,
+                                  padding: EdgeInsets.only(left: 10, right: 10),
+                                  alignment: Alignment.center,
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.all(Radius.circular(20)),
+                                    color: Colors.transparent,
+                                  ),
+                                  child: Text(
+                                    S.of(context).send_new,
+                                    style: TextStyle(
+                                        fontSize: 14,
+                                        fontWeight: FontWeight.w600,
+                                        color: PaletteDark.darkCyanBlue
                                     ),
                                   ),
-                                );
-                              }
+                                )
+                            ),
+                          ),
+                        ),
+                        Observer(
+                            builder: (_) {
+                              final templates = exchangeViewModel.templates;
+                              final itemCount = exchangeViewModel.templates.length;
 
-                              index -= 1;
+                              return ListView.builder(
+                                  scrollDirection: Axis.horizontal,
+                                  shrinkWrap: true,
+                                  physics: NeverScrollableScrollPhysics(),
+                                  itemCount: itemCount,
+                                  itemBuilder: (context, index) {
+                                    final template = templates[index];
 
-                              final template = exchangeTemplateStore.templates[index];
-
-                              return TemplateTile(
-                                  amount: template.amount,
-                                  from: template.depositCurrency,
-                                  to: template.receiveCurrency,
-                                  onTap: () {
-                                    applyTemplate(exchangeStore, template);
+                                    return TemplateTile(
+                                      key: UniqueKey(),
+                                      amount: template.amount,
+                                      from: template.depositCurrency,
+                                      to: template.receiveCurrency,
+                                      onTap: () {
+                                        applyTemplate(exchangeViewModel, template);
+                                      },
+                                      onRemove: () {
+                                        showDialog<void>(
+                                            context: context,
+                                            builder: (dialogContext) {
+                                              return AlertWithTwoActions(
+                                                  alertTitle: S.of(context).template,
+                                                  alertContent: S.of(context).confirm_delete_template,
+                                                  leftButtonText: S.of(context).delete,
+                                                  rightButtonText: S.of(context).cancel,
+                                                  actionLeftButton: () {
+                                                    Navigator.of(dialogContext).pop();
+                                                    exchangeViewModel.exchangeTemplateStore.remove(template: template);
+                                                    exchangeViewModel.exchangeTemplateStore.update();
+                                                  },
+                                                  actionRightButton: () => Navigator.of(dialogContext).pop()
+                                              );
+                                            }
+                                        );
+                                      },
+                                    );
                                   }
                               );
                             }
-                        );
-                      }
-                  ),
+                        ),
+                      ],
+                    )
+                  )
                 )
               ],
             ),
@@ -265,14 +266,15 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                 padding: EdgeInsets.only(bottom: 15),
                 child: Observer(builder: (_) {
                   final description =
-                  exchangeStore.provider is XMRTOExchangeProvider
+                  exchangeViewModel.provider is XMRTOExchangeProvider
                       ? S.of(context).amount_is_guaranteed
                       : S.of(context).amount_is_estimate;
                   return Center(
                     child: Text(
                       description,
                       style: TextStyle(
-                          color: Theme.of(context).primaryTextTheme.caption.color,
+                          color: PaletteDark.darkCyanBlue,
+                          fontWeight: FontWeight.w500,
                           fontSize: 12
                       ),
                     ),
@@ -283,15 +285,15 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
               ? PrimaryButton(
                   onPressed: () {
                     if (_formKey.currentState.validate()) {
-                      exchangeTemplateStore.addTemplate(
-                          amount: exchangeStore.depositAmount,
-                          depositCurrency: exchangeStore.depositCurrency.toString(),
-                          receiveCurrency: exchangeStore.receiveCurrency.toString(),
-                          provider: exchangeStore.provider.toString(),
-                          depositAddress: exchangeStore.depositAddress,
-                          receiveAddress: exchangeStore.receiveAddress
+                      exchangeViewModel.exchangeTemplateStore.addTemplate(
+                          amount: exchangeViewModel.depositAmount,
+                          depositCurrency: exchangeViewModel.depositCurrency.toString(),
+                          receiveCurrency: exchangeViewModel.receiveCurrency.toString(),
+                          provider: exchangeViewModel.provider.toString(),
+                          depositAddress: exchangeViewModel.depositAddress,
+                          receiveAddress: exchangeViewModel.receiveAddress
                       );
-                      exchangeTemplateStore.update();
+                      exchangeViewModel.exchangeTemplateStore.update();
                       Navigator.of(context).pop();
                     }
                   },
@@ -304,41 +306,47 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                     text: S.of(context).exchange,
                     onPressed: () {
                       if (_formKey.currentState.validate()) {
-                        exchangeStore.createTrade();
+                        exchangeViewModel.createTrade();
                       }
                     },
                     color: Colors.blue,
                     textColor: Colors.white,
-                    isLoading: exchangeStore.tradeState is TradeIsCreating,
+                    isLoading: exchangeViewModel.tradeState is TradeIsCreating,
                   )),
             ]),
           )),
     );
   }
 
-  void applyTemplate(ExchangeStore store, ExchangeTemplate template) {
-    store.changeDepositCurrency(currency: CryptoCurrency.fromString(template.depositCurrency));
-    store.changeReceiveCurrency(currency: CryptoCurrency.fromString(template.receiveCurrency));
+  void applyTemplate(ExchangeViewModel exchangeViewModel,
+      ExchangeTemplate template) {
+    exchangeViewModel.changeDepositCurrency(
+        currency: CryptoCurrency.fromString(template.depositCurrency));
+    exchangeViewModel.changeReceiveCurrency(
+        currency: CryptoCurrency.fromString(template.receiveCurrency));
 
     switch (template.provider) {
       case 'XMR.TO':
-        store.changeProvider(provider: store.providerList[0]);
+        exchangeViewModel.changeProvider(
+            provider: exchangeViewModel.providerList[0]);
         break;
       case 'ChangeNOW':
-        store.changeProvider(provider: store.providerList[1]);
+        exchangeViewModel.changeProvider(
+            provider: exchangeViewModel.providerList[1]);
         break;
       case 'MorphToken':
-        store.changeProvider(provider: store.providerList[2]);
+        exchangeViewModel.changeProvider(
+            provider: exchangeViewModel.providerList[2]);
         break;
     }
 
-    store.changeDepositAmount(amount: template.amount);
-    store.depositAddress = template.depositAddress;
-    store.receiveAddress = template.receiveAddress;
+    exchangeViewModel.changeDepositAmount(amount: template.amount);
+    exchangeViewModel.depositAddress = template.depositAddress;
+    exchangeViewModel.receiveAddress = template.receiveAddress;
   }
 
   void _setReactions(
-      BuildContext context, ExchangeStore store, WalletStore walletStore) {
+      BuildContext context, ExchangeViewModel exchangeViewModel) {
     if (_isReactionsSet) {
       return;
     }
@@ -347,7 +355,7 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
     final depositAmountController = depositKey.currentState.amountController;
     final receiveAddressController = receiveKey.currentState.addressController;
     final receiveAmountController = receiveKey.currentState.amountController;
-    final limitsState = store.limitsState;
+    final limitsState = exchangeViewModel.limitsState;
 
     if (limitsState is LimitsLoadedSuccessfully) {
       final min = limitsState.limits.min != null
@@ -360,63 +368,62 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
       key.currentState.changeLimits(min: min, max: max);
     }
 
-    _onCurrencyChange(store.receiveCurrency, walletStore, receiveKey);
-    _onCurrencyChange(store.depositCurrency, walletStore, depositKey);
+    _onCurrencyChange(exchangeViewModel.receiveCurrency, exchangeViewModel, receiveKey);
+    _onCurrencyChange(exchangeViewModel.depositCurrency, exchangeViewModel, depositKey);
 
     reaction(
-            (_) => walletStore.name,
+            (_) => exchangeViewModel.wallet.name,
             (String _) => _onWalletNameChange(
-            walletStore, store.receiveCurrency, receiveKey));
+            exchangeViewModel, exchangeViewModel.receiveCurrency, receiveKey));
 
     reaction(
-            (_) => walletStore.name,
+            (_) => exchangeViewModel.wallet.name,
             (String _) => _onWalletNameChange(
-            walletStore, store.depositCurrency, depositKey));
+                exchangeViewModel, exchangeViewModel.depositCurrency, depositKey));
 
     reaction(
-            (_) => store.receiveCurrency,
+            (_) => exchangeViewModel.receiveCurrency,
             (CryptoCurrency currency) =>
-            _onCurrencyChange(currency, walletStore, receiveKey));
+            _onCurrencyChange(currency, exchangeViewModel, receiveKey));
 
     reaction(
-            (_) => store.depositCurrency,
+            (_) => exchangeViewModel.depositCurrency,
             (CryptoCurrency currency) =>
-            _onCurrencyChange(currency, walletStore, depositKey));
+            _onCurrencyChange(currency, exchangeViewModel, depositKey));
 
-    reaction((_) => store.depositAmount, (String amount) {
+    reaction((_) => exchangeViewModel.depositAmount, (String amount) {
       if (depositKey.currentState.amountController.text != amount) {
         depositKey.currentState.amountController.text = amount;
       }
     });
 
-    reaction((_) => store.depositAddress, (String address) {
+    reaction((_) => exchangeViewModel.depositAddress, (String address) {
       if (depositKey.currentState.addressController.text != address) {
         depositKey.currentState.addressController.text = address;
       }
     });
 
-    reaction((_) => store.isDepositAddressEnabled, (bool isEnabled) {
+    reaction((_) => exchangeViewModel.isDepositAddressEnabled, (bool isEnabled) {
       depositKey.currentState.isAddressEditable(isEditable: isEnabled);
     });
 
-    reaction((_) => store.receiveAmount, (String amount) {
-      if (receiveKey.currentState.amountController.text !=
-          store.receiveAmount) {
+    reaction((_) => exchangeViewModel.receiveAmount, (String amount) {
+      if (receiveKey.currentState.amountController.text != amount) {
         receiveKey.currentState.amountController.text = amount;
       }
     });
 
-    reaction((_) => store.receiveAddress, (String address) {
+    reaction((_) => exchangeViewModel.receiveAddress, (String address) {
       if (receiveKey.currentState.addressController.text != address) {
         receiveKey.currentState.addressController.text = address;
       }
     });
 
-    reaction((_) => store.isReceiveAddressEnabled, (bool isEnabled) {
+    reaction((_) => exchangeViewModel.isReceiveAddressEnabled, (bool isEnabled) {
       receiveKey.currentState.isAddressEditable(isEditable: isEnabled);
     });
 
-    reaction((_) => store.tradeState, (ExchangeTradeState state) {
+    reaction((_) => exchangeViewModel.tradeState, (ExchangeTradeState state) {
       if (state is TradeIsCreatedFailure) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           showDialog<void>(
@@ -437,7 +444,7 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
       }
     });
 
-    reaction((_) => store.limitsState, (LimitsState state) {
+    reaction((_) => exchangeViewModel.limitsState, (LimitsState state) {
       String min;
       String max;
 
@@ -461,29 +468,29 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
     });
 
     depositAddressController.addListener(
-            () => store.depositAddress = depositAddressController.text);
+            () => exchangeViewModel.depositAddress = depositAddressController.text);
 
     depositAmountController.addListener(() {
-      if (depositAmountController.text != store.depositAmount) {
-        store.changeDepositAmount(amount: depositAmountController.text);
+      if (depositAmountController.text != exchangeViewModel.depositAmount) {
+        exchangeViewModel.changeDepositAmount(amount: depositAmountController.text);
       }
     });
 
     receiveAddressController.addListener(
-            () => store.receiveAddress = receiveAddressController.text);
+            () => exchangeViewModel.receiveAddress = receiveAddressController.text);
 
     receiveAmountController.addListener(() {
-      if (receiveAmountController.text != store.receiveAmount) {
-        store.changeReceiveAmount(amount: receiveAmountController.text);
+      if (receiveAmountController.text != exchangeViewModel.receiveAmount) {
+        exchangeViewModel.changeReceiveAmount(amount: receiveAmountController.text);
       }
     });
 
-    reaction((_) => walletStore.address, (String address) {
-      if (store.depositCurrency == CryptoCurrency.xmr) {
+    reaction((_) => exchangeViewModel.wallet.address, (String address) {
+      if (exchangeViewModel.depositCurrency == CryptoCurrency.xmr) {
         depositKey.currentState.changeAddress(address: address);
       }
 
-      if (store.receiveCurrency == CryptoCurrency.xmr) {
+      if (exchangeViewModel.receiveCurrency == CryptoCurrency.xmr) {
         receiveKey.currentState.changeAddress(address: address);
       }
     });
@@ -491,28 +498,33 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
     _isReactionsSet = true;
   }
 
-  void _onCurrencyChange(CryptoCurrency currency, WalletStore walletStore,
+  void _onCurrencyChange(CryptoCurrency currency,
+      ExchangeViewModel exchangeViewModel,
       GlobalKey<ExchangeCardState> key) {
-    final isCurrentTypeWallet = currency == walletStore.type;
+    final isCurrentTypeWallet = currency == exchangeViewModel.wallet.currency;
 
     key.currentState.changeSelectedCurrency(currency);
     key.currentState
-        .changeWalletName(isCurrentTypeWallet ? walletStore.name : null);
+        .changeWalletName(isCurrentTypeWallet
+        ? exchangeViewModel.wallet.name : null);
 
     key.currentState
-        .changeAddress(address: isCurrentTypeWallet ? walletStore.address : '');
+        .changeAddress(address: isCurrentTypeWallet
+        ? exchangeViewModel.wallet.address : '');
 
     key.currentState.changeAmount(amount: '');
   }
 
-  void _onWalletNameChange(WalletStore walletStore, CryptoCurrency currency,
+  void _onWalletNameChange(ExchangeViewModel exchangeViewModel,
+      CryptoCurrency currency,
       GlobalKey<ExchangeCardState> key) {
-    final isCurrentTypeWallet = currency == walletStore.type;
+    final isCurrentTypeWallet = currency == exchangeViewModel.wallet.currency;
 
     if (isCurrentTypeWallet) {
-      key.currentState.changeWalletName(walletStore.name);
-      key.currentState.addressController.text = walletStore.address;
-    } else if (key.currentState.addressController.text == walletStore.address) {
+      key.currentState.changeWalletName(exchangeViewModel.wallet.name);
+      key.currentState.addressController.text = exchangeViewModel.wallet.address;
+    } else if (key.currentState.addressController.text ==
+        exchangeViewModel.wallet.address) {
       key.currentState.changeWalletName(null);
       key.currentState.addressController.text = null;
     }
diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart
index 308784f3c..548383176 100644
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@@ -5,6 +5,7 @@ import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
 import 'package:cake_wallet/src/widgets/address_text_field.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart';
+import 'package:cake_wallet/palette.dart';
 
 class ExchangeCard extends StatefulWidget {
   ExchangeCard(
@@ -57,6 +58,10 @@ class ExchangeCardState extends State<ExchangeCard> {
   bool _isAddressEditable;
   bool _isAmountEstimated;
 
+  final copyImage = Image.asset('assets/images/copy_content.png',
+      height: 16, width: 16,
+      color: Colors.white);
+
   @override
   void initState() {
     _title = widget.title;
@@ -114,6 +119,7 @@ class ExchangeCardState extends State<ExchangeCard> {
       width: double.infinity,
       color: Colors.transparent,
       child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
         Row(
           mainAxisAlignment: MainAxisAlignment.start,
@@ -123,13 +129,13 @@ class ExchangeCardState extends State<ExchangeCard> {
               style: TextStyle(
                 fontSize: 18,
                 fontWeight: FontWeight.w600,
-                color: Theme.of(context).primaryTextTheme.caption.color
+                color: PaletteDark.lightBlueGrey
               ),
             )
           ],
         ),
         Padding(
-          padding: EdgeInsets.only(top: 10),
+          padding: EdgeInsets.only(top: 20),
           child: Stack(
             children: <Widget>[
               BaseTextFormField(
@@ -143,7 +149,20 @@ class ExchangeCardState extends State<ExchangeCard> {
                         RegExp('[\\-|\\ |\\,]'))
                   ],
                   hintText: '0.0000',
-                  validator: widget.currencyValueValidator
+                  borderColor: PaletteDark.blueGrey,
+                  textStyle: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                    color: Colors.white
+                  ),
+                  placeholderTextStyle: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                    color: PaletteDark.lightBlueGrey
+                  ),
+                  validator: _isAmountEditable
+                             ? widget.currencyValueValidator
+                             : null
               ),
               Positioned(
                 top: 8,
@@ -163,7 +182,7 @@ class ExchangeCardState extends State<ExchangeCard> {
                               style: TextStyle(
                                   fontWeight: FontWeight.w600,
                                   fontSize: 16,
-                                  color: Theme.of(context).primaryTextTheme.title.color)),
+                                  color: Colors.white)),
                           Padding(
                             padding: EdgeInsets.only(left: 5),
                             child: widget.imageArrow,
@@ -181,45 +200,96 @@ class ExchangeCardState extends State<ExchangeCard> {
               mainAxisAlignment: MainAxisAlignment.start,
               children: <Widget>[
                 _min != null
-                    ? Text(
+                ? Text(
                   S.of(context).min_value(
                       _min, _selectedCurrency.toString()),
                   style: TextStyle(
                       fontSize: 10,
                       height: 1.2,
-                      color: Theme.of(context).primaryTextTheme.caption.color),
+                      color: PaletteDark.lightBlueGrey),
                 )
-                    : Offstage(),
+                : Offstage(),
                 _min != null ? SizedBox(width: 10) : Offstage(),
                 _max != null
-                    ? Text(
+                ? Text(
                     S.of(context).max_value(
                         _max, _selectedCurrency.toString()),
                     style: TextStyle(
                         fontSize: 10,
                         height: 1.2,
-                        color: Theme.of(context).primaryTextTheme.caption.color))
-                    : Offstage(),
+                        color: PaletteDark.lightBlueGrey))
+                : Offstage(),
               ]),
         ),
         Padding(
-          padding: EdgeInsets.only(top: 10),
-          child: AddressTextField(
+          padding: EdgeInsets.only(top: 20),
+          child: Text(
+            _isAddressEditable
+            ? S.of(context).widgets_address
+            : S.of(context).refund_address,
+            style: TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.w500,
+              color: PaletteDark.lightBlueGrey
+            ),
+          )
+        ),
+        _isAddressEditable
+        ? AddressTextField(
             controller: addressController,
-            isActive: _isAddressEditable,
-            options: _isAddressEditable
-            ? _walletName != null
-            ? []
-            : [
+            options: [
+              AddressTextFieldOption.paste,
               AddressTextFieldOption.qrCode,
               AddressTextFieldOption.addressBook,
-            ]
-            : [],
+            ],
+            placeholder: '',
             isBorderExist: false,
+            textStyle: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w600,
+                color: Colors.white),
             buttonColor: widget.addressButtonsColor,
             validator: widget.addressTextFieldValidator,
-          ),
         )
+        : Padding(
+          padding: EdgeInsets.only(top: 10),
+          child: Builder(
+              builder: (context) => GestureDetector(
+                onTap: () {
+                  Clipboard.setData(ClipboardData(
+                      text: addressController.text));
+                  Scaffold.of(context).showSnackBar(SnackBar(
+                    content: Text(
+                      S.of(context).copied_to_clipboard,
+                      style: TextStyle(color: Colors.white),
+                    ),
+                    backgroundColor: Colors.green,
+                    duration: Duration(milliseconds: 500),
+                  ));
+                },
+                child: Row(
+                  mainAxisSize: MainAxisSize.max,
+                  children: <Widget>[
+                    Expanded(
+                      child: Text(
+                        addressController.text,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: TextStyle(
+                            fontSize: 16,
+                            fontWeight: FontWeight.w600,
+                            color: Colors.white),
+                      ),
+                    ),
+                    Padding(
+                      padding: EdgeInsets.only(left: 16),
+                      child: copyImage,
+                    )
+                  ],
+                ),
+              )
+          ),
+        ),
       ]),
     );
   }
diff --git a/lib/src/screens/exchange/widgets/present_provider_picker.dart b/lib/src/screens/exchange/widgets/present_provider_picker.dart
index 1d3a7953d..79fbb80cd 100644
--- a/lib/src/screens/exchange/widgets/present_provider_picker.dart
+++ b/lib/src/screens/exchange/widgets/present_provider_picker.dart
@@ -1,21 +1,22 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/stores/exchange/exchange_store.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
+import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
+import 'package:cake_wallet/palette.dart';
 
 class PresentProviderPicker extends StatelessWidget {
-  PresentProviderPicker({@required this.exchangeStore});
+  PresentProviderPicker({@required this.exchangeViewModel});
 
-  final ExchangeStore exchangeStore;
+  final ExchangeViewModel exchangeViewModel;
 
   @override
   Widget build(BuildContext context) {
-    final Image arrowBottom =
+    final arrowBottom =
     Image.asset('assets/images/arrow_bottom_purple_icon.png',
-        color: Theme.of(context).primaryTextTheme.title.color,
+        color: Colors.white,
         height: 6);
 
     return FlatButton(
@@ -33,19 +34,19 @@ class PresentProviderPicker extends StatelessWidget {
                 Text(S.of(context).exchange,
                     style: TextStyle(
                         fontSize: 16.0,
-                        fontWeight: FontWeight.w400,
-                        color: Theme.of(context).primaryTextTheme.title.color)),
+                        fontWeight: FontWeight.w600,
+                        color: Colors.white)),
                 Observer(
-                    builder: (_) => Text('${exchangeStore.provider.title}',
+                    builder: (_) => Text('${exchangeViewModel.provider.title}',
                         style: TextStyle(
                             fontSize: 10.0,
-                            fontWeight: FontWeight.w400,
-                            color: Theme.of(context).primaryTextTheme.caption.color)))
+                            fontWeight: FontWeight.w500,
+                            color: PaletteDark.lightBlueGrey)))
               ],
             ),
             SizedBox(width: 5),
             Padding(
-              padding: EdgeInsets.only(top: 8),
+              padding: EdgeInsets.only(top: 12),
               child: arrowBottom,
             )
           ],
@@ -54,11 +55,11 @@ class PresentProviderPicker extends StatelessWidget {
   }
 
   void _presentProviderPicker(BuildContext context) {
-    final items = exchangeStore.providersForCurrentPair();
-    final selectedItem = items.indexOf(exchangeStore.provider);
-    final images = List<Image>();
+    final items = exchangeViewModel.providersForCurrentPair();
+    final selectedItem = items.indexOf(exchangeViewModel.provider);
+    final images = <Image>[];
 
-    for (ExchangeProvider provider in items) {
+    for (var provider in items) {
       switch (provider.description) {
         case ExchangeProviderDescription.xmrto:
           images.add(Image.asset('assets/images/xmr_btc.png'));
@@ -79,7 +80,7 @@ class PresentProviderPicker extends StatelessWidget {
             selectedAtIndex: selectedItem,
             title: S.of(context).change_exchange_provider,
             onItemSelected: (ExchangeProvider provider) =>
-                exchangeStore.changeProvider(provider: provider)),
+                exchangeViewModel.changeProvider(provider: provider)),
         context: context);
   }
 }
\ No newline at end of file
diff --git a/lib/src/screens/receive/receive_page.dart b/lib/src/screens/receive/receive_page.dart
index 19cc6fecc..47608b59c 100644
--- a/lib/src/screens/receive/receive_page.dart
+++ b/lib/src/screens/receive/receive_page.dart
@@ -125,7 +125,7 @@ class ReceivePage extends BasePage {
                                 .headline5
                                 .color
                                 .withOpacity(0.4),
-                            validator: AmountValidator(),
+                            validator: AmountValidator(isAutovalidate: true),
                             autovalidate: true,
                             placeholderTextStyle: TextStyle(
                                 color: Theme.of(context)
diff --git a/lib/src/widgets/base_text_form_field.dart b/lib/src/widgets/base_text_form_field.dart
index e8b77c22c..b3931a92d 100644
--- a/lib/src/widgets/base_text_form_field.dart
+++ b/lib/src/widgets/base_text_form_field.dart
@@ -72,6 +72,10 @@ class BaseTextFormField extends StatelessWidget {
               borderSide: BorderSide(
                   color: borderColor ?? Theme.of(context).dividerColor,
                   width: 1.0)),
+          disabledBorder: UnderlineInputBorder(
+              borderSide: BorderSide(
+                  color: borderColor ?? Theme.of(context).dividerColor,
+                  width: 1.0)),
           enabledBorder: UnderlineInputBorder(
               borderSide: BorderSide(
                   color: borderColor ?? Theme.of(context).dividerColor,
diff --git a/lib/src/widgets/nav_bar.dart b/lib/src/widgets/nav_bar.dart
index b5274d9b4..0d51c8e72 100644
--- a/lib/src/widgets/nav_bar.dart
+++ b/lib/src/widgets/nav_bar.dart
@@ -71,6 +71,8 @@ class NavBar extends StatelessWidget implements ObstructingPreferredSizeWidget {
           EdgeInsetsDirectional.only(bottom: _paddingBottom, top: paddingTop),
       child: CupertinoNavigationBar(
         leading: leading,
+        automaticallyImplyLeading: false,
+        automaticallyImplyMiddle: false,
         middle: middle,
         trailing: trailing,
         backgroundColor: backgroundColor,
diff --git a/lib/src/widgets/trail_button.dart b/lib/src/widgets/trail_button.dart
index d9752e410..65cfc14dc 100644
--- a/lib/src/widgets/trail_button.dart
+++ b/lib/src/widgets/trail_button.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 
 class TrailButton extends StatelessWidget {
   TrailButton({
@@ -21,7 +22,7 @@ class TrailButton extends StatelessWidget {
         child: Text(
           caption,
           style: TextStyle(
-            color: Theme.of(context).primaryTextTheme.caption.color,
+            color: PaletteDark.lightBlueGrey,
             fontWeight: FontWeight.w500,
             fontSize: 14),
         ),
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
new file mode 100644
index 000000000..0383338e8
--- /dev/null
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -0,0 +1,306 @@
+import 'package:cake_wallet/core/address_validator.dart';
+import 'package:cake_wallet/core/amount_validator.dart';
+import 'package:cake_wallet/core/template_validator.dart';
+import 'package:cake_wallet/core/validator.dart';
+import 'package:cake_wallet/core/wallet_base.dart';
+import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
+import 'package:cake_wallet/src/domain/exchange/limits.dart';
+import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/src/stores/exchange/limits_state.dart';
+import 'package:intl/intl.dart';
+import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:hive/hive.dart';
+import 'package:cake_wallet/src/stores/exchange/exchange_trade_state.dart';
+import 'package:cake_wallet/src/domain/exchange/changenow/changenow_exchange_provider.dart';
+import 'package:cake_wallet/src/domain/exchange/changenow/changenow_request.dart';
+import 'package:cake_wallet/src/domain/exchange/trade_request.dart';
+import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.dart';
+import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_trade_request.dart';
+import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart';
+import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_request.dart';
+import 'package:cake_wallet/store/templates/exchange_template_store.dart';
+import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
+
+part 'exchange_view_model.g.dart';
+
+class ExchangeViewModel = ExchangeViewModelBase with _$ExchangeViewModel;
+
+abstract class ExchangeViewModelBase with Store {
+  ExchangeViewModelBase({this.wallet, this.trades, this.exchangeTemplateStore}) {
+    providerList = [
+      XMRTOExchangeProvider(),
+      ChangeNowExchangeProvider(),
+      MorphTokenExchangeProvider(trades: trades)
+    ];
+
+    provider = providerList[ 0 ];
+
+    depositCurrency = CryptoCurrency.xmr;
+    receiveCurrency = CryptoCurrency.btc;
+    isDepositAddressEnabled = !(depositCurrency == wallet.currency);
+    isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
+    depositAmount = '';
+    receiveAmount = '';
+    depositAddress = '';
+    receiveAddress = '';
+    limitsState = LimitsInitialState();
+    tradeState = ExchangeTradeStateInitial();
+    _cryptoNumberFormat = NumberFormat()..maximumFractionDigits = 12;
+    loadLimits();
+  }
+
+  final WalletBase wallet;
+  final Box<Trade> trades;
+  final ExchangeTemplateStore exchangeTemplateStore;
+
+  @observable
+  ExchangeProvider provider;
+
+  @observable
+  List<ExchangeProvider> providerList;
+
+  @observable
+  CryptoCurrency depositCurrency;
+
+  @observable
+  CryptoCurrency receiveCurrency;
+
+  @observable
+  LimitsState limitsState;
+
+  @observable
+  ExchangeTradeState tradeState;
+
+  @observable
+  String depositAmount;
+
+  @observable
+  String receiveAmount;
+
+  @observable
+  String depositAddress;
+
+  @observable
+  String receiveAddress;
+
+  @observable
+  bool isDepositAddressEnabled;
+
+  @observable
+  bool isReceiveAddressEnabled;
+
+  @observable
+  bool isValid;
+
+  @observable
+  String errorMessage;
+
+  Limits limits;
+
+  NumberFormat _cryptoNumberFormat;
+
+  Validator get amountValidator => AmountValidator(type: wallet.type);
+
+  Validator get addressValidator => AddressValidator(type: wallet.currency);
+
+  Validator get templateValidator => TemplateValidator();
+
+  @computed
+  ObservableList<ExchangeTemplate> get templates =>
+      exchangeTemplateStore.templates;
+
+  @action
+  void changeProvider({ExchangeProvider provider}) {
+    this.provider = provider;
+    depositAmount = '';
+    receiveAmount = '';
+    loadLimits();
+  }
+
+  @action
+  void changeDepositCurrency({CryptoCurrency currency}) {
+    depositCurrency = currency;
+    _onPairChange();
+    isDepositAddressEnabled = !(depositCurrency == wallet.currency);
+    isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
+  }
+
+  @action
+  void changeReceiveCurrency({CryptoCurrency currency}) {
+    receiveCurrency = currency;
+    _onPairChange();
+    isDepositAddressEnabled = !(depositCurrency == wallet.currency);
+    isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
+  }
+
+  @action
+  void changeReceiveAmount({String amount}) {
+    receiveAmount = amount;
+
+    if (amount == null || amount.isEmpty) {
+      depositAmount = '';
+      receiveAmount = '';
+      return;
+    }
+
+    final _amount = double.parse(amount) ?? 0;
+
+    provider
+        .calculateAmount(
+        from: depositCurrency, to: receiveCurrency, amount: _amount)
+        .then((amount) => _cryptoNumberFormat.format(amount).toString().replaceAll(RegExp("\\,"), ""))
+        .then((amount) => depositAmount = amount);
+  }
+
+  @action
+  void changeDepositAmount({String amount}) {
+    depositAmount = amount;
+
+    if (amount == null || amount.isEmpty) {
+      depositAmount = '';
+      receiveAmount = '';
+      return;
+    }
+
+    final _amount = double.parse(amount);
+    provider
+        .calculateAmount(
+        from: depositCurrency, to: receiveCurrency, amount: _amount)
+        .then((amount) => _cryptoNumberFormat.format(amount).toString().replaceAll(RegExp("\\,"), ""))
+        .then((amount) => receiveAmount = amount);
+  }
+
+  @action
+  Future loadLimits() async {
+    limitsState = LimitsIsLoading();
+
+    try {
+      limits = await provider.fetchLimits(
+          from: depositCurrency, to: receiveCurrency);
+      limitsState = LimitsLoadedSuccessfully(limits: limits);
+    } catch (e) {
+      limitsState = LimitsLoadedFailure(error: e.toString());
+    }
+  }
+
+  @action
+  Future createTrade() async {
+    TradeRequest request;
+    String amount;
+    CryptoCurrency currency;
+
+    if (provider is XMRTOExchangeProvider) {
+      request = XMRTOTradeRequest(
+          from: depositCurrency,
+          to: receiveCurrency,
+          amount: depositAmount,
+          address: receiveAddress,
+          refundAddress: depositAddress);
+      amount = depositAmount;
+      currency = depositCurrency;
+    }
+
+    if (provider is ChangeNowExchangeProvider) {
+      request = ChangeNowRequest(
+          from: depositCurrency,
+          to: receiveCurrency,
+          amount: depositAmount,
+          refundAddress: depositAddress,
+          address: receiveAddress);
+      amount = depositAmount;
+      currency = depositCurrency;
+    }
+
+    if (provider is MorphTokenExchangeProvider) {
+      request = MorphTokenRequest(
+          from: depositCurrency,
+          to: receiveCurrency,
+          amount: depositAmount,
+          refundAddress: depositAddress,
+          address: receiveAddress);
+      amount = depositAmount;
+      currency = depositCurrency;
+    }
+
+    if (limitsState is LimitsLoadedSuccessfully && amount != null) {
+      if (double.parse(amount) < limits.min) {
+        tradeState = TradeIsCreatedFailure(error: S.current.error_text_minimal_limit('${provider.description}',
+            '${limits.min}', currency.toString()));
+      } else if (limits.max != null && double.parse(amount) > limits.max) {
+        tradeState = TradeIsCreatedFailure(error: S.current.error_text_maximum_limit('${provider.description}',
+            '${limits.max}', currency.toString()));
+      } else {
+        try {
+          tradeState = TradeIsCreating();
+          final trade = await provider.createTrade(request: request);
+          trade.walletId = wallet.id;
+          await trades.add(trade);
+          tradeState = TradeIsCreatedSuccessfully(trade: trade);
+        } catch (e) {
+          tradeState = TradeIsCreatedFailure(error: e.toString());
+        }
+      }
+    } else {
+      tradeState = TradeIsCreatedFailure(error: S.current.error_text_limits_loading_failed("${provider.description}"));
+    }
+
+  }
+
+  @action
+  void reset() {
+    depositAmount = '';
+    receiveAmount = '';
+    depositCurrency = CryptoCurrency.xmr;
+    receiveCurrency = CryptoCurrency.btc;
+    depositAddress = depositCurrency == wallet.currency ? wallet.address : '';
+    receiveAddress = receiveCurrency == wallet.currency ? wallet.address : '';
+    isDepositAddressEnabled = !(depositCurrency == wallet.currency);
+    isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
+    _onPairChange();
+  }
+
+  List<ExchangeProvider> providersForCurrentPair() {
+    return _providersForPair(from: depositCurrency, to: receiveCurrency);
+  }
+
+  List<ExchangeProvider> _providersForPair(
+      {CryptoCurrency from, CryptoCurrency to}) {
+    final providers = providerList
+        .where((provider) => provider.pairList
+        .where((pair) =>
+    pair.from == depositCurrency && pair.to == receiveCurrency)
+        .isNotEmpty)
+        .toList();
+
+    return providers;
+  }
+
+  void _onPairChange() {
+    final isPairExist = provider.pairList
+        .where((pair) =>
+    pair.from == depositCurrency && pair.to == receiveCurrency)
+        .isNotEmpty;
+
+    if (!isPairExist) {
+      final provider =
+      _providerForPair(from: depositCurrency, to: receiveCurrency);
+
+      if (provider != null) {
+        changeProvider(provider: provider);
+      }
+    }
+
+    depositAmount = '';
+    receiveAmount = '';
+
+    loadLimits();
+  }
+
+  ExchangeProvider _providerForPair({CryptoCurrency from, CryptoCurrency to}) {
+    final providers = _providersForPair(from: from, to: to);
+    return providers.isNotEmpty ? providers[0] : null;
+  }
+
+}
\ No newline at end of file
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 20c7988bd..0724a9577 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "Austausch",
   "clear" : "klar",
+  "refund_address" : "Rückerstattungsadresse",
   "change_exchange_provider" : "Wechseln Sie den Exchange-Anbieter",
   "you_will_send" : "Du wirst senden",
   "you_will_get" : "Sie erhalten",
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 4048513a2..ff0c481c0 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "Exchange",
   "clear" : "Clear",
+  "refund_address" : "Refund address",
   "change_exchange_provider" : "Change Exchange Provider",
   "you_will_send" : "You will send",
   "you_will_get" : "You will get",
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 625d93254..9f0ea478a 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "Intercambiar",
   "clear" : "Claro",
+  "refund_address" : "Dirección de reembolso",
   "change_exchange_provider" : "Cambiar proveedor de intercambio",
   "you_will_send" : "Enviarás",
   "you_will_get" : "Conseguirás",
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 5a5ee3551..1a915a1d0 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "अदला बदली",
   "clear" : "स्पष्ट",
+  "refund_address" : "वापसी का पता",
   "change_exchange_provider" : "एक्सचेंज प्रदाता बदलें",
   "you_will_send" : "तुम भेजोगे",
   "you_will_get" : "आपको मिल जायेगा",
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index c8fb80b86..5f45c0949 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "交換する",
   "clear" : "クリア",
+  "refund_address" : "払い戻し住所",
   "change_exchange_provider" : "Exchangeプロバイダーの変更",
   "you_will_send" : "送ります",
   "you_will_get" : "あなたが取得します",
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 061016ecd..74430e1a2 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "교환",
   "clear" : "명확한",
+  "refund_address" : "환불 주소",
   "change_exchange_provider" : "교환 공급자 변경",
   "you_will_send" : "보내드립니다",
   "you_will_get" : "당신은 얻을 것이다",
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index ca10484da..78e3b77f6 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "Uitwisseling",
   "clear" : "Duidelijk",
+  "refund_address" : "Adres voor terugbetaling",
   "change_exchange_provider" : "Wijzig Exchange Provider",
   "you_will_send" : "Je zal versturen",
   "you_will_get" : "Je zult krijgen",
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 3319d6745..0647fd32c 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "Wymieniać się",
   "clear" : "Wyczyść",
+  "refund_address" : "Adres zwrotu",
   "change_exchange_provider" : "Zmień dostawcę programu Exchange",
   "you_will_send" : "Wyślesz",
   "you_will_get" : "Dostaniesz",
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index c1f4e110a..04b12862c 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "Trocar",
   "clear" : "Limpar",
+  "refund_address" : "Endereço de reembolso",
   "change_exchange_provider" : "Alterar o provedor de troca",
   "you_will_send" : "Você enviará",
   "you_will_get" : "Você receberá",
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 22d77e0be..441ff68a0 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "Обмен",
   "clear" : "Очистить",
+  "refund_address" : "Адрес возврата",
   "change_exchange_provider" : "Изменить провайдера обмена",
   "you_will_send" : "Вы отправите",
   "you_will_get" : "Вы получите",
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 326ec25ec..648bd8e70 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "Обмін",
   "clear" : "Очистити",
+  "refund_address" : "Адреса повернення коштів",
   "change_exchange_provider" : "Змінити провайдера обміну",
   "you_will_send" : "Ви відправите",
   "you_will_get" : "Ви отримаєте",
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index bf1b410a9..bf0523f96 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -61,6 +61,7 @@
 
   "exchange" : "交换",
   "clear" : "明确",
+  "refund_address" : "退款地址",
   "change_exchange_provider" : "更改交易所提供商",
   "you_will_send" : "您将发送",
   "you_will_get" : "你会得到",

From 95d7f9d81ac438e082950b3fc5b9bd3309ba4a1d Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Fri, 31 Jul 2020 18:31:30 +0300
Subject: [PATCH 03/15] CAKE-20 | changed size of bottom padding for menu
 widget

---
 lib/src/screens/dashboard/widgets/menu_widget.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart
index 9a461c085..1cb6727c0 100644
--- a/lib/src/screens/dashboard/widgets/menu_widget.dart
+++ b/lib/src/screens/dashboard/widgets/menu_widget.dart
@@ -40,7 +40,7 @@ class MenuWidgetState extends State<MenuWidget> {
     headerHeight = 125;
     tileHeight = 75;
     fromTopEdge = 50;
-    fromBottomEdge = 21;//30;
+    fromBottomEdge = 21;
 
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback(afterLayout);

From b2f590ee4b76483554afcacf0f88949a76048e38 Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Fri, 31 Jul 2020 20:44:37 +0300
Subject: [PATCH 04/15] CAKE-20 | merged dev branch to current

---
 lib/palette.dart                                   | 6 ++----
 lib/src/screens/dashboard/dashboard_page.dart      | 4 +++-
 lib/src/screens/dashboard/widgets/menu_widget.dart | 4 ++--
 lib/src/screens/receive/widgets/qr_widget.dart     | 3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/palette.dart b/lib/palette.dart
index 0a562718b..b983b16c5 100644
--- a/lib/palette.dart
+++ b/lib/palette.dart
@@ -22,7 +22,7 @@ class PaletteDark {
   //static const Color distantBlue = Color.fromRGBO(70, 85, 133, 1.0); // mainBackgroundColor
   static const Color lightDistantBlue = Color.fromRGBO(81, 96, 147, 1.0); // borderCardColor
   static const Color gray = Color.fromRGBO(140, 153, 201, 1.0); // walletCardText
-  static const Color violetBlue = Color.fromRGBO(51, 63, 104, 1.0); // walletCardAddressField
+  //static const Color violetBlue = Color.fromRGBO(51, 63, 104, 1.0); // walletCardAddressField
   //static const Color moderateBlue = Color.fromRGBO(63, 77, 122, 1.0); // walletCardSubAddressField
   //static const Color darkNightBlue = Color.fromRGBO(33, 43, 73, 1.0); // historyPanel
   static const Color pigeonBlue = Color.fromRGBO(91, 112, 146, 1.0); // historyPanelText
@@ -53,13 +53,11 @@ class PaletteDark {
   static const Color blueGrey = Color.fromRGBO(87, 98, 138, 1.0);
   static const Color moderateBlue = Color.fromRGBO(60, 73, 118, 1.0);
   static const Color deepPurpleBlue = Color.fromRGBO(19, 29, 56, 1.0);
-  static const Color lightOceanBlue = Color.fromRGBO(30, 42, 73, 1.0);
-  static const Color lightBlueGrey = Color.fromRGBO(125, 141, 183, 1.0);
+  static const Color darkOceanBlue = Color.fromRGBO(30, 42, 73, 1.0);
   static const Color wildBlueGrey = Color.fromRGBO(125, 137, 182, 1.0);
   static const Color darkGrey = Color.fromRGBO(118, 131, 169, 1.0);
   static const Color dividerColor = Color.fromRGBO(48, 59, 95, 1.0);
   static const Color violetBlue = Color.fromRGBO(59, 72, 119, 1.0);
-  static const Color deepPurpleBlue = Color.fromRGBO(19, 29, 56, 1.0);
   static const Color distantBlue = Color.fromRGBO(72, 85, 131, 1.0);
 
   // FIXME: Rename.
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index 7623891f4..9ca629c4d 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -20,7 +20,9 @@ class DashboardPage extends BasePage {
   DashboardPage({
     @required this.walletViewModel,
     @required this.addressListViewModel,
-  });
+  }) {
+    walletViewModel.pageViewStore.setCurrentPage(1);
+  }
 
   @override
   Color get backgroundLightColor => PaletteDark.backgroundColor;
diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart
index 1cb6727c0..505e09dab 100644
--- a/lib/src/screens/dashboard/widgets/menu_widget.dart
+++ b/lib/src/screens/dashboard/widgets/menu_widget.dart
@@ -140,7 +140,7 @@ class MenuWidgetState extends State<MenuWidget> {
                         ),
                         Container(
                           height: 1,
-                          color: PaletteDark.lightOceanBlue,
+                          color: PaletteDark.darkOceanBlue,
                         ),
                         ListView.separated(
                             shrinkWrap: true,
@@ -189,7 +189,7 @@ class MenuWidgetState extends State<MenuWidget> {
                             },
                             separatorBuilder: (_, index) => Container(
                               height: 1,
-                              color: PaletteDark.lightOceanBlue,
+                              color: PaletteDark.darkOceanBlue,
                             ),
                             itemCount: itemCount)
                       ],
diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart
index c8fd78b5f..7b6474847 100644
--- a/lib/src/screens/receive/widgets/qr_widget.dart
+++ b/lib/src/screens/receive/widgets/qr_widget.dart
@@ -81,7 +81,8 @@ class QRWidget extends StatelessWidget {
                           textColor: Colors.white,
                           borderColor: PaletteDark.darkGrey,
                           validator: AmountValidator(
-                            type: addressListViewModel.type
+                            type: addressListViewModel.type,
+                            isAutovalidate: true
                           ),
                           autovalidate: true,
                           placeholderTextStyle: TextStyle(

From 861a2840ce4fdc031931392fd1b4075a4ce3d27f Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Fri, 31 Jul 2020 21:47:42 +0300
Subject: [PATCH 05/15] CAKE-20 | fixed address validators of the base exchange
 widget

---
 lib/src/screens/dashboard/dashboard_page.dart    |  4 +---
 .../exchange/widgets/base_exchange_widget.dart   | 14 ++++++++++----
 lib/view_model/exchange/exchange_view_model.dart | 16 ----------------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index 9ca629c4d..7623891f4 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -20,9 +20,7 @@ class DashboardPage extends BasePage {
   DashboardPage({
     @required this.walletViewModel,
     @required this.addressListViewModel,
-  }) {
-    walletViewModel.pageViewStore.setCurrentPage(1);
-  }
+  });
 
   @override
   Color get backgroundLightColor => PaletteDark.backgroundColor;
diff --git a/lib/src/screens/exchange/widgets/base_exchange_widget.dart b/lib/src/screens/exchange/widgets/base_exchange_widget.dart
index 57a24a162..cde58e226 100644
--- a/lib/src/screens/exchange/widgets/base_exchange_widget.dart
+++ b/lib/src/screens/exchange/widgets/base_exchange_widget.dart
@@ -20,6 +20,8 @@ import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/top_panel.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
+import 'package:cake_wallet/core/address_validator.dart';
+import 'package:cake_wallet/core/amount_validator.dart';
 
 class BaseExchangeWidget extends StatefulWidget {
   BaseExchangeWidget({
@@ -112,8 +114,10 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                                 imageArrow: arrowBottomPurple,
                                 currencyButtonColor: PaletteDark.wildVioletBlue,
                                 addressButtonsColor: PaletteDark.moderateBlue,
-                                currencyValueValidator: exchangeViewModel.amountValidator,
-                                addressTextFieldValidator: exchangeViewModel.addressValidator,
+                                currencyValueValidator: AmountValidator(
+                                    type: exchangeViewModel.wallet.type),
+                                addressTextFieldValidator: AddressValidator(
+                                    type: exchangeViewModel.depositCurrency),
                               ),
                             )
                         ),
@@ -138,8 +142,10 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                                 imageArrow: arrowBottomCakeGreen,
                                 currencyButtonColor: PaletteDark.darkNightBlue,
                                 addressButtonsColor: PaletteDark.moderateBlue,
-                                currencyValueValidator: exchangeViewModel.amountValidator,
-                                addressTextFieldValidator: exchangeViewModel.addressValidator,
+                                currencyValueValidator: AmountValidator(
+                                    type: exchangeViewModel.wallet.type),
+                                addressTextFieldValidator: AddressValidator(
+                                    type: exchangeViewModel.receiveCurrency),
                               )),
                         )
                       ],
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 0383338e8..4fb5a1dbf 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -1,7 +1,3 @@
-import 'package:cake_wallet/core/address_validator.dart';
-import 'package:cake_wallet/core/amount_validator.dart';
-import 'package:cake_wallet/core/template_validator.dart';
-import 'package:cake_wallet/core/validator.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
@@ -91,22 +87,10 @@ abstract class ExchangeViewModelBase with Store {
   @observable
   bool isReceiveAddressEnabled;
 
-  @observable
-  bool isValid;
-
-  @observable
-  String errorMessage;
-
   Limits limits;
 
   NumberFormat _cryptoNumberFormat;
 
-  Validator get amountValidator => AmountValidator(type: wallet.type);
-
-  Validator get addressValidator => AddressValidator(type: wallet.currency);
-
-  Validator get templateValidator => TemplateValidator();
-
   @computed
   ObservableList<ExchangeTemplate> get templates =>
       exchangeTemplateStore.templates;

From 1ba86506f09014b77e4198255b2ae9522d3f9b31 Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Fri, 31 Jul 2020 22:55:26 +0300
Subject: [PATCH 06/15] CAKE-20 | changed dots indicator on smooth page
 indicator (dashboard page); deleted page_view_store

---
 lib/di.dart                                   |  5 +--
 lib/src/screens/dashboard/dashboard_page.dart | 40 ++++++-------------
 lib/store/dashboard/page_view_store.dart      | 19 ---------
 .../dashboard/dashboard_view_model.dart       |  9 +----
 pubspec.lock                                  | 14 +++----
 pubspec.yaml                                  |  2 +-
 6 files changed, 23 insertions(+), 66 deletions(-)
 delete mode 100644 lib/store/dashboard/page_view_store.dart

diff --git a/lib/di.dart b/lib/di.dart
index 40ae92396..dabb7c4e4 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -65,7 +65,6 @@ import 'package:cake_wallet/store/templates/send_template_store.dart';
 import 'package:cake_wallet/store/templates/exchange_template_store.dart';
 import 'package:cake_wallet/src/domain/common/template.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
-import 'package:cake_wallet/store/dashboard/page_view_store.dart';
 
 final getIt = GetIt.instance;
 
@@ -121,7 +120,6 @@ Future setup(
       TradeFilterStore(wallet: getIt.get<AppStore>().wallet));
   getIt.registerSingleton<TransactionFilterStore>(TransactionFilterStore());
   getIt.registerSingleton<FiatConvertationStore>(FiatConvertationStore());
-  getIt.registerSingleton<PageViewStore>(PageViewStore());
   getIt.registerSingleton<SendTemplateStore>(
       SendTemplateStore(templateSource: templates));
   getIt.registerSingleton<ExchangeTemplateStore>(
@@ -169,8 +167,7 @@ Future setup(
           appStore: getIt.get<AppStore>(),
           tradesStore: getIt.get<TradesStore>(),
           tradeFilterStore: getIt.get<TradeFilterStore>(),
-          transactionFilterStore: getIt.get<TransactionFilterStore>(),
-          pageViewStore: getIt.get<PageViewStore>()
+          transactionFilterStore: getIt.get<TransactionFilterStore>()
       ));
 
   getIt.registerFactory<AuthService>(() => AuthService(
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index 7623891f4..2c0a02319 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -6,15 +6,13 @@ import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/menu_widget.dart';
 import 'package:cake_wallet/palette.dart';
-import 'package:dots_indicator/dots_indicator.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/action_button.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/balance_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/address_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/transactions_page.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
+import 'package:smooth_page_indicator/smooth_page_indicator.dart';
 
 class DashboardPage extends BasePage {
   DashboardPage({
@@ -95,20 +93,18 @@ class DashboardPage extends BasePage {
             padding: EdgeInsets.only(
                 bottom: 24
             ),
-            child: Observer(
-                builder: (_) {
-                  return DotsIndicator(
-                    dotsCount: pages.length,
-                    position: walletViewModel.currentPage,
-                    decorator: DotsDecorator(
-                      color: PaletteDark.cyanBlue,
-                      activeColor: Colors.white,
-                      size: Size(6, 6),
-                      activeSize: Size(6, 6),
-                    ),
-                  );
-                }
-            ),
+            child: SmoothPageIndicator(
+              controller: controller,
+              count:  pages.length,
+              effect: ColorTransitionEffect(
+                  spacing:  6.0,
+                  radius:  6.0,
+                  dotWidth:  6.0,
+                  dotHeight:  6.0,
+                  dotColor:  PaletteDark.cyanBlue,
+                  activeDotColor:  Colors.white
+              ),
+            )
           ),
           Container(
             width: double.infinity,
@@ -159,16 +155,6 @@ class DashboardPage extends BasePage {
     pages.add(BalancePage(dashboardViewModel: walletViewModel));
     pages.add(TransactionsPage(dashboardViewModel: walletViewModel));
 
-    controller.addListener(() {
-      walletViewModel.pageViewStore.setCurrentPage(controller.page);
-    });
-
-    reaction((_) => walletViewModel.currentPage, (double currentPage) {
-      if (controller.page != currentPage) {
-        controller.jumpTo(currentPage);
-      }
-    });
-
     _isEffectsInstalled = true;
   }
 }
diff --git a/lib/store/dashboard/page_view_store.dart b/lib/store/dashboard/page_view_store.dart
deleted file mode 100644
index 30b938519..000000000
--- a/lib/store/dashboard/page_view_store.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-import 'package:mobx/mobx.dart';
-
-part 'page_view_store.g.dart';
-
-class PageViewStore = PageViewStoreBase with _$PageViewStore;
-
-abstract class PageViewStoreBase with Store {
-  PageViewStoreBase() {
-    setCurrentPage(1);
-  }
-
-  @observable
-  double currentPage;
-
-  @action
-  void setCurrentPage(double currentPage) {
-    this.currentPage = currentPage;
-  }
-}
\ No newline at end of file
diff --git a/lib/view_model/dashboard/dashboard_view_model.dart b/lib/view_model/dashboard/dashboard_view_model.dart
index 64530b655..65deb5f92 100644
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@@ -22,7 +22,6 @@ import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:cake_wallet/store/dashboard/trade_filter_store.dart';
 import 'package:cake_wallet/store/dashboard/transaction_filter_store.dart';
 import 'package:cake_wallet/view_model/dashboard/formatted_item_list.dart';
-import 'package:cake_wallet/store/dashboard/page_view_store.dart';
 
 part 'dashboard_view_model.g.dart';
 
@@ -34,8 +33,7 @@ abstract class DashboardViewModelBase with Store {
     this.appStore,
     this.tradesStore,
     this.tradeFilterStore,
-    this.transactionFilterStore,
-    this.pageViewStore}) {
+    this.transactionFilterStore}) {
 
     name = appStore.wallet?.name;
     wallet ??= appStore.wallet;
@@ -69,9 +67,6 @@ abstract class DashboardViewModelBase with Store {
   @observable
   String subname;
 
-  @computed
-  double get currentPage => pageViewStore.currentPage;
-
   @computed
   String get address => wallet.address;
 
@@ -130,8 +125,6 @@ abstract class DashboardViewModelBase with Store {
 
   TransactionFilterStore transactionFilterStore;
 
-  PageViewStore pageViewStore;
-
   ReactionDisposer _reaction;
 
   void _onWalletChange(WalletBase wallet) {
diff --git a/pubspec.lock b/pubspec.lock
index f8e7304da..344397bf6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -267,13 +267,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.7"
-  dots_indicator:
-    dependency: "direct main"
-    description:
-      name: dots_indicator
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
   dotted_border:
     dependency: "direct main"
     description:
@@ -803,6 +796,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
+  smooth_page_indicator:
+    dependency: "direct main"
+    description:
+      name: smooth_page_indicator
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
   source_gen:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index bda604b55..d99925e2e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -50,7 +50,7 @@ dependencies:
   devicelocale: ^0.2.1
   auto_size_text: ^2.1.0
   dotted_border: ^1.0.5
-  dots_indicator: ^1.2.0
+  smooth_page_indicator: ^0.2.0
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.

From 27dce3118d06c55fa2ea18daeed347396f342761 Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Wed, 19 Aug 2020 20:57:06 +0300
Subject: [PATCH 07/15] CAKE-20 | applied light theme to dashboard, receive,
 monero_account_list, monero_account_edit_or_create, address_edit_or_create,
 trade_details, transaction_details and base pages

---
 assets/images/2.0x/bitcoin_menu.png           | Bin 0 -> 2395 bytes
 assets/images/3.0x/bitcoin_menu.png           | Bin 0 -> 3469 bytes
 assets/images/bitcoin_menu.png                | Bin 0 -> 1269 bytes
 lib/palette.dart                              |  17 ++
 lib/src/screens/base_page.dart                |  27 +-
 lib/src/screens/dashboard/dashboard_page.dart |  20 +-
 .../dashboard/widgets/action_button.dart      |   3 +-
 .../dashboard/widgets/address_page.dart       |   7 +-
 .../dashboard/widgets/balance_page.dart       |   5 +-
 .../dashboard/widgets/date_section_raw.dart   |   3 +-
 .../screens/dashboard/widgets/header_row.dart |  49 +++-
 .../dashboard/widgets/menu_widget.dart        |  21 +-
 .../dashboard/widgets/sync_indicator.dart     |  21 +-
 .../screens/dashboard/widgets/trade_row.dart  |   4 +-
 .../dashboard/widgets/transaction_raw.dart    |   9 +-
 .../dashboard/widgets/transactions_page.dart  |   5 +-
 .../monero_account_edit_or_create_page.dart   |   8 -
 .../monero_account_list_page.dart             |  10 +-
 .../monero_accounts/widgets/account_tile.dart |   9 +-
 lib/src/screens/receive/receive_page.dart     |  37 ++-
 .../screens/receive/widgets/header_tile.dart  |   9 +-
 .../screens/receive/widgets/qr_widget.dart    |  11 +-
 .../address_edit_or_create_page.dart          |   8 -
 .../trade_details/trade_details_page.dart     |   8 +-
 .../transaction_details_page.dart             |   8 +-
 lib/src/widgets/base_text_form_field.dart     |   9 +-
 lib/src/widgets/cake_scrollbar.dart           |   5 +-
 lib/src/widgets/primary_button.dart           |   5 +-
 lib/src/widgets/standart_list_row.dart        |  31 +-
 lib/themes.dart                               | 277 +++++++++++++-----
 30 files changed, 399 insertions(+), 227 deletions(-)
 create mode 100644 assets/images/2.0x/bitcoin_menu.png
 create mode 100644 assets/images/3.0x/bitcoin_menu.png
 create mode 100644 assets/images/bitcoin_menu.png

diff --git a/assets/images/2.0x/bitcoin_menu.png b/assets/images/2.0x/bitcoin_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..7afe772aa4307ec935bc4469f798d5bcc0a64074
GIT binary patch
literal 2395
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
N002ovPDHLkV1fZ1e=-07

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/bitcoin_menu.png b/assets/images/3.0x/bitcoin_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..a278fa2a5f19bc463a9143ea0fa159e605a38636
GIT binary patch
literal 3469
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

literal 0
HcmV?d00001

diff --git a/assets/images/bitcoin_menu.png b/assets/images/bitcoin_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed0ea0048d2d3fb364ebc5771784498e9504485e
GIT binary patch
literal 1269
zcmV<R1Pc3!P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1d2&SK~#7Fy;;j~
z+ei@Y9%6mwW<W(?ZUlk@SW=2$soR!IT+<N%h+rX8yXBkU2uRB1v!Mt~M<6%?^K1cV
zcjLo?KoFRLRDM;YIGEqVOn1+l7D7*4Iv;IN@Dd4Z1R4{-5b}>;hky}3lg}0i?ykK*
zL+AlCX}oY&!xYql5Z_eDXo4c1E_|TGd+(h`y1ldr7R20w*mEGzCE7`F?%Xc8l>^2r
z)&+`E1ouB@`k}2=E5U!9jsJ|Rb_A)vbkE)%t8FAGTbiJ?;<vQn*B~5Fa_)QQyLyFc
zYW<7J3G4(1tEP$rg0iiB$+6*|AkrCcO9bYy=kEGnXd}oDG3#q{9PdK$%6HCmQ$FKu
z`<;!*)+ekMnNv0qWV;(-?yWj>BK``h6Qcy=VjLzbpHOUS=}hj(Bmyu8@qq(^Yy*xA
ztT{@!bSD?@+{p>A(g`o$MM6myE)p2nWgGc^?R*-8S%_i>#r;BA@+EJb0L*kpNKu95
zZ$A&VL0KL^vgVh)kJI>@l$A<PW&h2f7R<?$9mojE>KS#XG?=>^7YMJG-o&rg6`|s;
zEL&;3;qk|80=E7R0mNvDFL>D&OJ^_!jtJ?m>Jzb@Ohh~;9Emw7N?vhs4Vqv9k~s^?
zfE*e=Lq7yEd0Du0ZqL}!B%aACuA9!=xqB;f*&1U5@k=R@Owbc4QdliBxzpmOIK}KY
z9DI50tj4uTJ<x@+UMkUZ&=X0T-aR4+XxEwy6<X8k1Ir+YBayApz;GXfqU!dE{Sgb-
zgI1VE)p88h2=p;lJg7;B3i3EtLcEt_;U9bwiE;a>1adz1>T(Kej@5yogqdDCuWo;W
z|GjfLO}5AS%$?N?4B{;m1bd-wf9#z%yn0(m;cL_VL(X|N(i<=Y^1$Dr$NggIPEX2G
zt{(^AtMyH4`O@7u>_{%?V<%3s17ke4zj%NC?(0X2FsLh&Yj^4~!J{Tn2m43FPNLf(
zQ!s1pv~7uhHJ<RMVNz{^a&@%`A>>$i*3~%QvdM=d1MxZAs0hM_)<e)#4{Xz+1!?>h
zaM0B>YP)^K6kjN1ol0OWwV&w2LBpw0T=KQRZMWH_Nykydc6gOS;w*s$N!WD3>4KRj
z=Z=`E8MZ^evw40>EJO^5$Cj$M5Tu<jQ|yA=5wkdGQGCUdy1HG((90FHFj?^qj9ArV
zyCLd`vk<!%@FS8oe>1Tcpk|3-y5ylSk8A~t$vRiD1Qu^sy?>N-tUhiAn0%2{X5z$(
z=ALp1ZxU;R@|@q_NeYA3vMZi2lD|#&4-?gVWc28v;#_-z*(wrfX*Kp%pC$i2|8S~=
z`97j$k8O}}R#iy{sSn;3xjZkx9OddiA<1-@r)kX1n8@<yg4pr3J9$-q-k6(_L=GAp
zNl%54vv|&?y4LjD6Sms`?ddnw)|F%1Tge*qOa^sf$Jf?H8#zHMK>=UPgW^sbz_TIs
zC1rB$Os~3HnkLall7%qM5)|0+3FKRpUYVTZMg*&vd$*@VSo{luMtr)Apz?2s;<FXW
fBn~H8F6e=uctj}^QI@cF00000NkvXXu0mjfJ={<Z

literal 0
HcmV?d00001

diff --git a/lib/palette.dart b/lib/palette.dart
index b983b16c5..0eebf247f 100644
--- a/lib/palette.dart
+++ b/lib/palette.dart
@@ -13,6 +13,23 @@ class Palette {
   static const Color blue = Color.fromRGBO(88, 143, 252, 1.0);
   static const Color darkLavender = Color.fromRGBO(225, 238, 250, 1.0);
   static const Color nightBlue = Color.fromRGBO(46, 57, 96, 1.0);
+
+  // NEW DESIGN
+  static const Color blueCraiola = Color.fromRGBO(69, 110, 255, 1.0);
+  static const Color darkBlueCraiola = Color.fromRGBO(53, 86, 136, 1.0);
+  static const Color pinkFlamingo = Color.fromRGBO(240, 60, 243, 1.0);
+  static const Color redHat = Color.fromRGBO(209, 68, 37, 1.0);
+  static const Color shineOrange = Color.fromRGBO(255, 184, 78, 1.0);
+  static const Color paleBlue = Color.fromRGBO(225, 228, 233, 1.0);
+  static const Color violetBlue = Color.fromRGBO(56, 69, 103, 1.0);
+  static const Color periwinkleCraiola = Color.fromRGBO(229, 232, 242, 1.0);
+  static const Color moderatePurpleBlue = Color.fromRGBO(57, 74, 95, 1.0);
+  static const Color moderateLavender = Color.fromRGBO(233, 242, 252, 1.0);
+  static const Color wildLavender = Color.fromRGBO(224, 230, 246, 1.0);
+  static const Color gray = Color.fromRGBO(112, 147, 186, 1.0);
+  static const Color wildPeriwinkle = Color.fromRGBO(219, 227, 243, 1.0);
+  static const Color darkGray = Color.fromRGBO(122, 147, 186, 1.0);
+
   // FIXME: Rename.
   static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
   static const Color xxx = Color.fromRGBO(72, 89, 109, 1);
diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart
index 30136815d..33945e5d2 100644
--- a/lib/src/screens/base_page.dart
+++ b/lib/src/screens/base_page.dart
@@ -15,7 +15,9 @@ abstract class BasePage extends StatelessWidget {
 
   Color get backgroundLightColor => Colors.white;
 
-  Color get backgroundDarkColor => PaletteDark.darkNightBlue;
+  Color get backgroundDarkColor => PaletteDark.backgroundColor;
+
+  Color get titleColor => null;
 
   bool get resizeToAvoidBottomPadding => true;
 
@@ -27,11 +29,6 @@ abstract class BasePage extends StatelessWidget {
 
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
 
-  final _backArrowImage = Image.asset('assets/images/back_arrow.png',
-  color: Colors.white);
-  final _backArrowImageDarkTheme =
-  Image.asset('assets/images/back_arrow_dark_theme.png',
-  color: Colors.white);
   final _closeButtonImage = Image.asset('assets/images/close_button.png');
   final _closeButtonImageDarkTheme =
       Image.asset('assets/images/close_button_dark_theme.png');
@@ -45,16 +42,13 @@ abstract class BasePage extends StatelessWidget {
       return null;
     }
 
-    final _themeChanger = Provider.of<ThemeChanger>(context);
-    Image _closeButton, _backButton;
+    final _backButton = Image.asset('assets/images/back_arrow.png',
+          color: titleColor ?? Theme.of(context).primaryTextTheme.title.color);
 
-    if (_themeChanger.getTheme() == Themes.darkTheme) {
-      _backButton = _backArrowImageDarkTheme;
-      _closeButton = _closeButtonImageDarkTheme;
-    } else {
-      _backButton = _backArrowImage;
-      _closeButton = _closeButtonImage;
-    }
+    final _themeChanger = Provider.of<ThemeChanger>(context);
+    final _closeButton = _themeChanger.getTheme() == Themes.darkTheme
+    ? _closeButtonImageDarkTheme
+    : _closeButtonImage;
 
     return SizedBox(
       height: 37,
@@ -79,7 +73,8 @@ abstract class BasePage extends StatelessWidget {
             style: TextStyle(
                 fontSize: 18.0,
                 fontWeight: FontWeight.bold,
-                color: Colors.white),
+                color: titleColor ??
+                       Theme.of(context).primaryTextTheme.title.color),
           );
   }
 
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index 2c0a02319..495d58cec 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -5,7 +5,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/menu_widget.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/action_button.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/balance_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/address_page.dart';
@@ -21,10 +20,23 @@ class DashboardPage extends BasePage {
   });
 
   @override
-  Color get backgroundLightColor => PaletteDark.backgroundColor;
+  Color get backgroundLightColor => Colors.transparent;
 
   @override
-  Color get backgroundDarkColor => PaletteDark.backgroundColor;
+  Color get backgroundDarkColor => Colors.transparent;
+
+  @override
+  Widget Function(BuildContext, Widget) get rootWrapper =>
+          (BuildContext context, Widget scaffold) => Container(
+          decoration: BoxDecoration(
+              gradient: LinearGradient(colors: [
+                Theme.of(context).accentColor,
+                Theme.of(context).scaffoldBackgroundColor,
+                Theme.of(context).primaryColor,
+              ],
+              begin: Alignment.topRight,
+              end: Alignment.bottomLeft)),
+          child: scaffold);
 
   @override
   bool get resizeToAvoidBottomPadding => false;
@@ -101,7 +113,7 @@ class DashboardPage extends BasePage {
                   radius:  6.0,
                   dotWidth:  6.0,
                   dotHeight:  6.0,
-                  dotColor:  PaletteDark.cyanBlue,
+                  dotColor:  Theme.of(context).indicatorColor,
                   activeDotColor:  Colors.white
               ),
             )
diff --git a/lib/src/screens/dashboard/widgets/action_button.dart b/lib/src/screens/dashboard/widgets/action_button.dart
index a42c4ec8c..4ab08d97e 100644
--- a/lib/src/screens/dashboard/widgets/action_button.dart
+++ b/lib/src/screens/dashboard/widgets/action_button.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 
 class ActionButton extends StatelessWidget{
   ActionButton({
@@ -36,7 +35,7 @@ class ActionButton extends StatelessWidget{
               width: 60,
               alignment: Alignment.center,
               decoration: BoxDecoration(
-                color: PaletteDark.nightBlue,
+                color: Theme.of(context).buttonColor,
                 shape: BoxShape.circle),
               child: image,
             ),
diff --git a/lib/src/screens/dashboard/widgets/address_page.dart b/lib/src/screens/dashboard/widgets/address_page.dart
index 35134d51b..c50b1b566 100644
--- a/lib/src/screens/dashboard/widgets/address_page.dart
+++ b/lib/src/screens/dashboard/widgets/address_page.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/qr_widget.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -29,7 +28,11 @@ class AddressPage extends StatelessWidget {
               alignment: Alignment.center,
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.all(Radius.circular(25)),
-                color: PaletteDark.nightBlue
+                border: Border.all(
+                  color: Theme.of(context).textTheme.subhead.color,
+                  width: 1
+                ),
+                color: Theme.of(context).buttonColor
               ),
               child: Row(
                 mainAxisSize: MainAxisSize.max,
diff --git a/lib/src/screens/dashboard/widgets/balance_page.dart b/lib/src/screens/dashboard/widgets/balance_page.dart
index 9cca31a31..4cd3fe2a0 100644
--- a/lib/src/screens/dashboard/widgets/balance_page.dart
+++ b/lib/src/screens/dashboard/widgets/balance_page.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 
 class BalancePage extends StatelessWidget {
@@ -26,7 +25,7 @@ class BalancePage extends StatelessWidget {
                       style: TextStyle(
                           fontSize: 40,
                           fontWeight: FontWeight.bold,
-                          color: PaletteDark.cyanBlue,
+                          color: Theme.of(context).indicatorColor,
                           height: 1
                       ),
                     );
@@ -52,7 +51,7 @@ class BalancePage extends StatelessWidget {
                       style: TextStyle(
                           fontSize: 18,
                           fontWeight: FontWeight.w500,
-                          color: PaletteDark.cyanBlue,
+                          color: Theme.of(context).indicatorColor,
                           height: 1
                       ),
                     );
diff --git a/lib/src/screens/dashboard/widgets/date_section_raw.dart b/lib/src/screens/dashboard/widgets/date_section_raw.dart
index 61a6a64de..a69268a21 100644
--- a/lib/src/screens/dashboard/widgets/date_section_raw.dart
+++ b/lib/src/screens/dashboard/widgets/date_section_raw.dart
@@ -3,7 +3,6 @@ import 'package:intl/intl.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:provider/provider.dart';
 import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/palette.dart';
 
 class DateSectionRaw extends StatelessWidget {
   DateSectionRaw({this.date});
@@ -42,7 +41,7 @@ class DateSectionRaw extends StatelessWidget {
       child: Text(title,
         style: TextStyle(
           fontSize: 12,
-          color: PaletteDark.darkCyanBlue
+          color: Theme.of(context).textTheme.overline.backgroundColor
       ))
     );
   }
diff --git a/lib/src/screens/dashboard/widgets/header_row.dart b/lib/src/screens/dashboard/widgets/header_row.dart
index 837c23e6f..7542e7371 100644
--- a/lib/src/screens/dashboard/widgets/header_row.dart
+++ b/lib/src/screens/dashboard/widgets/header_row.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
@@ -11,11 +10,11 @@ class HeaderRow extends StatelessWidget {
 
   final DashboardViewModel dashboardViewModel;
 
-  final filterIcon = Image.asset('assets/images/filter_icon.png',
-      color: PaletteDark.wildBlue);
-
   @override
   Widget build(BuildContext context) {
+    final filterIcon = Image.asset('assets/images/filter_icon.png',
+        color: Theme.of(context).textTheme.caption.decorationColor);
+
     return Container(
       height: 52,
       color: Colors.transparent,
@@ -40,7 +39,7 @@ class HeaderRow extends StatelessWidget {
                   child: Text(S.of(context).transactions,
                       style: TextStyle(
                           fontWeight: FontWeight.bold,
-                          color: Theme.of(context).primaryTextTheme.caption.color))),
+                          color: Theme.of(context).primaryTextTheme.title.color))),
               PopupMenuItem(
                   value: 0,
                   child: Observer(
@@ -49,7 +48,11 @@ class HeaderRow extends StatelessWidget {
                           MainAxisAlignment
                               .spaceBetween,
                           children: [
-                            Text(S.of(context).incoming),
+                            Text(S.of(context).incoming,
+                              style: TextStyle(
+                                color: Theme.of(context).primaryTextTheme.title.color
+                              ),
+                            ),
                             Checkbox(
                                 value: dashboardViewModel
                                     .transactionFilterStore
@@ -67,7 +70,11 @@ class HeaderRow extends StatelessWidget {
                           MainAxisAlignment
                               .spaceBetween,
                           children: [
-                            Text(S.of(context).outgoing),
+                            Text(S.of(context).outgoing,
+                                style: TextStyle(
+                                    color: Theme.of(context).primaryTextTheme.title.color
+                                )
+                            ),
                             Checkbox(
                               value: dashboardViewModel
                                   .transactionFilterStore
@@ -80,7 +87,11 @@ class HeaderRow extends StatelessWidget {
               PopupMenuItem(
                   value: 2,
                   child:
-                  Text(S.of(context).transactions_by_date)),
+                  Text(S.of(context).transactions_by_date,
+                      style: TextStyle(
+                          color: Theme.of(context).primaryTextTheme.title.color
+                      )
+                  )),
               PopupMenuDivider(),
               PopupMenuItem(
                   enabled: false,
@@ -88,7 +99,7 @@ class HeaderRow extends StatelessWidget {
                   child: Text(S.of(context).trades,
                       style: TextStyle(
                           fontWeight: FontWeight.bold,
-                          color: Theme.of(context).primaryTextTheme.caption.color))),
+                          color: Theme.of(context).primaryTextTheme.title.color))),
               PopupMenuItem(
                   value: 3,
                   child: Observer(
@@ -97,7 +108,11 @@ class HeaderRow extends StatelessWidget {
                           MainAxisAlignment
                               .spaceBetween,
                           children: [
-                            Text('XMR.TO'),
+                            Text('XMR.TO',
+                                style: TextStyle(
+                                    color: Theme.of(context).primaryTextTheme.title.color
+                                )
+                            ),
                             Checkbox(
                               value: dashboardViewModel
                                   .tradeFilterStore
@@ -117,7 +132,11 @@ class HeaderRow extends StatelessWidget {
                           MainAxisAlignment
                               .spaceBetween,
                           children: [
-                            Text('Change.NOW'),
+                            Text('Change.NOW',
+                                style: TextStyle(
+                                    color: Theme.of(context).primaryTextTheme.title.color
+                                )
+                            ),
                             Checkbox(
                               value: dashboardViewModel
                                   .tradeFilterStore
@@ -137,7 +156,11 @@ class HeaderRow extends StatelessWidget {
                           MainAxisAlignment
                               .spaceBetween,
                           children: [
-                            Text('MorphToken'),
+                            Text('MorphToken',
+                                style: TextStyle(
+                                    color: Theme.of(context).primaryTextTheme.title.color
+                                )
+                            ),
                             Checkbox(
                               value: dashboardViewModel
                                   .tradeFilterStore
@@ -155,7 +178,7 @@ class HeaderRow extends StatelessWidget {
               width: 36,
               decoration: BoxDecoration(
                   shape: BoxShape.circle,
-                  color: PaletteDark.oceanBlue
+                  color: Theme.of(context).textTheme.overline.color
               ),
               child: filterIcon,
             ),
diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart
index 505e09dab..834026779 100644
--- a/lib/src/screens/dashboard/widgets/menu_widget.dart
+++ b/lib/src/screens/dashboard/widgets/menu_widget.dart
@@ -17,7 +17,7 @@ class MenuWidget extends StatefulWidget {
 
 class MenuWidgetState extends State<MenuWidget> {
   final moneroIcon = Image.asset('assets/images/monero_menu.png');
-  final bitcoinIcon = Image.asset('assets/images/bitcoin.png');
+  final bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png');
   final largeScreen = 731;
 
   double menuWidth;
@@ -81,7 +81,7 @@ class MenuWidgetState extends State<MenuWidget> {
               width: 4,
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.all(Radius.circular(2)),
-                color: Theme.of(context).hintColor),
+                color: PaletteDark.gray),
             )),
           SizedBox(width: 12),
           Expanded(
@@ -92,12 +92,13 @@ class MenuWidgetState extends State<MenuWidget> {
                 child: Container(
                   width: menuWidth,
                   height: double.infinity,
-                  color: PaletteDark.deepPurpleBlue,
+                  color: Theme.of(context).textTheme.body2.decorationColor,
                   child: SingleChildScrollView(
                     child: Column(
                       children: <Widget>[
                         Container(
                           height: headerHeight,
+                          color: Theme.of(context).textTheme.body2.color,
                           padding: EdgeInsets.only(
                               left: 24,
                               top: fromTopEdge,
@@ -120,7 +121,8 @@ class MenuWidgetState extends State<MenuWidget> {
                                         Text(
                                           widget.name,
                                           style: TextStyle(
-                                              color: Colors.white,
+                                              color: Theme.of(context).textTheme
+                                                  .display2.color,
                                               fontSize: 16,
                                               fontWeight: FontWeight.bold),
                                         ),
@@ -128,7 +130,9 @@ class MenuWidgetState extends State<MenuWidget> {
                                           Text(
                                             widget.subname,
                                             style: TextStyle(
-                                                color: PaletteDark.darkCyanBlue,
+                                                color: Theme.of(context)
+                                                    .primaryTextTheme
+                                                    .caption.color,
                                                 fontWeight: FontWeight.w500,
                                                 fontSize: 12),
                                           )
@@ -140,7 +144,7 @@ class MenuWidgetState extends State<MenuWidget> {
                         ),
                         Container(
                           height: 1,
-                          color: PaletteDark.darkOceanBlue,
+                          color: Theme.of(context).primaryTextTheme.caption.decorationColor,
                         ),
                         ListView.separated(
                             shrinkWrap: true,
@@ -178,7 +182,8 @@ class MenuWidgetState extends State<MenuWidget> {
                                           child: Text(
                                             item,
                                             style: TextStyle(
-                                                color: Colors.white,
+                                                color: Theme.of(context).textTheme
+                                                    .display2.color,
                                                 fontSize: 16,
                                                 fontWeight: FontWeight.bold),
                                           ))
@@ -189,7 +194,7 @@ class MenuWidgetState extends State<MenuWidget> {
                             },
                             separatorBuilder: (_, index) => Container(
                               height: 1,
-                              color: PaletteDark.darkOceanBlue,
+                              color: Theme.of(context).primaryTextTheme.caption.decorationColor,
                             ),
                             itemCount: itemCount)
                       ],
diff --git a/lib/src/screens/dashboard/widgets/sync_indicator.dart b/lib/src/screens/dashboard/widgets/sync_indicator.dart
index 64b8575c1..f0a0fac08 100644
--- a/lib/src/screens/dashboard/widgets/sync_indicator.dart
+++ b/lib/src/screens/dashboard/widgets/sync_indicator.dart
@@ -13,35 +13,36 @@ class SyncIndicator extends StatelessWidget {
   Widget build(BuildContext context) {
     return Observer(
       builder: (_) {
-        final syncIndicatorWidth = 250.0;
+        final syncIndicatorWidth = 237.0;
         final status = dashboardViewModel.status;
-        final statusText = status.title();
-        final progress = status.progress();
+        final statusText = status != null ? status.title() : '';
+        final progress = status != null ? status.progress() : 0.0;
         final indicatorOffset = progress * syncIndicatorWidth;
-        final indicatorWidth =
-        progress <= 1 ? syncIndicatorWidth - indicatorOffset : 0.0;
+        final indicatorWidth = progress < 1
+            ? indicatorOffset > 0 ? indicatorOffset : 0.0
+            : syncIndicatorWidth;
         final indicatorColor = status is SyncedSyncStatus
                                ? PaletteDark.brightGreen
-                               : PaletteDark.orangeYellow;
+                               : Theme.of(context).textTheme.caption.color;
 
         return ClipRRect(
           borderRadius: BorderRadius.all(Radius.circular(15)),
           child: Container(
             height: 30,
             width: syncIndicatorWidth,
-            color: PaletteDark.lightNightBlue,
+            color: Theme.of(context).textTheme.title.decorationColor,
             child: Stack(
               alignment: Alignment.center,
               children: <Widget>[
                 progress <= 1
                 ? Positioned(
-                    left: indicatorOffset,
+                    left: 0,
                     top: 0,
                     bottom: 0,
                     child: Container(
                       width: indicatorWidth,
                       height: 30,
-                      color: PaletteDark.oceanBlue,
+                      color: Theme.of(context).textTheme.title.backgroundColor,
                     )
                 )
                 : Offstage(),
@@ -70,7 +71,7 @@ class SyncIndicator extends StatelessWidget {
                           style: TextStyle(
                             fontSize: 12,
                             fontWeight: FontWeight.w500,
-                            color: PaletteDark.wildBlue
+                            color: Theme.of(context).textTheme.title.color
                           ),
                         ),
                       )
diff --git a/lib/src/screens/dashboard/widgets/trade_row.dart b/lib/src/screens/dashboard/widgets/trade_row.dart
index 8a7bc7daf..6da7a798f 100644
--- a/lib/src/screens/dashboard/widgets/trade_row.dart
+++ b/lib/src/screens/dashboard/widgets/trade_row.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/palette.dart';
 
 class TradeRow extends StatelessWidget {
   TradeRow({
@@ -66,7 +65,8 @@ class TradeRow extends StatelessWidget {
                                   Text(createdAtFormattedDate,
                                       style: TextStyle(
                                           fontSize: 14,
-                                          color: PaletteDark.darkCyanBlue))
+                                          color: Theme.of(context).textTheme
+                                              .overline.backgroundColor))
                                 ]),
                           ],
                         ),
diff --git a/lib/src/screens/dashboard/widgets/transaction_raw.dart b/lib/src/screens/dashboard/widgets/transaction_raw.dart
index 0d41b42a6..625e8028b 100644
--- a/lib/src/screens/dashboard/widgets/transaction_raw.dart
+++ b/lib/src/screens/dashboard/widgets/transaction_raw.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
@@ -35,7 +34,7 @@ class TransactionRow extends StatelessWidget {
                   width: 36,
                   decoration: BoxDecoration(
                     shape: BoxShape.circle,
-                    color: PaletteDark.wildNightBlue
+                    color: Theme.of(context).textTheme.overline.decorationColor
                   ),
                   child: Image.asset(
                       direction == TransactionDirection.incoming
@@ -79,13 +78,15 @@ class TransactionRow extends StatelessWidget {
                                   Text(formattedDate,
                                       style: TextStyle(
                                           fontSize: 14,
-                                          color: PaletteDark.darkCyanBlue)),
+                                          color: Theme.of(context).textTheme
+                                              .overline.backgroundColor)),
                                   Text(direction == TransactionDirection.incoming
                                       ? formattedFiatAmount
                                       : '- ' + formattedFiatAmount,
                                       style: TextStyle(
                                           fontSize: 14,
-                                          color: PaletteDark.darkCyanBlue))
+                                          color: Theme.of(context).textTheme
+                                              .overline.backgroundColor))
                                 ]),
                           ],
                         ),
diff --git a/lib/src/screens/dashboard/widgets/transactions_page.dart b/lib/src/screens/dashboard/widgets/transactions_page.dart
index d6cbf0ae5..15b2eedaa 100644
--- a/lib/src/screens/dashboard/widgets/transactions_page.dart
+++ b/lib/src/screens/dashboard/widgets/transactions_page.dart
@@ -75,7 +75,7 @@ class TransactionsPage extends StatelessWidget {
                         }
 
                         return Container(
-                            color: Theme.of(context).backgroundColor,
+                            color: Colors.transparent,
                             height: 1);
                       }
                   )
@@ -84,7 +84,8 @@ class TransactionsPage extends StatelessWidget {
                       S.of(context).placeholder_transactions,
                       style: TextStyle(
                         fontSize: 14,
-                        color: Colors.grey
+                        color: Theme.of(context).primaryTextTheme
+                            .overline.decorationColor
                       ),
                     ),
                   );
diff --git a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
index 7cd1b200a..ca2b65359 100644
--- a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
+++ b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
@@ -8,7 +8,6 @@ import 'package:cake_wallet/view_model/monero_account_list/monero_account_edit_o
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
-import 'package:cake_wallet/palette.dart';
 
 class MoneroAccountEditOrCreatePage extends BasePage {
   MoneroAccountEditOrCreatePage({@required this.moneroAccountCreationViewModel})
@@ -24,12 +23,6 @@ class MoneroAccountEditOrCreatePage extends BasePage {
   @override
   String get title => S.current.account;
 
-  @override
-  Color get backgroundLightColor => PaletteDark.backgroundColor;
-
-  @override
-  Color get backgroundDarkColor => PaletteDark.backgroundColor;
-
   final GlobalKey<FormState> _formKey;
   final TextEditingController _textController;
 
@@ -45,7 +38,6 @@ class MoneroAccountEditOrCreatePage extends BasePage {
                   child: Center(
                       child: BaseTextFormField(
                         controller: _textController,
-                        textColor: Colors.white,
                         hintText: S.of(context).account,
                         validator: MoneroLabelValidator(),
                       ))),
diff --git a/lib/src/screens/monero_accounts/monero_account_list_page.dart b/lib/src/screens/monero_accounts/monero_account_list_page.dart
index c59e566d1..8c3a5503e 100644
--- a/lib/src/screens/monero_accounts/monero_account_list_page.dart
+++ b/lib/src/screens/monero_accounts/monero_account_list_page.dart
@@ -64,7 +64,7 @@ class MoneroAccountListPage extends StatelessWidget {
                     borderRadius: BorderRadius.all(Radius.circular(14)),
                     child: Container(
                       height: 296,
-                      color: PaletteDark.deepPurpleBlue,
+                      color: Theme.of(context).textTheme.display4.decorationColor,
                       child: Column(
                         children: <Widget>[
                           Expanded(
@@ -83,7 +83,7 @@ class MoneroAccountListPage extends StatelessWidget {
                                           separatorBuilder: (context, index) =>
                                           Container(
                                             height: 1,
-                                            color: PaletteDark.dividerColor,
+                                            color: Theme.of(context).dividerColor,
                                           ),
                                           itemCount: accounts.length ?? 0,
                                           itemBuilder: (context, index) {
@@ -121,7 +121,7 @@ class MoneroAccountListPage extends StatelessWidget {
                                 .pushNamed(Routes.accountCreation),
                             child: Container(
                               height: 62,
-                              color: Colors.white,
+                              color: Theme.of(context).textTheme.subtitle.decorationColor,
                               padding: EdgeInsets.only(left: 24, right: 24),
                               child: Center(
                                 child: Row(
@@ -129,7 +129,7 @@ class MoneroAccountListPage extends StatelessWidget {
                                   children: <Widget>[
                                     Icon(
                                       Icons.add,
-                                      color: PaletteDark.darkNightBlue,
+                                      color: Colors.white,
                                     ),
                                     Padding(
                                       padding: EdgeInsets.only(left: 5),
@@ -138,7 +138,7 @@ class MoneroAccountListPage extends StatelessWidget {
                                         style: TextStyle(
                                           fontSize: 15,
                                           fontWeight: FontWeight.w600,
-                                          color: PaletteDark.darkNightBlue,
+                                          color: Colors.white,
                                           decoration: TextDecoration.none,
                                         ),
                                       ),
diff --git a/lib/src/screens/monero_accounts/widgets/account_tile.dart b/lib/src/screens/monero_accounts/widgets/account_tile.dart
index a9f131f1c..5782ce8e4 100644
--- a/lib/src/screens/monero_accounts/widgets/account_tile.dart
+++ b/lib/src/screens/monero_accounts/widgets/account_tile.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 
 class AccountTile extends StatelessWidget {
   AccountTile({
@@ -14,8 +13,12 @@ class AccountTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final color = isCurrent ? PaletteDark.lightOceanBlue : Colors.transparent;
-    final textColor = isCurrent ? Colors.blue : Colors.white;
+    final color = isCurrent
+        ? Theme.of(context).textTheme.subtitle.decorationColor
+        : Theme.of(context).textTheme.display4.decorationColor;
+    final textColor = isCurrent
+        ? Theme.of(context).textTheme.subtitle.color
+        : Theme.of(context).textTheme.display4.color;
 
     return GestureDetector(
       onTap: onTap,
diff --git a/lib/src/screens/receive/receive_page.dart b/lib/src/screens/receive/receive_page.dart
index 21e8e3b5e..fbae17324 100644
--- a/lib/src/screens/receive/receive_page.dart
+++ b/lib/src/screens/receive/receive_page.dart
@@ -14,7 +14,6 @@ import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_h
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_item.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/qr_widget.dart';
-import 'package:cake_wallet/palette.dart';
 
 class ReceivePage extends BasePage {
   ReceivePage({this.addressListViewModel});
@@ -25,10 +24,26 @@ class ReceivePage extends BasePage {
   String get title => S.current.receive;
 
   @override
-  Color get backgroundLightColor => PaletteDark.backgroundColor;
+  Color get backgroundLightColor => Colors.transparent;
 
   @override
-  Color get backgroundDarkColor => PaletteDark.backgroundColor;
+  Color get backgroundDarkColor => Colors.transparent;
+
+  @override
+  Color get titleColor => Colors.white;
+
+  @override
+  Widget Function(BuildContext, Widget) get rootWrapper =>
+          (BuildContext context, Widget scaffold) => Container(
+          decoration: BoxDecoration(
+              gradient: LinearGradient(colors: [
+                Theme.of(context).accentColor,
+                Theme.of(context).scaffoldBackgroundColor,
+                Theme.of(context).primaryColor,
+              ],
+                  begin: Alignment.topRight,
+                  end: Alignment.bottomLeft)),
+          child: scaffold);
 
   @override
   Widget trailing(BuildContext context) {
@@ -66,7 +81,9 @@ class ReceivePage extends BasePage {
           Observer(
               builder: (_) => ListView.separated(
                   separatorBuilder: (context, _) =>
-                      Container(height: 1, color: PaletteDark.dividerColor),
+                      Container(
+                          height: 1,
+                          color: Theme.of(context).dividerColor),
                   shrinkWrap: true,
                   physics: NeverScrollableScrollPhysics(),
                   itemCount: addressListViewModel.items.length,
@@ -83,7 +100,7 @@ class ReceivePage extends BasePage {
                           icon: Icon(
                             Icons.arrow_forward_ios,
                             size: 14,
-                            color: Colors.white,
+                            color: Theme.of(context).textTheme.display1.color,
                           ));
                     }
 
@@ -95,7 +112,7 @@ class ReceivePage extends BasePage {
                           icon: Icon(
                             Icons.add,
                             size: 20,
-                            color: Colors.white,
+                            color: Theme.of(context).textTheme.display1.color,
                           ));
                     }
 
@@ -105,11 +122,11 @@ class ReceivePage extends BasePage {
                             final isCurrent = item.address ==
                                 addressListViewModel.address.address;
                             final backgroundColor = isCurrent
-                                ? PaletteDark.lightOceanBlue
-                                : PaletteDark.nightBlue;
+                                ? Theme.of(context).textTheme.display3.decorationColor
+                                : Theme.of(context).textTheme.display2.decorationColor;
                             final textColor = isCurrent
-                                ? Colors.blue
-                                : Colors.white;
+                                ? Theme.of(context).textTheme.display3.color
+                                : Theme.of(context).textTheme.display2.color;
 
                             return AddressCell.fromItem(item,
                                 isCurrent: isCurrent,
diff --git a/lib/src/screens/receive/widgets/header_tile.dart b/lib/src/screens/receive/widgets/header_tile.dart
index effb7349e..167cde582 100644
--- a/lib/src/screens/receive/widgets/header_tile.dart
+++ b/lib/src/screens/receive/widgets/header_tile.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 
 class HeaderTile extends StatelessWidget {
   HeaderTile({
@@ -23,7 +22,7 @@ class HeaderTile extends StatelessWidget {
             top: 24,
             bottom: 24
         ),
-        color: PaletteDark.nightBlue,
+        color: Theme.of(context).textTheme.display2.decorationColor,
         child: Row(
           mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -32,8 +31,8 @@ class HeaderTile extends StatelessWidget {
               title,
               style: TextStyle(
                   fontSize: 18,
-                  fontWeight: FontWeight.w500,
-                  color: Colors.white
+                  fontWeight: FontWeight.w600,
+                  color: Theme.of(context).textTheme.display2.color
               ),
             ),
             Container(
@@ -41,7 +40,7 @@ class HeaderTile extends StatelessWidget {
               width: 32,
               decoration: BoxDecoration(
                   shape: BoxShape.circle,
-                  color: PaletteDark.distantNightBlue
+                  color: Theme.of(context).textTheme.display1.decorationColor
               ),
               child: icon,
             )
diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart
index 7b6474847..3a30db535 100644
--- a/lib/src/screens/receive/widgets/qr_widget.dart
+++ b/lib/src/screens/receive/widgets/qr_widget.dart
@@ -7,7 +7,6 @@ import 'package:cake_wallet/src/screens/receive/widgets/qr_image.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/core/amount_validator.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
-import 'package:cake_wallet/palette.dart';
 
 class QRWidget extends StatelessWidget {
   QRWidget({
@@ -27,7 +26,7 @@ class QRWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final copyImage = Image.asset('assets/images/copy_address.png',
-          color: PaletteDark.lightBlueGrey);
+          color: Theme.of(context).textTheme.subhead.decorationColor);
     final addressTopOffset = isAmountFieldShow ? 60.0 : 40.0;
 
     return Column(
@@ -45,7 +44,7 @@ class QRWidget extends StatelessWidget {
                   child: QrImage(
                     data: addressListViewModel.uri.toString(),
                     backgroundColor: Colors.transparent,
-                    foregroundColor: PaletteDark.lightBlueGrey,
+                    foregroundColor: Theme.of(context).textTheme.headline.color,
           ))))),
           Spacer(flex: 3)
         ]),
@@ -56,7 +55,7 @@ class QRWidget extends StatelessWidget {
             style: TextStyle(
               fontSize: 12,
               fontWeight: FontWeight.w500,
-              color: PaletteDark.cyanBlue
+              color: Theme.of(context).indicatorColor
             ),
           ),
         ),
@@ -79,14 +78,14 @@ class QRWidget extends StatelessWidget {
                           textAlign: TextAlign.center,
                           hintText: S.of(context).receive_amount,
                           textColor: Colors.white,
-                          borderColor: PaletteDark.darkGrey,
+                          borderColor: Theme.of(context).textTheme.headline.decorationColor,
                           validator: AmountValidator(
                             type: addressListViewModel.type,
                             isAutovalidate: true
                           ),
                           autovalidate: true,
                           placeholderTextStyle: TextStyle(
-                              color: PaletteDark.cyanBlue,
+                              color: Theme.of(context).hoverColor,
                               fontSize: 18,
                               fontWeight: FontWeight.w500))))
             ],
diff --git a/lib/src/screens/subaddress/address_edit_or_create_page.dart b/lib/src/screens/subaddress/address_edit_or_create_page.dart
index 77eacab88..84c492196 100644
--- a/lib/src/screens/subaddress/address_edit_or_create_page.dart
+++ b/lib/src/screens/subaddress/address_edit_or_create_page.dart
@@ -8,7 +8,6 @@ import 'package:cake_wallet/core/address_label_validator.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/palette.dart';
 
 class AddressEditOrCreatePage extends BasePage {
   AddressEditOrCreatePage({@required this.addressEditOrCreateViewModel})
@@ -29,12 +28,6 @@ class AddressEditOrCreatePage extends BasePage {
   @override
   String get title => S.current.new_subaddress_title;
 
-  @override
-  Color get backgroundLightColor => PaletteDark.backgroundColor;
-
-  @override
-  Color get backgroundDarkColor => PaletteDark.backgroundColor;
-
   @override
   Widget body(BuildContext context) {
     reaction((_) => addressEditOrCreateViewModel.state,
@@ -55,7 +48,6 @@ class AddressEditOrCreatePage extends BasePage {
                   child: Center(
                       child: BaseTextFormField(
                           controller: _labelController,
-                          textColor: Colors.white,
                           hintText: S.of(context).new_subaddress_label_name,
                           validator: AddressLabelValidator()))),
               Observer(
diff --git a/lib/src/screens/trade_details/trade_details_page.dart b/lib/src/screens/trade_details/trade_details_page.dart
index e750694dc..52b85b873 100644
--- a/lib/src/screens/trade_details/trade_details_page.dart
+++ b/lib/src/screens/trade_details/trade_details_page.dart
@@ -24,7 +24,6 @@ class TradeDetailsPage extends BasePage {
           formatDefault: "dd.MM.yyyy, HH:mm");
 
     return Container(
-        padding: EdgeInsets.only(top: 20, bottom: 20),
         child: Observer(builder: (_) {
           final trade = exchangeStore.trade;
           final items = [
@@ -59,17 +58,15 @@ class TradeDetailsPage extends BasePage {
               separatorBuilder: (_, __) => Container(
                 height: 1,
                 padding: EdgeInsets.only(left: 24),
-                color: Theme.of(context).accentTextTheme.title.backgroundColor,
+                color: Theme.of(context).backgroundColor,
                 child: Container(
                   height: 1,
-                  color: Theme.of(context).dividerColor,
+                  color: Theme.of(context).primaryTextTheme.title.backgroundColor,
                 ),
               ),
               itemCount: items.length,
               itemBuilder: (BuildContext context, int index) {
                 final item = items[index];
-
-                final isDrawTop = index == 0 ? true : false;
                 final isDrawBottom = index == items.length - 1 ? true : false;
 
                 return GestureDetector(
@@ -87,7 +84,6 @@ class TradeDetailsPage extends BasePage {
                     child: StandartListRow(
                       title: '${item.title}',
                       value: '${item.value}',
-                      isDrawTop: isDrawTop,
                       isDrawBottom: isDrawBottom,
                     ));
               });
diff --git a/lib/src/screens/transaction_details/transaction_details_page.dart b/lib/src/screens/transaction_details/transaction_details_page.dart
index 4351089ed..bed01d5ee 100644
--- a/lib/src/screens/transaction_details/transaction_details_page.dart
+++ b/lib/src/screens/transaction_details/transaction_details_page.dart
@@ -69,22 +69,19 @@ class TransactionDetailsPage extends BasePage {
   @override
   Widget body(BuildContext context) {
     return Container(
-      padding: EdgeInsets.only(top: 20, bottom: 20),
       child: ListView.separated(
           separatorBuilder: (context, index) => Container(
                 height: 1,
                 padding: EdgeInsets.only(left: 24),
-                color: Theme.of(context).accentTextTheme.title.backgroundColor,
+                color: Theme.of(context).backgroundColor,
                 child: Container(
                   height: 1,
-                  color: Theme.of(context).dividerColor,
+                  color: Theme.of(context).primaryTextTheme.title.backgroundColor,
                 ),
               ),
           itemCount: _items.length,
           itemBuilder: (context, index) {
             final item = _items[index];
-
-            final isDrawTop = index == 0 ? true : false;
             final isDrawBottom = index == _items.length - 1 ? true : false;
 
             return GestureDetector(
@@ -102,7 +99,6 @@ class TransactionDetailsPage extends BasePage {
               child: StandartListRow(
                   title: '${item.title}:',
                   value: item.value,
-                  isDrawTop: isDrawTop,
                   isDrawBottom: isDrawBottom),
             );
           }),
diff --git a/lib/src/widgets/base_text_form_field.dart b/lib/src/widgets/base_text_form_field.dart
index b3931a92d..21ae78cc5 100644
--- a/lib/src/widgets/base_text_form_field.dart
+++ b/lib/src/widgets/base_text_form_field.dart
@@ -64,21 +64,20 @@ class BaseTextFormField extends StatelessWidget {
           suffixIcon: suffixIcon,
           hintStyle: placeholderTextStyle ??
               TextStyle(
-                  color: hintColor ??
-                      Theme.of(context).primaryTextTheme.caption.color,
+                  color: hintColor ?? Theme.of(context).hintColor,
                   fontSize: 16),
           hintText: hintText,
           focusedBorder: UnderlineInputBorder(
               borderSide: BorderSide(
-                  color: borderColor ?? Theme.of(context).dividerColor,
+                  color: borderColor ?? Theme.of(context).primaryTextTheme.title.backgroundColor,
                   width: 1.0)),
           disabledBorder: UnderlineInputBorder(
               borderSide: BorderSide(
-                  color: borderColor ?? Theme.of(context).dividerColor,
+                  color: borderColor ?? Theme.of(context).primaryTextTheme.title.backgroundColor,
                   width: 1.0)),
           enabledBorder: UnderlineInputBorder(
               borderSide: BorderSide(
-                  color: borderColor ?? Theme.of(context).dividerColor,
+                  color: borderColor ?? Theme.of(context).primaryTextTheme.title.backgroundColor,
                   width: 1.0))),
       validator: validator,
     );
diff --git a/lib/src/widgets/cake_scrollbar.dart b/lib/src/widgets/cake_scrollbar.dart
index 6258e5f0b..90b571c9e 100644
--- a/lib/src/widgets/cake_scrollbar.dart
+++ b/lib/src/widgets/cake_scrollbar.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 
 class CakeScrollbar extends StatelessWidget {
   CakeScrollbar({
@@ -20,7 +19,7 @@ class CakeScrollbar extends StatelessWidget {
           height: backgroundHeight,
           width: 6,
           decoration: BoxDecoration(
-            color: PaletteDark.violetBlue,
+            color: Theme.of(context).textTheme.body1.decorationColor,
             borderRadius: BorderRadius.all(Radius.circular(3))
           ),
           child: Stack(
@@ -32,7 +31,7 @@ class CakeScrollbar extends StatelessWidget {
                   height: thumbHeight,
                   width: 6.0,
                   decoration: BoxDecoration(
-                    color: PaletteDark.wildBlueGrey,
+                    color: Theme.of(context).textTheme.body1.color,
                     borderRadius: BorderRadius.all(Radius.circular(3))
                   ),
                 ),
diff --git a/lib/src/widgets/primary_button.dart b/lib/src/widgets/primary_button.dart
index a5f2e8315..929bcd895 100644
--- a/lib/src/widgets/primary_button.dart
+++ b/lib/src/widgets/primary_button.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 
 class PrimaryButton extends StatelessWidget {
   const PrimaryButton(
@@ -38,7 +37,7 @@ class PrimaryButton extends StatelessWidget {
                   fontSize: 15.0,
                   fontWeight: FontWeight.w600,
                   color: isDisabled
-                      ? Colors.grey.withOpacity(0.5)
+                      ? textColor.withOpacity(0.5)
                       : textColor)),
         ));
   }
@@ -78,7 +77,7 @@ class LoadingPrimaryButton extends StatelessWidget {
                   fontSize: 15.0,
                   fontWeight: FontWeight.w600,
                   color: isDisabled
-                      ? Colors.grey.withOpacity(0.5)
+                      ? textColor.withOpacity(0.5)
                       : textColor
               )),
         ));
diff --git a/lib/src/widgets/standart_list_row.dart b/lib/src/widgets/standart_list_row.dart
index ca6797911..d573e6e5f 100644
--- a/lib/src/widgets/standart_list_row.dart
+++ b/lib/src/widgets/standart_list_row.dart
@@ -4,28 +4,19 @@ class StandartListRow extends StatelessWidget {
   StandartListRow(
       {this.title,
       this.value,
-      this.isDrawTop = false,
       this.isDrawBottom = false});
 
   final String title;
   final String value;
-  final bool isDrawTop;
   final bool isDrawBottom;
 
   @override
   Widget build(BuildContext context) {
     return Column(
       children: <Widget>[
-        isDrawTop
-            ? Container(
-                width: double.infinity,
-                height: 1,
-                color: Theme.of(context).dividerColor,
-              )
-            : Offstage(),
         Container(
           width: double.infinity,
-          color: Theme.of(context).accentTextTheme.title.backgroundColor,
+          color: Theme.of(context).backgroundColor,
           child: Padding(
             padding:
                 const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
@@ -35,9 +26,9 @@ class StandartListRow extends StatelessWidget {
                   Text(title,
                       style: TextStyle(
                           fontSize: 14,
-                          fontWeight: FontWeight.w600,
+                          fontWeight: FontWeight.w500,
                           color:
-                              Theme.of(context).primaryTextTheme.caption.color),
+                              Theme.of(context).primaryTextTheme.overline.color),
                       textAlign: TextAlign.left),
                   Padding(
                     padding: const EdgeInsets.only(top: 12),
@@ -54,12 +45,16 @@ class StandartListRow extends StatelessWidget {
           ),
         ),
         isDrawBottom
-            ? Container(
-                width: double.infinity,
-                height: 1,
-                color: Theme.of(context).dividerColor,
-              )
-            : Offstage(),
+        ? Container(
+          height: 1,
+          padding: EdgeInsets.only(left: 24),
+          color: Theme.of(context).backgroundColor,
+          child: Container(
+            height: 1,
+            color: Theme.of(context).primaryTextTheme.title.backgroundColor,
+          ),
+        )
+        : Offstage(),
       ],
     );
   }
diff --git a/lib/themes.dart b/lib/themes.dart
index a0b3d19c7..f3d25b4f1 100644
--- a/lib/themes.dart
+++ b/lib/themes.dart
@@ -7,47 +7,113 @@ class Themes {
     fontFamily: 'Poppins',
     brightness: Brightness.light,
     backgroundColor: Colors.white,
+    accentColor: Palette.blueCraiola, // first gradient color
+    scaffoldBackgroundColor: Palette.pinkFlamingo, // second gradient color
+    primaryColor: Palette.redHat, // third gradient color
+    buttonColor: Colors.white.withOpacity(0.2), // action buttons on dashboard page
+    indicatorColor: Colors.white.withOpacity(0.5), // page indicator
+    hoverColor: Colors.white, // amount hint text (receive page)
+    dividerColor: Palette.paleBlue,
+    hintColor: Palette.gray,
+    textTheme: TextTheme(
+      title: TextStyle(
+        color: Colors.white, // sync_indicator text
+        backgroundColor: Colors.white.withOpacity(0.2), // synced sync_indicator
+        decorationColor: Colors.white.withOpacity(0.15), // not synced sync_indicator
+      ),
+      caption: TextStyle(
+        color: Palette.shineOrange, // not synced light
+        decorationColor: Colors.white, // filter icon
+      ),
+      overline: TextStyle(
+        color: Colors.white.withOpacity(0.2), // filter button
+        backgroundColor: Colors.white.withOpacity(0.5), // date section row
+        decorationColor: Colors.white.withOpacity(0.2) // icons (transaction and trade rows)
+      ),
+      subhead: TextStyle(
+        color: Colors.white.withOpacity(0.2), // address button border
+        decorationColor: Colors.white.withOpacity(0.4), // copy button (qr widget)
+      ),
+      headline: TextStyle(
+        color: Colors.white, // qr code
+        decorationColor: Colors.white.withOpacity(0.5), // bottom border of amount (receive page)
+      ),
+      display1: TextStyle(
+        color: PaletteDark.lightBlueGrey, // icons color (receive page)
+        decorationColor: Palette.lavender, // icons background (receive page)
+      ),
+      display2: TextStyle(
+        color: Palette.darkBlueCraiola, // text color of tiles (receive page)
+        decorationColor: Colors.white // background of tiles (receive page)
+      ),
+      display3: TextStyle(
+        color: Colors.white, // text color of current tile (receive page),
+        decorationColor: Palette.blueCraiola // background of current tile (receive page)
+      ),
+      display4: TextStyle(
+        color: Palette.violetBlue, // text color of tiles (account list)
+        decorationColor: Colors.white // background of tiles (account list)
+      ),
+      subtitle: TextStyle(
+        color: Colors.white, // text color of current tile (account list)
+        decorationColor: Palette.blueCraiola // background of current tile (account list)
+      ),
+      body1: TextStyle(
+        color: Palette.moderatePurpleBlue, // scrollbar thumb
+        decorationColor: Palette.periwinkleCraiola // scrollbar background
+      ),
+      body2: TextStyle(
+        color: Palette.moderateLavender, // menu header
+        decorationColor: Colors.white, // menu background
+      )
+    ),
+    primaryTextTheme: TextTheme(
+      title: TextStyle(
+        color: Palette.darkBlueCraiola, // title color
+        backgroundColor: Palette.wildPeriwinkle // textfield underline
+      ),
+      caption: TextStyle(
+        color: PaletteDark.pigeonBlue, // secondary text
+        decorationColor: Palette.wildLavender // menu divider
+      ),
+      overline: TextStyle(
+        color: Palette.darkGray, // transaction/trade details titles
+        decorationColor: Colors.white.withOpacity(0.5), // placeholder
+      ),
+
+
+
+
+      subhead: TextStyle(
+          color: Colors.white.withOpacity(0.5) // send, exchange, buy buttons on dashboard page
+      ),
+      headline: TextStyle(
+          color: Palette.lightBlueGrey // historyPanelText
+      ),
+      display1: TextStyle(
+          color: Colors.white // menuList
+      ),
+      display2: TextStyle(
+          color: Palette.lavender // menuHeader
+      ),
+      display3: TextStyle(
+          color: Palette.lavender // historyPanelButton
+      ),
+      display4: TextStyle(
+          color: Palette.oceanBlue // QR code
+      ),
+    ),
+
+
+
     focusColor: Colors.white, // wallet card border
-    hintColor: Colors.white, // menu
-    scaffoldBackgroundColor: Palette.blueAlice, // gradient background start
-    primaryColor: Palette.lightBlue, // gradient background end
+
     cardColor: Palette.blueAlice,
     cardTheme: CardTheme(
       color: Colors.white, // synced card start
     ),
-    hoverColor: Colors.white, // synced card end
-    primaryTextTheme: TextTheme(
-      title: TextStyle(
-        color: Palette.oceanBlue, // primary text
-        backgroundColor: Colors.white // selectButton text
-      ),
-      caption: TextStyle(
-        color: Palette.lightBlueGrey, // secondary text
-      ),
-      overline: TextStyle(
-        color: Palette.lavender // address field in the wallet card
-      ),
-      subhead: TextStyle(
-        color: Colors.white.withOpacity(0.5) // send, exchange, buy buttons on dashboard page
-      ),
-      headline: TextStyle(
-        color: Palette.lightBlueGrey // historyPanelText
-      ),
-      display1: TextStyle(
-        color: Colors.white // menuList
-      ),
-      display2: TextStyle(
-        color: Palette.lavender // menuHeader
-      ),
-      display3: TextStyle(
-        color: Palette.lavender // historyPanelButton
-      ),
-      display4: TextStyle(
-        color: Palette.oceanBlue // QR code
-      ),
-//      headline1: TextStyle(color: Palette.nightBlue)
-    ),
-    dividerColor: Palette.eee,
+
+
     accentTextTheme: TextTheme(
       title: TextStyle(
         color: Palette.darkLavender, // top panel
@@ -75,48 +141,113 @@ class Themes {
   static final ThemeData darkTheme = ThemeData(
     fontFamily: 'Poppins',
     brightness: Brightness.dark,
-    backgroundColor: PaletteDark.darkNightBlue,
+    backgroundColor: PaletteDark.backgroundColor,
+    accentColor: PaletteDark.backgroundColor, // first gradient color
+    scaffoldBackgroundColor: PaletteDark.backgroundColor, // second gradient color
+    primaryColor: PaletteDark.backgroundColor, // third gradient color
+    buttonColor: PaletteDark.nightBlue, // action buttons on dashboard page
+    indicatorColor: PaletteDark.cyanBlue, // page indicator
+    hoverColor: PaletteDark.cyanBlue, // amount hint text (receive page)
+    dividerColor: PaletteDark.dividerColor,
+    hintColor: PaletteDark.pigeonBlue, // menu
+    textTheme: TextTheme(
+      title: TextStyle(
+        color: PaletteDark.wildBlue, // sync_indicator text
+        backgroundColor: PaletteDark.lightNightBlue, // synced sync_indicator
+        decorationColor: PaletteDark.oceanBlue // not synced sync_indicator
+      ),
+      caption: TextStyle(
+        color: PaletteDark.orangeYellow, // not synced light
+        decorationColor: PaletteDark.wildBlue, // filter icon
+      ),
+      overline: TextStyle(
+        color: PaletteDark.oceanBlue, // filter button
+        backgroundColor: PaletteDark.darkCyanBlue, // date section row
+        decorationColor: PaletteDark.wildNightBlue // icons (transaction and trade rows)
+      ),
+      subhead: TextStyle(
+        color: PaletteDark.nightBlue, // address button border
+        decorationColor: PaletteDark.lightBlueGrey, // copy button (qr widget)
+      ),
+      headline: TextStyle(
+        color: PaletteDark.lightBlueGrey, // qr code
+        decorationColor: PaletteDark.darkGrey, // bottom border of amount (receive page)
+      ),
+      display1: TextStyle(
+        color: Colors.white, // icons color (receive page)
+        decorationColor: PaletteDark.distantNightBlue, // icons background (receive page)
+      ),
+      display2: TextStyle(
+        color: Colors.white, // text color of tiles (receive page)
+        decorationColor: PaletteDark.nightBlue // background of tiles (receive page)
+      ),
+      display3: TextStyle(
+        color: Colors.blue, // text color of current tile (receive page)
+        decorationColor: PaletteDark.lightOceanBlue // background of current tile (receive page)
+      ),
+      display4: TextStyle(
+        color: Colors.white, // text color of tiles (account list)
+        decorationColor: PaletteDark.darkOceanBlue // background of tiles (account list)
+      ),
+      subtitle: TextStyle(
+        color: Palette.blueCraiola, // text color of current tile (account list)
+        decorationColor: PaletteDark.darkNightBlue // background of current tile (account list)
+      ),
+      body1: TextStyle(
+        color: PaletteDark.wildBlueGrey, // scrollbar thumb
+        decorationColor: PaletteDark.violetBlue // scrollbar background
+      ),
+      body2: TextStyle(
+        color: PaletteDark.deepPurpleBlue, // menu header
+        decorationColor: PaletteDark.deepPurpleBlue, // menu background
+      )
+    ),
+    primaryTextTheme: TextTheme(
+      title: TextStyle(
+        color: Colors.white, // title color
+        backgroundColor: PaletteDark.darkOceanBlue // textfield underline
+      ),
+      caption: TextStyle(
+        color: PaletteDark.darkCyanBlue, // secondary text
+        decorationColor: PaletteDark.darkOceanBlue // menu divider
+      ),
+      overline: TextStyle(
+        color: PaletteDark.lightBlueGrey, // transaction/trade details titles
+        decorationColor: Colors.grey, // placeholder
+      ),
+
+
+
+      subhead: TextStyle(
+          color: PaletteDark.lightDistantBlue // send, exchange, buy buttons on dashboard page
+      ),
+      headline: TextStyle(
+          color: PaletteDark.pigeonBlue // historyPanelText
+      ),
+      display1: TextStyle(
+          color: PaletteDark.lightNightBlue // menuList
+      ),
+      display2: TextStyle(
+          color: PaletteDark.headerNightBlue // menuHeader
+      ),
+      display3: TextStyle(
+          color: PaletteDark.moderateNightBlue // historyPanelButton
+      ),
+      display4: TextStyle(
+          color: PaletteDark.gray // QR code
+      ),
+    ),
+
+
+
     focusColor: PaletteDark.lightDistantBlue, // wallet card border
-    hintColor: PaletteDark.gray, // menu
-    scaffoldBackgroundColor: PaletteDark.distantBlue, // gradient background start
-    primaryColor: PaletteDark.distantBlue, // gradient background end
     cardColor: PaletteDark.darkNightBlue,
     cardTheme: CardTheme(
       color: PaletteDark.moderateBlue, // synced card start
     ),
-    hoverColor: PaletteDark.nightBlue, // synced card end
-    primaryTextTheme: TextTheme(
-      title: TextStyle(
-        color: Colors.white,
-        backgroundColor: PaletteDark.moderatePurpleBlue // selectButton text
-      ),
-      caption: TextStyle(
-        color: PaletteDark.gray,
-      ),
-      overline: TextStyle(
-        color: PaletteDark.lightDistantBlue // address field in the wallet card
-      ),
-      subhead: TextStyle(
-        color: PaletteDark.lightDistantBlue // send, exchange, buy buttons on dashboard page
-      ),
-      headline: TextStyle(
-        color: PaletteDark.pigeonBlue // historyPanelText
-      ),
-      display1: TextStyle(
-        color: PaletteDark.lightNightBlue // menuList
-      ),
-      display2: TextStyle(
-        color: PaletteDark.headerNightBlue // menuHeader
-      ),
-      display3: TextStyle(
-        color: PaletteDark.moderateNightBlue // historyPanelButton
-      ),
-      display4: TextStyle(
-        color: PaletteDark.gray // QR code
-      ),
-//        headline5: TextStyle(color: PaletteDark.gray)
-    ),
-    dividerColor: PaletteDark.distantBlue,
+
+
+
     accentTextTheme: TextTheme(
       title: TextStyle(
         color: PaletteDark.moderateBlue, // top panel

From 731f12cd63b62f5f52a07dbb675b4c1facaf0f0c Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Thu, 20 Aug 2020 20:43:54 +0300
Subject: [PATCH 08/15] CAKE-27 | applied light theme to send and send template
 pages; made status bar is transparent; reworked menu widget and base send
 widget; applied switch between light and dark themes

---
 lib/di.dart                                   |   7 +
 lib/main.dart                                 |  22 +-
 lib/palette.dart                              |   1 +
 .../dashboard/widgets/menu_widget.dart        | 163 ++--
 lib/src/screens/send/send_page.dart           |  25 +-
 lib/src/screens/send/send_template_page.dart  |  26 +-
 .../send/widgets/base_send_widget.dart        | 705 +++++++++---------
 lib/src/widgets/address_text_field.dart       |  16 +-
 lib/src/widgets/template_tile.dart            |   5 +-
 lib/src/widgets/top_panel.dart                |  14 +-
 lib/store/theme_changer_store.dart            |  13 +
 lib/themes.dart                               |  51 +-
 .../settings/settings_view_model.dart         |   7 +-
 13 files changed, 583 insertions(+), 472 deletions(-)
 create mode 100644 lib/store/theme_changer_store.dart

diff --git a/lib/di.dart b/lib/di.dart
index dabb7c4e4..1d903d7f7 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -27,7 +27,9 @@ import 'package:cake_wallet/src/screens/receive/receive_page.dart';
 import 'package:cake_wallet/src/screens/send/send_page.dart';
 import 'package:cake_wallet/src/screens/subaddress/address_edit_or_create_page.dart';
 import 'package:cake_wallet/src/screens/wallet_list/wallet_list_page.dart';
+import 'package:cake_wallet/store/theme_changer_store.dart';
 import 'package:cake_wallet/store/wallet_list_store.dart';
+import 'package:cake_wallet/theme_changer.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/node_list_view_model.dart';
@@ -318,3 +320,8 @@ Future setup(
   getIt.registerFactory(() =>
       ExchangeTemplatePage(getIt.get<ExchangeViewModel>()));
 }
+
+void setupThemeChangerStore(ThemeChanger themeChanger) {
+  getIt.registerSingleton<ThemeChangerStore>(
+      ThemeChangerStore(themeChanger: themeChanger));
+}
diff --git a/lib/main.dart b/lib/main.dart
index 912099978..a6de6e231 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/reactions/bootstrap.dart';
+import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet_service.dart';
@@ -52,6 +53,8 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/domain/common/language.dart';
 import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart';
 
+bool isThemeChangerRegistered = false;
+
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
@@ -197,7 +200,8 @@ class CakeWalletApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final settingsStore = Provider.of<SettingsStore>(context);
+    //final settingsStore = Provider.of<SettingsStore>(context);
+    final settingsStore = getIt.get<AppStore>().settingsStore;
 
     return ChangeNotifierProvider<ThemeChanger>(
         create: (_) => ThemeChanger(
@@ -228,12 +232,20 @@ class MaterialAppWithTheme extends StatelessWidget {
     final transactionDescriptions =
         Provider.of<Box<TransactionDescription>>(context);
 
-    final statusBarColor =
-        settingsStore.isDarkTheme ? Colors.black : Colors.white;
+    if (!isThemeChangerRegistered) {
+      setupThemeChangerStore(theme);
+      isThemeChangerRegistered = true;
+    }
+
+    /*final statusBarColor =
+        settingsStore.isDarkTheme ? Colors.black : Colors.white;*/
+    final _settingsStore = getIt.get<AppStore>().settingsStore;
+
+    final statusBarColor = Colors.transparent;
     final statusBarBrightness =
-        settingsStore.isDarkTheme ? Brightness.light : Brightness.dark;
+        _settingsStore.isDarkTheme ? Brightness.light : Brightness.dark;
     final statusBarIconBrightness =
-        settingsStore.isDarkTheme ? Brightness.light : Brightness.dark;
+        _settingsStore.isDarkTheme ? Brightness.light : Brightness.dark;
 
     SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
         statusBarColor: statusBarColor,
diff --git a/lib/palette.dart b/lib/palette.dart
index 0eebf247f..13790ee14 100644
--- a/lib/palette.dart
+++ b/lib/palette.dart
@@ -29,6 +29,7 @@ class Palette {
   static const Color gray = Color.fromRGBO(112, 147, 186, 1.0);
   static const Color wildPeriwinkle = Color.fromRGBO(219, 227, 243, 1.0);
   static const Color darkGray = Color.fromRGBO(122, 147, 186, 1.0);
+  static const Color shadowWhite = Color.fromRGBO(242, 245, 255, 1.0);
 
   // FIXME: Rename.
   static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart
index 834026779..ed32d755d 100644
--- a/lib/src/screens/dashboard/widgets/menu_widget.dart
+++ b/lib/src/screens/dashboard/widgets/menu_widget.dart
@@ -3,6 +3,7 @@ import 'package:cake_wallet/palette.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/domain/common/wallet_type.dart';
 import 'package:cake_wallet/src/screens/dashboard/wallet_menu.dart';
+import 'package:flutter/rendering.dart';
 
 class MenuWidget extends StatefulWidget {
   MenuWidget({this.type, this.name, this.subname});
@@ -23,7 +24,6 @@ class MenuWidgetState extends State<MenuWidget> {
   double menuWidth;
   double screenWidth;
   double screenHeight;
-  double opacity;
 
   double headerHeight;
   double tileHeight;
@@ -35,11 +35,10 @@ class MenuWidgetState extends State<MenuWidget> {
     menuWidth = 0;
     screenWidth = 0;
     screenHeight = 0;
-    opacity = 0;
 
     headerHeight = 125;
     tileHeight = 75;
-    fromTopEdge = 50;
+    fromTopEdge = 30;
     fromBottomEdge = 21;
 
     super.initState();
@@ -52,7 +51,6 @@ class MenuWidgetState extends State<MenuWidget> {
 
     setState(() {
       menuWidth = screenWidth;
-      opacity = 1;
 
       if (screenHeight > largeScreen) {
         final scale = screenHeight / largeScreen;
@@ -69,41 +67,43 @@ class MenuWidgetState extends State<MenuWidget> {
     final walletMenu = WalletMenu(context);
     final itemCount = walletMenu.items.length;
 
-    return SafeArea(
-      child: Row(
-        mainAxisSize: MainAxisSize.max,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: <Widget>[
-          Padding(
+    return Row(
+      mainAxisSize: MainAxisSize.max,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: <Widget>[
+        Padding(
             padding: EdgeInsets.only(left: 24),
             child: Container(
               height: 60,
               width: 4,
               decoration: BoxDecoration(
-                borderRadius: BorderRadius.all(Radius.circular(2)),
-                color: PaletteDark.gray),
+                  borderRadius: BorderRadius.all(Radius.circular(2)),
+                  color: PaletteDark.gray),
             )),
-          SizedBox(width: 12),
-          Expanded(
-              child: ClipRRect(
-                borderRadius: BorderRadius.only(
+        SizedBox(width: 12),
+        Expanded(
+            child: ClipRRect(
+              borderRadius: BorderRadius.only(
                   topLeft: Radius.circular(24),
                   bottomLeft: Radius.circular(24)),
-                child: Container(
-                  width: menuWidth,
-                  height: double.infinity,
-                  color: Theme.of(context).textTheme.body2.decorationColor,
-                  child: SingleChildScrollView(
-                    child: Column(
-                      children: <Widget>[
-                        Container(
+              child: Container(
+                width: menuWidth,
+                height: double.infinity,
+                color: Theme.of(context).textTheme.body2.color,
+                alignment: Alignment.topCenter,
+                child: ListView.separated(
+                    itemBuilder: (_, index) {
+
+                      if (index == 0) {
+                        return Container(
                           height: headerHeight,
                           color: Theme.of(context).textTheme.body2.color,
                           padding: EdgeInsets.only(
                               left: 24,
                               top: fromTopEdge,
                               right: 24,
-                              bottom: fromBottomEdge),
+                              bottom: fromBottomEdge
+                          ),
                           child: Row(
                             mainAxisAlignment: MainAxisAlignment.start,
                             children: <Widget>[
@@ -141,70 +141,63 @@ class MenuWidgetState extends State<MenuWidget> {
                                   ))
                             ],
                           ),
-                        ),
-                        Container(
-                          height: 1,
-                          color: Theme.of(context).primaryTextTheme.caption.decorationColor,
-                        ),
-                        ListView.separated(
-                            shrinkWrap: true,
-                            physics: NeverScrollableScrollPhysics(),
-                            itemBuilder: (_, index) {
+                        );
+                      }
 
-                              final item = walletMenu.items[index];
-                              final image = walletMenu.images[index] ?? Offstage();
-                              final isLastTile = index == itemCount - 1;
+                      index--;
 
-                              return GestureDetector(
-                                onTap: () {
-                                  Navigator.of(context).pop();
-                                  walletMenu.action(index);
-                                },
-                                child: Container(
-                                  height: isLastTile
-                                          ? headerHeight
-                                          : tileHeight,
-                                  padding: isLastTile
-                                           ? EdgeInsets.only(
-                                               left: 24,
-                                               right: 24,
-                                               top: fromBottomEdge,
-                                               bottom: fromTopEdge)
-                                           : EdgeInsets.only(left: 24, right: 24),
-                                  alignment: isLastTile ? Alignment.topLeft : null,
-                                  child: Row(
-                                    mainAxisAlignment: MainAxisAlignment.start,
-                                    crossAxisAlignment: CrossAxisAlignment.center,
-                                    children: <Widget>[
-                                      image,
-                                      SizedBox(width: 16),
-                                      Expanded(
-                                          child: Text(
-                                            item,
-                                            style: TextStyle(
-                                                color: Theme.of(context).textTheme
-                                                    .display2.color,
-                                                fontSize: 16,
-                                                fontWeight: FontWeight.bold),
-                                          ))
-                                    ],
-                                  ),
-                                )
-                              );
-                            },
-                            separatorBuilder: (_, index) => Container(
-                              height: 1,
-                              color: Theme.of(context).primaryTextTheme.caption.decorationColor,
+                      final item = walletMenu.items[index];
+                      final image = walletMenu.images[index] ?? Offstage();
+                      final isLastTile = index == itemCount - 1;
+
+                      return GestureDetector(
+                          onTap: () {
+                            Navigator.of(context).pop();
+                            walletMenu.action(index);
+                          },
+                          child: Container(
+                            color: Theme.of(context).textTheme.body2.decorationColor,
+                            height: isLastTile
+                                ? headerHeight
+                                : tileHeight,
+                            padding: isLastTile
+                                ? EdgeInsets.only(
+                              left: 24,
+                              right: 24,
+                              top: fromBottomEdge,
+                              //bottom: fromTopEdge
+                            )
+                                : EdgeInsets.only(left: 24, right: 24),
+                            alignment: isLastTile ? Alignment.topLeft : null,
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.start,
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: <Widget>[
+                                image,
+                                SizedBox(width: 16),
+                                Expanded(
+                                    child: Text(
+                                      item,
+                                      style: TextStyle(
+                                          color: Theme.of(context).textTheme
+                                              .display2.color,
+                                          fontSize: 16,
+                                          fontWeight: FontWeight.bold),
+                                    ))
+                              ],
                             ),
-                            itemCount: itemCount)
-                      ],
+                          )
+                      );
+                    },
+                    separatorBuilder: (_, index) => Container(
+                      height: 1,
+                      color: Theme.of(context).primaryTextTheme.caption.decorationColor,
                     ),
-                  ),
-                ),
-              )
-          )
-        ],
-      )
+                    itemCount: itemCount + 1),
+              ),
+            )
+        )
+      ],
     );
   }
 
diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart
index 7902370b0..3f973f4db 100644
--- a/lib/src/screens/send/send_page.dart
+++ b/lib/src/screens/send/send_page.dart
@@ -1,7 +1,6 @@
 import 'package:cake_wallet/view_model/send_view_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/send/widgets/base_send_widget.dart';
 
@@ -14,15 +13,33 @@ class SendPage extends BasePage {
   String get title => sendViewModel.pageTitle;
 
   @override
-  Color get backgroundLightColor => PaletteDark.nightBlue;
+  Color get titleColor => Colors.white;
 
   @override
-  Color get backgroundDarkColor => PaletteDark.nightBlue;
+  Color get backgroundLightColor => Colors.transparent;
+
+  @override
+  Color get backgroundDarkColor => Colors.transparent;
 
   @override
   bool get resizeToAvoidBottomPadding => false;
 
   @override
   Widget body(BuildContext context) =>
-      BaseSendWidget(sendViewModel: sendViewModel);
+      BaseSendWidget(
+        sendViewModel: sendViewModel,
+        leading: leading(context),
+        middle: middle(context),
+      );
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      resizeToAvoidBottomPadding: resizeToAvoidBottomPadding,
+      body: Container(
+        color: Theme.of(context).backgroundColor,
+        child: body(context)
+      )
+    );
+  }
 }
diff --git a/lib/src/screens/send/send_template_page.dart b/lib/src/screens/send/send_template_page.dart
index 19f9f8ca8..1f49a3f9a 100644
--- a/lib/src/screens/send/send_template_page.dart
+++ b/lib/src/screens/send/send_template_page.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/view_model/send_view_model.dart';
@@ -15,15 +14,34 @@ class SendTemplatePage extends BasePage {
   String get title => S.current.exchange_new_template;
 
   @override
-  Color get backgroundLightColor => PaletteDark.nightBlue;
+  Color get titleColor => Colors.white;
 
   @override
-  Color get backgroundDarkColor => PaletteDark.nightBlue;
+  Color get backgroundLightColor => Colors.transparent;
+
+  @override
+  Color get backgroundDarkColor => Colors.transparent;
 
   @override
   bool get resizeToAvoidBottomPadding => false;
 
   @override
   Widget body(BuildContext context) =>
-      BaseSendWidget(sendViewModel: sendViewModel, isTemplate: true);
+      BaseSendWidget(
+        sendViewModel: sendViewModel,
+        leading: leading(context),
+        middle: middle(context),
+        isTemplate: true
+      );
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      resizeToAvoidBottomPadding: resizeToAvoidBottomPadding,
+      body: Container(
+        color: Theme.of(context).backgroundColor,
+        child: body(context)
+      )
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/src/screens/send/widgets/base_send_widget.dart b/lib/src/screens/send/widgets/base_send_widget.dart
index 1bc5a5359..4e8552e5f 100644
--- a/lib/src/screens/send/widgets/base_send_widget.dart
+++ b/lib/src/screens/send/widgets/base_send_widget.dart
@@ -22,11 +22,15 @@ import 'package:cake_wallet/routes.dart';
 class BaseSendWidget extends StatelessWidget {
   BaseSendWidget({
     @required this.sendViewModel,
+    @required this.leading,
+    @required this.middle,
     this.isTemplate = false
   });
 
   final SendViewModel sendViewModel;
   final bool isTemplate;
+  final Widget leading;
+  final Widget middle;
 
   final _addressController = TextEditingController();
   final _cryptoAmountController = TextEditingController();
@@ -42,371 +46,386 @@ class BaseSendWidget extends StatelessWidget {
 
     _setEffects(context);
 
-    return Container(
-      color: PaletteDark.backgroundColor,
-      child: ScrollableWithBottomSection(
-        contentPadding: EdgeInsets.only(bottom: 24),
-        content: Column(
-          children: <Widget>[
-            TopPanel(
-              color: PaletteDark.nightBlue,
-              edgeInsets: EdgeInsets.fromLTRB(24, 24, 24, 32),
-              widget: Form(
-                key: _formKey,
-                child: Column(children: <Widget>[
-                  isTemplate
-                  ? BaseTextFormField(
-                    controller: _nameController,
-                    hintText: S.of(context).send_name,
-                    borderColor: PaletteDark.lightVioletBlue,
-                    textStyle: TextStyle(
-                        fontSize: 14,
-                        fontWeight: FontWeight.w500,
-                        color: Colors.white
-                    ),
-                    placeholderTextStyle: TextStyle(
-                        color: PaletteDark.darkCyanBlue,
-                        fontWeight: FontWeight.w500,
-                        fontSize: 14),
-                    validator: sendViewModel.templateValidator,
-                  )
-                  : Offstage(),
-                  Padding(
-                    padding: EdgeInsets.only(top: isTemplate ? 20 : 0),
-                    child: AddressTextField(
-                      controller: _addressController,
-                      placeholder: S.of(context).send_address(
-                          sendViewModel.cryptoCurrencyTitle),
-                      focusNode: _focusNode,
-                      onURIScanned: (uri) {
-                        var address = '';
-                        var amount = '';
-
-                        if (uri != null) {
-                          address = uri.path;
-                          amount = uri.queryParameters['tx_amount'];
-                        } else {
-                          address = uri.toString();
-                        }
-
-                        _addressController.text = address;
-                        _cryptoAmountController.text = amount;
-                      },
-                      options: [
-                        AddressTextFieldOption.paste,
-                        AddressTextFieldOption.qrCode,
-                        AddressTextFieldOption.addressBook
-                      ],
-                      buttonColor: PaletteDark.buttonNightBlue,
-                      borderColor: PaletteDark.lightVioletBlue,
-                      textStyle: TextStyle(
-                          fontSize: 14,
-                          fontWeight: FontWeight.w500,
-                          color: Colors.white
-                      ),
-                      hintStyle: TextStyle(
-                          fontSize: 14,
-                          fontWeight: FontWeight.w500,
-                          color: PaletteDark.darkCyanBlue
-                      ),
-                      validator: sendViewModel.addressValidator,
-                    ),
-                  ),
-                  Observer(
-                      builder: (_) {
-                        return Padding(
-                            padding: const EdgeInsets.only(top: 20),
-                            child: BaseTextFormField(
-                                controller: _cryptoAmountController,
-                                keyboardType: TextInputType.numberWithOptions(
-                                    signed: false, decimal: true),
-                                inputFormatters: [
-                                  BlacklistingTextInputFormatter(
-                                      RegExp('[\\-|\\ |\\,]'))
-                                ],
-                                prefixIcon: Padding(
-                                  padding: EdgeInsets.only(top: 9),
-                                  child: Text(sendViewModel.currency.title + ':',
-                                      style: TextStyle(
-                                        fontSize: 16,
-                                        fontWeight: FontWeight.w600,
-                                        color: Colors.white,
-                                      )),
-                                ),
-                                suffixIcon: isTemplate
-                                ? Offstage()
-                                : Padding(
-                                  padding: EdgeInsets.only(bottom: 2),
-                                  child: Row(
-                                    mainAxisSize: MainAxisSize.min,
-                                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                    children: <Widget>[
-                                      Container(
-                                        width: MediaQuery.of(context).size.width/2,
-                                        alignment: Alignment.centerLeft,
-                                        child: Text(
-                                            ' / ' + sendViewModel.balance,
-                                            maxLines: 1,
-                                            overflow: TextOverflow.ellipsis,
-                                            style: TextStyle(
-                                                fontSize: 14,
-                                                color: PaletteDark.darkCyanBlue
-                                            )
-                                        ),
-                                      ),
-                                      Container(
-                                        height: 34,
-                                        width: 34,
-                                        margin: EdgeInsets.only(left: 12, bottom: 8),
-                                        decoration: BoxDecoration(
-                                            color: PaletteDark.buttonNightBlue,
-                                            borderRadius: BorderRadius.all(Radius.circular(6))
-                                        ),
-                                        child: InkWell(
-                                          onTap: () => sendViewModel.setSendAll(),
-                                          child: Center(
-                                            child: Text(S.of(context).all,
-                                                textAlign: TextAlign.center,
-                                                style: TextStyle(
-                                                    fontSize: 12,
-                                                    fontWeight: FontWeight.bold,
-                                                    color: PaletteDark.lightBlueGrey
-                                                )
-                                            ),
-                                          ),
-                                        ),
-                                      )
-                                    ],
-                                  ),
-                                ),
-                                hintText: '0.0000',
-                                borderColor: PaletteDark.lightVioletBlue,
-                                textStyle: TextStyle(
-                                    fontSize: 14,
-                                    fontWeight: FontWeight.w500,
-                                    color: Colors.white
-                                ),
-                                placeholderTextStyle: TextStyle(
-                                    color: PaletteDark.darkCyanBlue,
-                                    fontWeight: FontWeight.w500,
-                                    fontSize: 14),
-                                validator: sendViewModel.amountValidator
-                            )
-                        );
-                      }
-                  ),
-                  Padding(
-                      padding: const EdgeInsets.only(top: 20),
-                      child: BaseTextFormField(
-                        controller: _fiatAmountController,
-                        keyboardType: TextInputType.numberWithOptions(
-                            signed: false, decimal: true),
-                        inputFormatters: [
-                          BlacklistingTextInputFormatter(
-                              RegExp('[\\-|\\ |\\,]'))
-                        ],
-                        prefixIcon: Padding(
-                          padding: EdgeInsets.only(top: 9),
-                          child: Text(
-                              sendViewModel.fiat.title + ':',
-                              style: TextStyle(
-                                fontSize: 16,
-                                fontWeight: FontWeight.w600,
-                                color: Colors.white,
-                              )),
-                        ),
-                        hintText: '0.00',
-                        borderColor: PaletteDark.lightVioletBlue,
+    return ScrollableWithBottomSection(
+      contentPadding: EdgeInsets.only(bottom: 24),
+      content: Column(
+        children: <Widget>[
+          TopPanel(
+            edgeInsets: EdgeInsets.all(0),
+            gradient: LinearGradient(colors: [
+              Theme.of(context).primaryTextTheme.subhead.color,
+              Theme.of(context).primaryTextTheme.subhead.decorationColor,
+            ],
+            begin: Alignment.topLeft,
+            end: Alignment.bottomRight),
+            widget: Form(
+              key: _formKey,
+              child: Column(children: <Widget>[
+                CupertinoNavigationBar(
+                  leading: leading,
+                  middle: middle,
+                  backgroundColor: Colors.transparent,
+                  border: null,
+                ),
+                Padding(
+                  padding: EdgeInsets.fromLTRB(24, 24, 24, 32),
+                  child: Column(
+                    children: <Widget>[
+                      isTemplate
+                      ? BaseTextFormField(
+                        controller: _nameController,
+                        hintText: S.of(context).send_name,
+                        borderColor: Theme.of(context).primaryTextTheme.headline.color,
                         textStyle: TextStyle(
                             fontSize: 14,
                             fontWeight: FontWeight.w500,
                             color: Colors.white
                         ),
                         placeholderTextStyle: TextStyle(
-                            color: PaletteDark.darkCyanBlue,
+                            color: Theme.of(context).primaryTextTheme.headline.decorationColor,
                             fontWeight: FontWeight.w500,
                             fontSize: 14),
+                        validator: sendViewModel.templateValidator,
                       )
-                  ),
-                  isTemplate
-                  ? Offstage()
-                  : Padding(
-                    padding: const EdgeInsets.only(top: 24),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: <Widget>[
-                        Text(S.of(context).send_estimated_fee,
-                            style: TextStyle(
-                              fontSize: 12,
+                      : Offstage(),
+                      Padding(
+                        padding: EdgeInsets.only(top: isTemplate ? 20 : 0),
+                        child: AddressTextField(
+                          controller: _addressController,
+                          placeholder: S.of(context).send_address(
+                              sendViewModel.cryptoCurrencyTitle),
+                          focusNode: _focusNode,
+                          onURIScanned: (uri) {
+                            var address = '';
+                            var amount = '';
+
+                            if (uri != null) {
+                              address = uri.path;
+                              amount = uri.queryParameters['tx_amount'];
+                            } else {
+                              address = uri.toString();
+                            }
+
+                            _addressController.text = address;
+                            _cryptoAmountController.text = amount;
+                          },
+                          options: [
+                            AddressTextFieldOption.paste,
+                            AddressTextFieldOption.qrCode,
+                            AddressTextFieldOption.addressBook
+                          ],
+                          buttonColor: Theme.of(context).primaryTextTheme.display1.color,
+                          borderColor: Theme.of(context).primaryTextTheme.headline.color,
+                          textStyle: TextStyle(
+                              fontSize: 14,
                               fontWeight: FontWeight.w500,
-                              color: Colors.white,
-                            )),
-                        Text(
-                            sendViewModel.estimatedFee.toString() + ' '
-                                + sendViewModel.currency.title,
-                            style: TextStyle(
-                              fontSize: 12,
-                              fontWeight: FontWeight.w600,
-                              color: Colors.white,
-                            ))
-                      ],
-                    ),
-                  )
-                ]),
-              ),
+                              color: Colors.white
+                          ),
+                          hintStyle: TextStyle(
+                              fontSize: 14,
+                              fontWeight: FontWeight.w500,
+                              color: Theme.of(context).primaryTextTheme.headline.decorationColor
+                          ),
+                          validator: sendViewModel.addressValidator,
+                        ),
+                      ),
+                      Observer(
+                          builder: (_) {
+                            return Padding(
+                                padding: const EdgeInsets.only(top: 20),
+                                child: BaseTextFormField(
+                                    controller: _cryptoAmountController,
+                                    keyboardType: TextInputType.numberWithOptions(
+                                        signed: false, decimal: true),
+                                    inputFormatters: [
+                                      BlacklistingTextInputFormatter(
+                                          RegExp('[\\-|\\ |\\,]'))
+                                    ],
+                                    prefixIcon: Padding(
+                                      padding: EdgeInsets.only(top: 9),
+                                      child: Text(sendViewModel.currency.title + ':',
+                                          style: TextStyle(
+                                            fontSize: 16,
+                                            fontWeight: FontWeight.w600,
+                                            color: Colors.white,
+                                          )),
+                                    ),
+                                    suffixIcon: isTemplate
+                                    ? Offstage()
+                                    : Padding(
+                                      padding: EdgeInsets.only(bottom: 2),
+                                      child: Row(
+                                        mainAxisSize: MainAxisSize.min,
+                                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                        children: <Widget>[
+                                          Container(
+                                            width: MediaQuery.of(context).size.width/2,
+                                            alignment: Alignment.centerLeft,
+                                            child: Text(
+                                                ' / ' + sendViewModel.balance,
+                                                maxLines: 1,
+                                                overflow: TextOverflow.ellipsis,
+                                                style: TextStyle(
+                                                    fontSize: 14,
+                                                    color: Theme.of(context).primaryTextTheme.headline.decorationColor
+                                                )
+                                            ),
+                                          ),
+                                          Container(
+                                            height: 34,
+                                            width: 34,
+                                            margin: EdgeInsets.only(left: 12, bottom: 8),
+                                            decoration: BoxDecoration(
+                                                color: Theme.of(context).primaryTextTheme.display1.color,
+                                                borderRadius: BorderRadius.all(Radius.circular(6))
+                                            ),
+                                            child: InkWell(
+                                              onTap: () => sendViewModel.setSendAll(),
+                                              child: Center(
+                                                child: Text(S.of(context).all,
+                                                    textAlign: TextAlign.center,
+                                                    style: TextStyle(
+                                                        fontSize: 12,
+                                                        fontWeight: FontWeight.bold,
+                                                        color: Theme.of(context).primaryTextTheme.display1.decorationColor
+                                                    )
+                                                ),
+                                              ),
+                                            ),
+                                          )
+                                        ],
+                                      ),
+                                    ),
+                                    hintText: '0.0000',
+                                    borderColor: Theme.of(context).primaryTextTheme.headline.color,
+                                    textStyle: TextStyle(
+                                        fontSize: 14,
+                                        fontWeight: FontWeight.w500,
+                                        color: Colors.white
+                                    ),
+                                    placeholderTextStyle: TextStyle(
+                                        color: Theme.of(context).primaryTextTheme.headline.decorationColor,
+                                        fontWeight: FontWeight.w500,
+                                        fontSize: 14),
+                                    validator: sendViewModel.amountValidator
+                                )
+                            );
+                          }
+                      ),
+                      Padding(
+                          padding: const EdgeInsets.only(top: 20),
+                          child: BaseTextFormField(
+                            controller: _fiatAmountController,
+                            keyboardType: TextInputType.numberWithOptions(
+                                signed: false, decimal: true),
+                            inputFormatters: [
+                              BlacklistingTextInputFormatter(
+                                  RegExp('[\\-|\\ |\\,]'))
+                            ],
+                            prefixIcon: Padding(
+                              padding: EdgeInsets.only(top: 9),
+                              child: Text(
+                                  sendViewModel.fiat.title + ':',
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.w600,
+                                    color: Colors.white,
+                                  )),
+                            ),
+                            hintText: '0.00',
+                            borderColor: Theme.of(context).primaryTextTheme.headline.color,
+                            textStyle: TextStyle(
+                                fontSize: 14,
+                                fontWeight: FontWeight.w500,
+                                color: Colors.white
+                            ),
+                            placeholderTextStyle: TextStyle(
+                                color: Theme.of(context).primaryTextTheme.headline.decorationColor,
+                                fontWeight: FontWeight.w500,
+                                fontSize: 14),
+                          )
+                      ),
+                      isTemplate
+                      ? Offstage()
+                      : Padding(
+                        padding: const EdgeInsets.only(top: 24),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: <Widget>[
+                            Text(S.of(context).send_estimated_fee,
+                                style: TextStyle(
+                                  fontSize: 12,
+                                  fontWeight: FontWeight.w500,
+                                  color: Theme.of(context).primaryTextTheme.display2.color,
+                                )),
+                            Text(
+                                sendViewModel.estimatedFee.toString() + ' '
+                                    + sendViewModel.currency.title,
+                                style: TextStyle(
+                                  fontSize: 12,
+                                  fontWeight: FontWeight.w600,
+                                  color: Theme.of(context).primaryTextTheme.display2.color,
+                                ))
+                          ],
+                        ),
+                      )
+                    ],
+                  ),
+                )
+              ]),
             ),
-            isTemplate
-            ? Offstage()
-            : Padding(
-              padding: EdgeInsets.only(
-                  top: 30,
-                  left: 24,
-                  bottom: 24
-              ),
+          ),
+          isTemplate
+          ? Offstage()
+          : Padding(
+            padding: EdgeInsets.only(
+              top: 30,
+              left: 24,
+              bottom: 24
+            ),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.start,
+              children: <Widget>[
+                Text(
+                  S.of(context).send_templates,
+                  style: TextStyle(
+                      fontSize: 18,
+                      fontWeight: FontWeight.w600,
+                      color: Theme.of(context).primaryTextTheme.title.color
+                  ),
+                )
+              ],
+            ),
+          ),
+          isTemplate
+          ? Offstage()
+          : Container(
+            height: 40,
+            width: double.infinity,
+            padding: EdgeInsets.only(left: 24),
+            child: SingleChildScrollView(
+              scrollDirection: Axis.horizontal,
               child: Row(
-                mainAxisAlignment: MainAxisAlignment.start,
                 children: <Widget>[
-                  Text(
-                    S.of(context).send_templates,
-                    style: TextStyle(
-                        fontSize: 18,
-                        fontWeight: FontWeight.w600,
-                        color: PaletteDark.darkCyanBlue
+                  GestureDetector(
+                    onTap: () => Navigator.of(context)
+                        .pushNamed(Routes.sendTemplate),
+                    child: Container(
+                      padding: EdgeInsets.only(left: 1, right: 10),
+                      child: DottedBorder(
+                          borderType: BorderType.RRect,
+                          dashPattern: [6, 4],
+                          color: Theme.of(context).primaryTextTheme.display2.decorationColor,
+                          strokeWidth: 2,
+                          radius: Radius.circular(20),
+                          child: Container(
+                            height: 34,
+                            width: 75,
+                            padding: EdgeInsets.only(left: 10, right: 10),
+                            alignment: Alignment.center,
+                            decoration: BoxDecoration(
+                              borderRadius: BorderRadius.all(Radius.circular(20)),
+                              color: Colors.transparent,
+                            ),
+                            child: Text(
+                              S.of(context).send_new,
+                              style: TextStyle(
+                                  fontSize: 14,
+                                  fontWeight: FontWeight.w600,
+                                  color: Theme.of(context).primaryTextTheme.display3.color
+                              ),
+                            ),
+                          )
+                      ),
                     ),
+                  ),
+                  Observer(
+                      builder: (_) {
+                        final templates = sendViewModel.templates;
+                        final itemCount = templates.length;
+
+                        return ListView.builder(
+                            scrollDirection: Axis.horizontal,
+                            shrinkWrap: true,
+                            physics: NeverScrollableScrollPhysics(),
+                            itemCount: itemCount,
+                            itemBuilder: (context, index) {
+                              final template = templates[index];
+
+                              return TemplateTile(
+                                key: UniqueKey(),
+                                to: template.name,
+                                amount: template.amount,
+                                from: template.cryptoCurrency,
+                                onTap: () {
+                                  _addressController.text = template.address;
+                                  _cryptoAmountController.text = template.amount;
+                                  getOpenaliasRecord(context);
+                                },
+                                onRemove: () {
+                                  showDialog<void>(
+                                      context: context,
+                                      builder: (dialogContext) {
+                                        return AlertWithTwoActions(
+                                            alertTitle: S.of(context).template,
+                                            alertContent: S.of(context).confirm_delete_template,
+                                            leftButtonText: S.of(context).delete,
+                                            rightButtonText: S.of(context).cancel,
+                                            actionLeftButton: () {
+                                              Navigator.of(dialogContext).pop();
+                                              sendViewModel.sendTemplateStore.remove(template: template);
+                                              sendViewModel.sendTemplateStore.update();
+                                            },
+                                            actionRightButton: () => Navigator.of(dialogContext).pop()
+                                        );
+                                      }
+                                  );
+                                },
+                              );
+                            }
+                        );
+                      }
                   )
                 ],
               ),
             ),
-            isTemplate
-            ? Offstage()
-            : Container(
-              height: 40,
-              width: double.infinity,
-              padding: EdgeInsets.only(left: 24),
-              child: SingleChildScrollView(
-                scrollDirection: Axis.horizontal,
-                child: Row(
-                  children: <Widget>[
-                    GestureDetector(
-                      onTap: () => Navigator.of(context)
-                          .pushNamed(Routes.sendTemplate),
-                      child: Container(
-                        padding: EdgeInsets.only(left: 1, right: 10),
-                        child: DottedBorder(
-                            borderType: BorderType.RRect,
-                            dashPattern: [6, 4],
-                            color: PaletteDark.darkCyanBlue,
-                            strokeWidth: 2,
-                            radius: Radius.circular(20),
-                            child: Container(
-                              height: 34,
-                              width: 75,
-                              padding: EdgeInsets.only(left: 10, right: 10),
-                              alignment: Alignment.center,
-                              decoration: BoxDecoration(
-                                borderRadius: BorderRadius.all(Radius.circular(20)),
-                                color: Colors.transparent,
-                              ),
-                              child: Text(
-                                S.of(context).send_new,
-                                style: TextStyle(
-                                    fontSize: 14,
-                                    fontWeight: FontWeight.w600,
-                                    color: PaletteDark.darkCyanBlue
-                                ),
-                              ),
-                            )
-                        ),
-                      ),
-                    ),
-                    Observer(
-                        builder: (_) {
-                          final templates = sendViewModel.templates;
-                          final itemCount = templates.length;
-
-                          return ListView.builder(
-                              scrollDirection: Axis.horizontal,
-                              shrinkWrap: true,
-                              physics: NeverScrollableScrollPhysics(),
-                              itemCount: itemCount,
-                              itemBuilder: (context, index) {
-                                final template = templates[index];
-
-                                return TemplateTile(
-                                  key: UniqueKey(),
-                                  to: template.name,
-                                  amount: template.amount,
-                                  from: template.cryptoCurrency,
-                                  onTap: () {
-                                    _addressController.text = template.address;
-                                    _cryptoAmountController.text = template.amount;
-                                    getOpenaliasRecord(context);
-                                  },
-                                  onRemove: () {
-                                    showDialog<void>(
-                                      context: context,
-                                      builder: (dialogContext) {
-                                        return AlertWithTwoActions(
-                                          alertTitle: S.of(context).template,
-                                          alertContent: S.of(context).confirm_delete_template,
-                                          leftButtonText: S.of(context).delete,
-                                          rightButtonText: S.of(context).cancel,
-                                          actionLeftButton: () {
-                                            Navigator.of(dialogContext).pop();
-                                            sendViewModel.sendTemplateStore.remove(template: template);
-                                            sendViewModel.sendTemplateStore.update();
-                                          },
-                                          actionRightButton: () => Navigator.of(dialogContext).pop()
-                                        );
-                                      }
-                                    );
-                                  },
-                                );
-                              }
-                          );
-                      }
-                    )
-                  ],
-                ),
-              ),
-            )
-          ],
-        ),
-        bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-        bottomSection: isTemplate
-        ? PrimaryButton(
+          )
+        ],
+      ),
+      bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+      bottomSection: isTemplate
+          ? PrimaryButton(
+          onPressed: () {
+            if (_formKey.currentState.validate()) {
+              sendViewModel.sendTemplateStore.addTemplate(
+                  name: _nameController.text,
+                  address: _addressController.text,
+                  cryptoCurrency: sendViewModel.currency.title,
+                  amount: _cryptoAmountController.text
+              );
+              sendViewModel.sendTemplateStore.update();
+              Navigator.of(context).pop();
+            }
+          },
+          text: S.of(context).save,
+          color: Colors.green,
+          textColor: Colors.white)
+          : Observer(builder: (_) {
+        return LoadingPrimaryButton(
             onPressed: () {
               if (_formKey.currentState.validate()) {
-                sendViewModel.sendTemplateStore.addTemplate(
-                    name: _nameController.text,
-                    address: _addressController.text,
-                    cryptoCurrency: sendViewModel.currency.title,
-                    amount: _cryptoAmountController.text
-                );
-                sendViewModel.sendTemplateStore.update();
-                Navigator.of(context).pop();
+                print('SENT!!!');
               }
             },
-            text: S.of(context).save,
-            color: Colors.green,
-            textColor: Colors.white)
-        : Observer(builder: (_) {
-          return LoadingPrimaryButton(
-              onPressed: () {
-                if (_formKey.currentState.validate()) {
-                  print('SENT!!!');
-                }
-              },
-              text: S.of(context).send,
-              color: Colors.blue,
-              textColor: Colors.white,
-              isLoading: sendViewModel.state is TransactionIsCreating ||
-                  sendViewModel.state is TransactionCommitting,
-              isDisabled:
-              false // FIXME !(syncStore.status is SyncedSyncStatus),
-          );
-        }),
-      ),
+            text: S.of(context).send,
+            color: Palette.blueCraiola,
+            textColor: Colors.white,
+            isLoading: sendViewModel.state is TransactionIsCreating ||
+                sendViewModel.state is TransactionCommitting,
+            isDisabled:
+            false // FIXME !(syncStore.status is SyncedSyncStatus),
+        );
+      }),
     );
   }
 
diff --git a/lib/src/widgets/address_text_field.dart b/lib/src/widgets/address_text_field.dart
index 3e96a9e76..16ec36c62 100644
--- a/lib/src/widgets/address_text_field.dart
+++ b/lib/src/widgets/address_text_field.dart
@@ -112,7 +112,9 @@ class AddressTextField extends StatelessWidget {
                                   borderRadius:
                                   BorderRadius.all(Radius.circular(6))),
                               child: Image.asset(
-                                  'assets/images/duplicate.png')),
+                                  'assets/images/duplicate.png',
+                                  color: Theme.of(context).primaryTextTheme.display1.decorationColor,
+                              )),
                         )),
                   ],
                   if (this.options.contains(AddressTextFieldOption.qrCode)) ...[
@@ -128,7 +130,9 @@ class AddressTextField extends StatelessWidget {
                                   color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
                                   borderRadius:
                                   BorderRadius.all(Radius.circular(6))),
-                              child: Image.asset('assets/images/qr_code_icon.png')),
+                              child: Image.asset('assets/images/qr_code_icon.png',
+                                color: Theme.of(context).primaryTextTheme.display1.decorationColor,
+                              )),
                         ))
                   ],
                   if (this
@@ -147,7 +151,9 @@ class AddressTextField extends StatelessWidget {
                                   borderRadius:
                                   BorderRadius.all(Radius.circular(6))),
                               child: Image.asset(
-                                  'assets/images/open_book.png')),
+                                  'assets/images/open_book.png',
+                                  color: Theme.of(context).primaryTextTheme.display1.decorationColor,
+                              )),
                         ))
                   ],
                   if (this
@@ -166,7 +172,9 @@ class AddressTextField extends StatelessWidget {
                                   borderRadius:
                                   BorderRadius.all(Radius.circular(6))),
                               child: Image.asset(
-                                  'assets/images/receive_icon_raw.png')),
+                                  'assets/images/receive_icon_raw.png',
+                                  color: Theme.of(context).primaryTextTheme.display1.decorationColor,
+                              )),
                         )),
                   ],
                 ],
diff --git a/lib/src/widgets/template_tile.dart b/lib/src/widgets/template_tile.dart
index ab6724ece..fbff8b6c1 100644
--- a/lib/src/widgets/template_tile.dart
+++ b/lib/src/widgets/template_tile.dart
@@ -47,8 +47,7 @@ class TemplateTileState extends State<TemplateTile> {
 
   @override
   Widget build(BuildContext context) {
-    //final color = isRemovable ? Colors.white : Theme.of(context).primaryTextTheme.title.color;
-    final color = Colors.white;
+    final color = isRemovable ? Colors.white : Theme.of(context).primaryTextTheme.title.color;
     final toIcon = Image.asset('assets/images/to_icon.png', color: color);
 
     final content = Row(
@@ -106,7 +105,7 @@ class TemplateTileState extends State<TemplateTile> {
             child: Container(
               height: 40,
               padding: EdgeInsets.only(left: 24, right: 24),
-              color: PaletteDark.darkVioletBlue,
+              color: Theme.of(context).primaryTextTheme.display3.decorationColor,
               child: content,
             ),
           ),
diff --git a/lib/src/widgets/top_panel.dart b/lib/src/widgets/top_panel.dart
index 5e2cc2c91..d456d1a39 100644
--- a/lib/src/widgets/top_panel.dart
+++ b/lib/src/widgets/top_panel.dart
@@ -2,25 +2,28 @@ import 'package:flutter/material.dart';
 
 class TopPanel extends StatefulWidget {
   TopPanel({
-    @required this.color,
     @required this.widget,
-    this.edgeInsets = const EdgeInsets.all(24)
+    this.edgeInsets = const EdgeInsets.all(24),
+    this.color,
+    this.gradient
   });
 
   final Color color;
   final Widget widget;
   final EdgeInsets edgeInsets;
+  final Gradient gradient;
 
   @override
-  TopPanelState createState() => TopPanelState(color, widget, edgeInsets);
+  TopPanelState createState() => TopPanelState(widget, edgeInsets, color, gradient);
 }
 
 class TopPanelState extends State<TopPanel> {
-  TopPanelState(this._color, this._widget, this._edgeInsets);
+  TopPanelState(this._widget, this._edgeInsets, this._color, this._gradient);
 
   final Color _color;
   final Widget _widget;
   final EdgeInsets _edgeInsets;
+  final Gradient _gradient;
 
   @override
   Widget build(BuildContext context) {
@@ -32,7 +35,8 @@ class TopPanelState extends State<TopPanel> {
           bottomLeft: Radius.circular(24),
           bottomRight: Radius.circular(24)
         ),
-        color: _color
+        color: _color,
+        gradient: _gradient
       ),
       child: _widget,
     );
diff --git a/lib/store/theme_changer_store.dart b/lib/store/theme_changer_store.dart
new file mode 100644
index 000000000..8c2e366ca
--- /dev/null
+++ b/lib/store/theme_changer_store.dart
@@ -0,0 +1,13 @@
+import 'package:cake_wallet/theme_changer.dart';
+import 'package:mobx/mobx.dart';
+
+part 'theme_changer_store.g.dart';
+
+class ThemeChangerStore = ThemeChangerStoreBase with _$ThemeChangerStore;
+
+abstract class ThemeChangerStoreBase with Store {
+  ThemeChangerStoreBase({this.themeChanger});
+
+  @observable
+  ThemeChanger themeChanger;
+}
\ No newline at end of file
diff --git a/lib/themes.dart b/lib/themes.dart
index f3d25b4f1..887ac072e 100644
--- a/lib/themes.dart
+++ b/lib/themes.dart
@@ -80,25 +80,35 @@ class Themes {
         color: Palette.darkGray, // transaction/trade details titles
         decorationColor: Colors.white.withOpacity(0.5), // placeholder
       ),
-
-
-
-
       subhead: TextStyle(
-          color: Colors.white.withOpacity(0.5) // send, exchange, buy buttons on dashboard page
+        color: Palette.blueCraiola, // first gradient color (send page)
+        decorationColor: Palette.pinkFlamingo // second gradient color (send page)
       ),
       headline: TextStyle(
-          color: Palette.lightBlueGrey // historyPanelText
+        color: Colors.white.withOpacity(0.5), // text field border color (send page)
+        decorationColor: Colors.white.withOpacity(0.5), // text field hint color (send page)
       ),
       display1: TextStyle(
-          color: Colors.white // menuList
+        color: Colors.white.withOpacity(0.2), // text field button color (send page)
+        decorationColor: Colors.white // text field button icon color (send page)
       ),
       display2: TextStyle(
-          color: Palette.lavender // menuHeader
+        color: Colors.white.withOpacity(0.5), // estimated fee (send page)
+        decorationColor: Palette.shadowWhite // template dotted border (send page)
       ),
       display3: TextStyle(
-          color: Palette.lavender // historyPanelButton
+        color: Palette.darkBlueCraiola, // template new text (send page)
+        decorationColor: Palette.shadowWhite // template background color (send page)
       ),
+
+
+
+
+
+
+
+
+
       display4: TextStyle(
           color: Palette.oceanBlue // QR code
       ),
@@ -182,7 +192,7 @@ class Themes {
         decorationColor: PaletteDark.nightBlue // background of tiles (receive page)
       ),
       display3: TextStyle(
-        color: Colors.blue, // text color of current tile (receive page)
+        color: Palette.blueCraiola, // text color of current tile (receive page)
         decorationColor: PaletteDark.lightOceanBlue // background of current tile (receive page)
       ),
       display4: TextStyle(
@@ -215,24 +225,29 @@ class Themes {
         color: PaletteDark.lightBlueGrey, // transaction/trade details titles
         decorationColor: Colors.grey, // placeholder
       ),
-
-
-
       subhead: TextStyle(
-          color: PaletteDark.lightDistantBlue // send, exchange, buy buttons on dashboard page
+        color: PaletteDark.darkNightBlue, // first gradient color (send page)
+        decorationColor: PaletteDark.darkNightBlue // second gradient color (send page)
       ),
       headline: TextStyle(
-          color: PaletteDark.pigeonBlue // historyPanelText
+        color: PaletteDark.lightVioletBlue, // text field border color (send page)
+        decorationColor: PaletteDark.darkCyanBlue, // text field hint color (send page)
       ),
       display1: TextStyle(
-          color: PaletteDark.lightNightBlue // menuList
+        color: PaletteDark.buttonNightBlue, // text field button color (send page)
+        decorationColor: PaletteDark.gray // text field button icon color (send page)
       ),
       display2: TextStyle(
-          color: PaletteDark.headerNightBlue // menuHeader
+        color: Colors.white, // estimated fee (send page)
+        decorationColor: PaletteDark.darkCyanBlue // template dotted border (send page)
       ),
       display3: TextStyle(
-          color: PaletteDark.moderateNightBlue // historyPanelButton
+        color: PaletteDark.darkCyanBlue, // template new text (send page)
+        decorationColor: PaletteDark.darkVioletBlue // template background color (send page)
       ),
+
+
+
       display4: TextStyle(
           color: PaletteDark.gray // QR code
       ),
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
index 892b8493e..0986a8310 100644
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@@ -1,3 +1,6 @@
+import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/store/theme_changer_store.dart';
+import 'package:cake_wallet/themes.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/routes.dart';
@@ -69,7 +72,9 @@ abstract class SettingsViewModelBase with Store {
             title: S.current.settings_dark_mode,
             value: () => _settingsStore.isDarkTheme,
             onValueChange: (bool value) {
-              // FIXME: Implement me
+              _settingsStore.isDarkTheme = value;
+              getIt.get<ThemeChangerStore>().themeChanger.setTheme(
+                  value ? Themes.darkTheme : Themes.lightTheme);
             })
       ],
       [

From 1cd5af2471e80b60bdf09222d9c37cd26d09b41c Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Fri, 21 Aug 2020 17:38:01 +0300
Subject: [PATCH 09/15] CAKE-27 | fixed template title color (send page)

---
 .../screens/send/widgets/base_send_widget.dart   |  2 +-
 lib/themes.dart                                  | 16 ++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/lib/src/screens/send/widgets/base_send_widget.dart b/lib/src/screens/send/widgets/base_send_widget.dart
index 4e8552e5f..0ce6e55ac 100644
--- a/lib/src/screens/send/widgets/base_send_widget.dart
+++ b/lib/src/screens/send/widgets/base_send_widget.dart
@@ -291,7 +291,7 @@ class BaseSendWidget extends StatelessWidget {
                   style: TextStyle(
                       fontSize: 18,
                       fontWeight: FontWeight.w600,
-                      color: Theme.of(context).primaryTextTheme.title.color
+                      color: Theme.of(context).primaryTextTheme.display4.color
                   ),
                 )
               ],
diff --git a/lib/themes.dart b/lib/themes.dart
index 887ac072e..7a9c37690 100644
--- a/lib/themes.dart
+++ b/lib/themes.dart
@@ -100,17 +100,8 @@ class Themes {
         color: Palette.darkBlueCraiola, // template new text (send page)
         decorationColor: Palette.shadowWhite // template background color (send page)
       ),
-
-
-
-
-
-
-
-
-
       display4: TextStyle(
-          color: Palette.oceanBlue // QR code
+        color: Palette.darkBlueCraiola // template title (send page)
       ),
     ),
 
@@ -245,11 +236,8 @@ class Themes {
         color: PaletteDark.darkCyanBlue, // template new text (send page)
         decorationColor: PaletteDark.darkVioletBlue // template background color (send page)
       ),
-
-
-
       display4: TextStyle(
-          color: PaletteDark.gray // QR code
+        color: PaletteDark.cyanBlue // QR code
       ),
     ),
 

From 40aeacfb4b2497304ab7533b24d6d6e4ce10588b Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Fri, 21 Aug 2020 23:26:23 +0300
Subject: [PATCH 10/15] CAKE-28 | applied light theme to exchange and exchange
 template pages; changed base exchange widget, exchange card, present provider
 picker and trail button

---
 lib/palette.dart                              |   2 +
 lib/src/screens/exchange/exchange_page.dart   |  25 +-
 .../exchange/exchange_template_page.dart      |  27 +-
 .../widgets/base_exchange_widget.dart         | 488 ++++++++++--------
 .../exchange/widgets/exchange_card.dart       |  41 +-
 .../widgets/present_provider_picker.dart      |   3 +-
 lib/src/widgets/trail_button.dart             |   3 +-
 lib/themes.dart                               |  35 +-
 8 files changed, 367 insertions(+), 257 deletions(-)

diff --git a/lib/palette.dart b/lib/palette.dart
index 13790ee14..aa962f1da 100644
--- a/lib/palette.dart
+++ b/lib/palette.dart
@@ -30,6 +30,7 @@ class Palette {
   static const Color wildPeriwinkle = Color.fromRGBO(219, 227, 243, 1.0);
   static const Color darkGray = Color.fromRGBO(122, 147, 186, 1.0);
   static const Color shadowWhite = Color.fromRGBO(242, 245, 255, 1.0);
+  static const Color niagara = Color.fromRGBO(152, 172, 201, 1.0);
 
   // FIXME: Rename.
   static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
@@ -77,6 +78,7 @@ class PaletteDark {
   static const Color dividerColor = Color.fromRGBO(48, 59, 95, 1.0);
   static const Color violetBlue = Color.fromRGBO(59, 72, 119, 1.0);
   static const Color distantBlue = Color.fromRGBO(72, 85, 131, 1.0);
+  static const Color moderateVioletBlue = Color.fromRGBO(62, 73, 113, 1.0);
 
   // FIXME: Rename.
   static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart
index cc47033b4..51765380e 100644
--- a/lib/src/screens/exchange/exchange_page.dart
+++ b/lib/src/screens/exchange/exchange_page.dart
@@ -18,10 +18,13 @@ class ExchangePage extends BasePage {
   String get title => S.current.exchange;
 
   @override
-  Color get backgroundLightColor => PaletteDark.wildVioletBlue;
+  Color get titleColor => Colors.white;
 
   @override
-  Color get backgroundDarkColor => PaletteDark.wildVioletBlue;
+  Color get backgroundLightColor => Colors.transparent;
+
+  @override
+  Color get backgroundDarkColor => Colors.transparent;
 
   @override
   Widget middle(BuildContext context) =>
@@ -36,5 +39,21 @@ class ExchangePage extends BasePage {
 
   @override
   Widget body(BuildContext context) =>
-      BaseExchangeWidget(exchangeViewModel: exchangeViewModel);
+      BaseExchangeWidget(
+        exchangeViewModel: exchangeViewModel,
+        leading: leading(context),
+        middle: middle(context),
+        trailing: trailing(context),
+      );
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        resizeToAvoidBottomPadding: resizeToAvoidBottomPadding,
+        body: Container(
+            color: Theme.of(context).backgroundColor,
+            child: body(context)
+        )
+    );
+  }
 }
diff --git a/lib/src/screens/exchange/exchange_template_page.dart b/lib/src/screens/exchange/exchange_template_page.dart
index 139a1e4cd..81bb54d1c 100644
--- a/lib/src/screens/exchange/exchange_template_page.dart
+++ b/lib/src/screens/exchange/exchange_template_page.dart
@@ -1,7 +1,6 @@
 import 'dart:ui';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/base_exchange_widget.dart';
@@ -17,10 +16,13 @@ class ExchangeTemplatePage extends BasePage {
   String get title => S.current.exchange_new_template;
 
   @override
-  Color get backgroundLightColor => PaletteDark.wildVioletBlue;
+  Color get titleColor => Colors.white;
 
   @override
-  Color get backgroundDarkColor => PaletteDark.wildVioletBlue;
+  Color get backgroundLightColor => Colors.transparent;
+
+  @override
+  Color get backgroundDarkColor => Colors.transparent;
 
   @override
   Widget trailing(BuildContext context) =>
@@ -28,5 +30,22 @@ class ExchangeTemplatePage extends BasePage {
 
   @override
   Widget body(BuildContext context) =>
-      BaseExchangeWidget(exchangeViewModel: exchangeViewModel, isTemplate: true);
+      BaseExchangeWidget(
+          exchangeViewModel: exchangeViewModel,
+          leading: leading(context),
+          middle: middle(context),
+          trailing: trailing(context),
+          isTemplate: true
+      );
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        resizeToAvoidBottomPadding: resizeToAvoidBottomPadding,
+        body: Container(
+            color: Theme.of(context).backgroundColor,
+            child: body(context)
+        )
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/src/screens/exchange/widgets/base_exchange_widget.dart b/lib/src/screens/exchange/widgets/base_exchange_widget.dart
index cde58e226..34a5ce94f 100644
--- a/lib/src/screens/exchange/widgets/base_exchange_widget.dart
+++ b/lib/src/screens/exchange/widgets/base_exchange_widget.dart
@@ -26,16 +26,25 @@ import 'package:cake_wallet/core/amount_validator.dart';
 class BaseExchangeWidget extends StatefulWidget {
   BaseExchangeWidget({
     @ required this.exchangeViewModel,
+    this.leading,
+    this.middle,
+    this.trailing,
     this.isTemplate = false,
   });
 
   final ExchangeViewModel exchangeViewModel;
+  final Widget leading;
+  final Widget middle;
+  final Widget trailing;
   final bool isTemplate;
 
   @override
   BaseExchangeWidgetState createState() =>
   BaseExchangeWidgetState(
     exchangeViewModel: exchangeViewModel,
+    leading: leading,
+    middle: middle,
+    trailing: trailing,
     isTemplate: isTemplate
   );
 }
@@ -43,11 +52,18 @@ class BaseExchangeWidget extends StatefulWidget {
 class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
   BaseExchangeWidgetState({
     @ required this.exchangeViewModel,
+    @ required this.leading,
+    @ required this.middle,
+    @ required this.trailing,
     @ required this.isTemplate,
   });
 
   final ExchangeViewModel exchangeViewModel;
+  final Widget leading;
+  final Widget middle;
+  final Widget trailing;
   final bool isTemplate;
+  final double topPanelHeight = 290;
 
   final depositKey = GlobalKey<ExchangeCardState>();
   final receiveKey = GlobalKey<ExchangeCardState>();
@@ -79,249 +95,273 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
     WidgetsBinding.instance.addPostFrameCallback(
             (_) => _setReactions(context, exchangeViewModel));
 
-    return Container(
-      color: PaletteDark.backgroundColor,
-      child: Form(
-          key: _formKey,
-          child: ScrollableWithBottomSection(
-            contentPadding: EdgeInsets.only(bottom: 24),
-            content: Column(
-              children: <Widget>[
-                TopPanel(
-                    color: PaletteDark.darkNightBlue,
-                    edgeInsets: EdgeInsets.only(bottom: 32),
-                    widget: Column(
-                      children: <Widget>[
-                        TopPanel(
-                            edgeInsets: EdgeInsets.fromLTRB(24, 29, 24, 32),
-                            color: PaletteDark.wildVioletBlue,
-                            widget: Observer(
-                              builder: (_) => ExchangeCard(
-                                key: depositKey,
-                                title: S.of(context).you_will_send,
-                                initialCurrency: exchangeViewModel.depositCurrency,
-                                initialWalletName: depositWalletName,
-                                initialAddress:
-                                exchangeViewModel.depositCurrency == exchangeViewModel.wallet.currency
-                                    ? exchangeViewModel.wallet.address
-                                    : exchangeViewModel.depositAddress,
-                                initialIsAmountEditable: true,
-                                initialIsAddressEditable: exchangeViewModel.isDepositAddressEnabled,
-                                isAmountEstimated: false,
-                                currencies: CryptoCurrency.all,
-                                onCurrencySelected: (currency) =>
-                                    exchangeViewModel.changeDepositCurrency(currency: currency),
-                                imageArrow: arrowBottomPurple,
-                                currencyButtonColor: PaletteDark.wildVioletBlue,
-                                addressButtonsColor: PaletteDark.moderateBlue,
-                                currencyValueValidator: AmountValidator(
-                                    type: exchangeViewModel.wallet.type),
-                                addressTextFieldValidator: AddressValidator(
-                                    type: exchangeViewModel.depositCurrency),
-                              ),
-                            )
-                        ),
-                        Padding(
-                          padding: EdgeInsets.only(top: 29, left: 24, right: 24),
-                          child: Observer(
-                              builder: (_) => ExchangeCard(
-                                key: receiveKey,
-                                title: S.of(context).you_will_get,
-                                initialCurrency: exchangeViewModel.receiveCurrency,
-                                initialWalletName: receiveWalletName,
-                                initialAddress:
-                                exchangeViewModel.receiveCurrency == exchangeViewModel.wallet.currency
-                                    ? exchangeViewModel.wallet.address
-                                    : exchangeViewModel.receiveAddress,
-                                initialIsAmountEditable: false,
-                                initialIsAddressEditable: exchangeViewModel.isReceiveAddressEnabled,
-                                isAmountEstimated: true,
-                                currencies: CryptoCurrency.all,
-                                onCurrencySelected: (currency) => exchangeViewModel
-                                    .changeReceiveCurrency(currency: currency),
-                                imageArrow: arrowBottomCakeGreen,
-                                currencyButtonColor: PaletteDark.darkNightBlue,
-                                addressButtonsColor: PaletteDark.moderateBlue,
-                                currencyValueValidator: AmountValidator(
-                                    type: exchangeViewModel.wallet.type),
-                                addressTextFieldValidator: AddressValidator(
-                                    type: exchangeViewModel.receiveCurrency),
-                              )),
-                        )
-                      ],
-                    )
-                ),
-                isTemplate
-                ? Offstage()
-                : Padding(
-                  padding: EdgeInsets.only(
-                      top: 30,
-                      left: 24,
-                      bottom: 24
-                  ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.start,
+    return Form(
+        key: _formKey,
+        child: ScrollableWithBottomSection(
+          contentPadding: EdgeInsets.only(bottom: 24),
+          content: Column(
+            children: <Widget>[
+              TopPanel(
+                  gradient: LinearGradient(colors: [
+                    Theme.of(context).primaryTextTheme.body1.color,
+                    Theme.of(context).primaryTextTheme.body1.decorationColor,
+                  ],
+                  stops: [0.35, 1.0],
+                  begin: Alignment.topLeft,
+                  end: Alignment.bottomRight),
+                  edgeInsets: EdgeInsets.only(bottom: 32),
+                  widget: Column(
                     children: <Widget>[
-                      Text(
-                        S.of(context).send_templates,
-                        style: TextStyle(
-                            fontSize: 18,
-                            fontWeight: FontWeight.w600,
-                            color: PaletteDark.darkCyanBlue
-                        ),
+                      TopPanel(
+                          edgeInsets: EdgeInsets.all(0),
+                          gradient: LinearGradient(colors: [
+                            Theme.of(context).primaryTextTheme.subtitle.color,
+                            Theme.of(context).primaryTextTheme.subtitle.decorationColor,
+                          ],
+                          begin: Alignment.topLeft,
+                          end: Alignment.bottomRight),
+                          widget: Column(
+                            children: <Widget>[
+                              CupertinoNavigationBar(
+                                leading: leading,
+                                middle: middle,
+                                trailing: trailing,
+                                backgroundColor: Colors.transparent,
+                                border: null,
+                              ),
+                              Padding(
+                                padding: EdgeInsets.fromLTRB(24, 29, 24, 32),
+                                child: Observer(
+                                  builder: (_) => ExchangeCard(
+                                    key: depositKey,
+                                    title: S.of(context).you_will_send,
+                                    initialCurrency: exchangeViewModel.depositCurrency,
+                                    initialWalletName: depositWalletName,
+                                    initialAddress:
+                                    exchangeViewModel.depositCurrency == exchangeViewModel.wallet.currency
+                                        ? exchangeViewModel.wallet.address
+                                        : exchangeViewModel.depositAddress,
+                                    initialIsAmountEditable: true,
+                                    initialIsAddressEditable: exchangeViewModel.isDepositAddressEnabled,
+                                    isAmountEstimated: false,
+                                    currencies: CryptoCurrency.all,
+                                    onCurrencySelected: (currency) =>
+                                        exchangeViewModel.changeDepositCurrency(currency: currency),
+                                    imageArrow: arrowBottomPurple,
+                                    currencyButtonColor: Colors.transparent,
+                                    addressButtonsColor: Theme.of(context).focusColor,
+                                    borderColor: Theme.of(context).primaryTextTheme.body2.color,
+                                    currencyValueValidator: AmountValidator(
+                                        type: exchangeViewModel.wallet.type),
+                                    addressTextFieldValidator: AddressValidator(
+                                        type: exchangeViewModel.depositCurrency),
+                                  ),
+                                ),
+                              )
+                            ],
+                          )
+                      ),
+                      Padding(
+                        padding: EdgeInsets.only(top: 29, left: 24, right: 24),
+                        child: Observer(
+                            builder: (_) => ExchangeCard(
+                              key: receiveKey,
+                              title: S.of(context).you_will_get,
+                              initialCurrency: exchangeViewModel.receiveCurrency,
+                              initialWalletName: receiveWalletName,
+                              initialAddress:
+                              exchangeViewModel.receiveCurrency == exchangeViewModel.wallet.currency
+                                  ? exchangeViewModel.wallet.address
+                                  : exchangeViewModel.receiveAddress,
+                              initialIsAmountEditable: false,
+                              initialIsAddressEditable: exchangeViewModel.isReceiveAddressEnabled,
+                              isAmountEstimated: true,
+                              currencies: CryptoCurrency.all,
+                              onCurrencySelected: (currency) => exchangeViewModel
+                                  .changeReceiveCurrency(currency: currency),
+                              imageArrow: arrowBottomCakeGreen,
+                              currencyButtonColor: Colors.transparent,
+                              addressButtonsColor: Theme.of(context).focusColor,
+                              borderColor: Theme.of(context).primaryTextTheme.body2.decorationColor,
+                              currencyValueValidator: AmountValidator(
+                                  type: exchangeViewModel.wallet.type),
+                              addressTextFieldValidator: AddressValidator(
+                                  type: exchangeViewModel.receiveCurrency),
+                            )),
                       )
                     ],
-                  ),
+                  )
+              ),
+              isTemplate
+                  ? Offstage()
+                  : Padding(
+                padding: EdgeInsets.only(
+                    top: 30,
+                    left: 24,
+                    bottom: 24
                 ),
-                isTemplate
-                ? Offstage()
-                : Container(
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  children: <Widget>[
+                    Text(
+                      S.of(context).send_templates,
+                      style: TextStyle(
+                          fontSize: 18,
+                          fontWeight: FontWeight.w600,
+                          color: Theme.of(context).primaryTextTheme.display4.color
+                      ),
+                    )
+                  ],
+                ),
+              ),
+              isTemplate
+                  ? Offstage()
+                  : Container(
                   height: 40,
                   width: double.infinity,
                   padding: EdgeInsets.only(left: 24),
                   child: SingleChildScrollView(
-                    scrollDirection: Axis.horizontal,
-                    child: Row(
-                      children: <Widget>[
-                        GestureDetector(
-                          onTap: () => Navigator.of(context)
-                              .pushNamed(Routes.exchangeTemplate),
-                          child: Container(
-                            padding: EdgeInsets.only(left: 1, right: 10),
-                            child: DottedBorder(
-                                borderType: BorderType.RRect,
-                                dashPattern: [6, 4],
-                                color: PaletteDark.darkCyanBlue,
-                                strokeWidth: 2,
-                                radius: Radius.circular(20),
-                                child: Container(
-                                  height: 34,
-                                  width: 75,
-                                  padding: EdgeInsets.only(left: 10, right: 10),
-                                  alignment: Alignment.center,
-                                  decoration: BoxDecoration(
-                                    borderRadius: BorderRadius.all(Radius.circular(20)),
-                                    color: Colors.transparent,
-                                  ),
-                                  child: Text(
-                                    S.of(context).send_new,
-                                    style: TextStyle(
-                                        fontSize: 14,
-                                        fontWeight: FontWeight.w600,
-                                        color: PaletteDark.darkCyanBlue
+                      scrollDirection: Axis.horizontal,
+                      child: Row(
+                        children: <Widget>[
+                          GestureDetector(
+                            onTap: () => Navigator.of(context)
+                                .pushNamed(Routes.exchangeTemplate),
+                            child: Container(
+                              padding: EdgeInsets.only(left: 1, right: 10),
+                              child: DottedBorder(
+                                  borderType: BorderType.RRect,
+                                  dashPattern: [6, 4],
+                                  color: Theme.of(context).primaryTextTheme.display2.decorationColor,
+                                  strokeWidth: 2,
+                                  radius: Radius.circular(20),
+                                  child: Container(
+                                    height: 34,
+                                    width: 75,
+                                    padding: EdgeInsets.only(left: 10, right: 10),
+                                    alignment: Alignment.center,
+                                    decoration: BoxDecoration(
+                                      borderRadius: BorderRadius.all(Radius.circular(20)),
+                                      color: Colors.transparent,
                                     ),
-                                  ),
-                                )
+                                    child: Text(
+                                      S.of(context).send_new,
+                                      style: TextStyle(
+                                          fontSize: 14,
+                                          fontWeight: FontWeight.w600,
+                                          color: Theme.of(context).primaryTextTheme.display3.color
+                                      ),
+                                    ),
+                                  )
+                              ),
                             ),
                           ),
-                        ),
-                        Observer(
-                            builder: (_) {
-                              final templates = exchangeViewModel.templates;
-                              final itemCount = exchangeViewModel.templates.length;
+                          Observer(
+                              builder: (_) {
+                                final templates = exchangeViewModel.templates;
+                                final itemCount = exchangeViewModel.templates.length;
 
-                              return ListView.builder(
-                                  scrollDirection: Axis.horizontal,
-                                  shrinkWrap: true,
-                                  physics: NeverScrollableScrollPhysics(),
-                                  itemCount: itemCount,
-                                  itemBuilder: (context, index) {
-                                    final template = templates[index];
+                                return ListView.builder(
+                                    scrollDirection: Axis.horizontal,
+                                    shrinkWrap: true,
+                                    physics: NeverScrollableScrollPhysics(),
+                                    itemCount: itemCount,
+                                    itemBuilder: (context, index) {
+                                      final template = templates[index];
 
-                                    return TemplateTile(
-                                      key: UniqueKey(),
-                                      amount: template.amount,
-                                      from: template.depositCurrency,
-                                      to: template.receiveCurrency,
-                                      onTap: () {
-                                        applyTemplate(exchangeViewModel, template);
-                                      },
-                                      onRemove: () {
-                                        showDialog<void>(
-                                            context: context,
-                                            builder: (dialogContext) {
-                                              return AlertWithTwoActions(
-                                                  alertTitle: S.of(context).template,
-                                                  alertContent: S.of(context).confirm_delete_template,
-                                                  leftButtonText: S.of(context).delete,
-                                                  rightButtonText: S.of(context).cancel,
-                                                  actionLeftButton: () {
-                                                    Navigator.of(dialogContext).pop();
-                                                    exchangeViewModel.exchangeTemplateStore.remove(template: template);
-                                                    exchangeViewModel.exchangeTemplateStore.update();
-                                                  },
-                                                  actionRightButton: () => Navigator.of(dialogContext).pop()
-                                              );
-                                            }
-                                        );
-                                      },
-                                    );
-                                  }
-                              );
-                            }
-                        ),
-                      ],
-                    )
+                                      return TemplateTile(
+                                        key: UniqueKey(),
+                                        amount: template.amount,
+                                        from: template.depositCurrency,
+                                        to: template.receiveCurrency,
+                                        onTap: () {
+                                          applyTemplate(exchangeViewModel, template);
+                                        },
+                                        onRemove: () {
+                                          showDialog<void>(
+                                              context: context,
+                                              builder: (dialogContext) {
+                                                return AlertWithTwoActions(
+                                                    alertTitle: S.of(context).template,
+                                                    alertContent: S.of(context).confirm_delete_template,
+                                                    leftButtonText: S.of(context).delete,
+                                                    rightButtonText: S.of(context).cancel,
+                                                    actionLeftButton: () {
+                                                      Navigator.of(dialogContext).pop();
+                                                      exchangeViewModel.exchangeTemplateStore.remove(template: template);
+                                                      exchangeViewModel.exchangeTemplateStore.update();
+                                                    },
+                                                    actionRightButton: () => Navigator.of(dialogContext).pop()
+                                                );
+                                              }
+                                          );
+                                        },
+                                      );
+                                    }
+                                );
+                              }
+                          ),
+                        ],
+                      )
                   )
-                )
-              ],
-            ),
-            bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-            bottomSection: Column(children: <Widget>[
-              Padding(
-                padding: EdgeInsets.only(bottom: 15),
-                child: Observer(builder: (_) {
-                  final description =
-                  exchangeViewModel.provider is XMRTOExchangeProvider
-                      ? S.of(context).amount_is_guaranteed
-                      : S.of(context).amount_is_estimate;
-                  return Center(
-                    child: Text(
-                      description,
-                      style: TextStyle(
-                          color: PaletteDark.darkCyanBlue,
-                          fontWeight: FontWeight.w500,
-                          fontSize: 12
-                      ),
+              )
+            ],
+          ),
+          bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+          bottomSection: Column(children: <Widget>[
+            Padding(
+              padding: EdgeInsets.only(bottom: 15),
+              child: Observer(builder: (_) {
+                final description =
+                exchangeViewModel.provider is XMRTOExchangeProvider
+                    ? S.of(context).amount_is_guaranteed
+                    : S.of(context).amount_is_estimate;
+                return Center(
+                  child: Text(
+                    description,
+                    style: TextStyle(
+                        color: Theme.of(context).primaryTextTheme.display4.decorationColor,
+                        fontWeight: FontWeight.w500,
+                        fontSize: 12
                     ),
-                  );
-                }),
-              ),
-              isTemplate
-              ? PrimaryButton(
+                  ),
+                );
+              }),
+            ),
+            isTemplate
+                ? PrimaryButton(
+                onPressed: () {
+                  if (_formKey.currentState.validate()) {
+                    exchangeViewModel.exchangeTemplateStore.addTemplate(
+                        amount: exchangeViewModel.depositAmount,
+                        depositCurrency: exchangeViewModel.depositCurrency.toString(),
+                        receiveCurrency: exchangeViewModel.receiveCurrency.toString(),
+                        provider: exchangeViewModel.provider.toString(),
+                        depositAddress: exchangeViewModel.depositAddress,
+                        receiveAddress: exchangeViewModel.receiveAddress
+                    );
+                    exchangeViewModel.exchangeTemplateStore.update();
+                    Navigator.of(context).pop();
+                  }
+                },
+                text: S.of(context).save,
+                color: Colors.green,
+                textColor: Colors.white
+            )
+                : Observer(
+                builder: (_) => LoadingPrimaryButton(
+                  text: S.of(context).exchange,
                   onPressed: () {
                     if (_formKey.currentState.validate()) {
-                      exchangeViewModel.exchangeTemplateStore.addTemplate(
-                          amount: exchangeViewModel.depositAmount,
-                          depositCurrency: exchangeViewModel.depositCurrency.toString(),
-                          receiveCurrency: exchangeViewModel.receiveCurrency.toString(),
-                          provider: exchangeViewModel.provider.toString(),
-                          depositAddress: exchangeViewModel.depositAddress,
-                          receiveAddress: exchangeViewModel.receiveAddress
-                      );
-                      exchangeViewModel.exchangeTemplateStore.update();
-                      Navigator.of(context).pop();
+                      exchangeViewModel.createTrade();
                     }
                   },
-                  text: S.of(context).save,
-                  color: Colors.green,
-                  textColor: Colors.white
-              )
-              : Observer(
-                  builder: (_) => LoadingPrimaryButton(
-                    text: S.of(context).exchange,
-                    onPressed: () {
-                      if (_formKey.currentState.validate()) {
-                        exchangeViewModel.createTrade();
-                      }
-                    },
-                    color: Colors.blue,
-                    textColor: Colors.white,
-                    isLoading: exchangeViewModel.tradeState is TradeIsCreating,
-                  )),
-            ]),
-          )),
-    );
+                  color: Palette.blueCraiola,
+                  textColor: Colors.white,
+                  isLoading: exchangeViewModel.tradeState is TradeIsCreating,
+                )),
+          ]),
+        ));
   }
 
   void applyTemplate(ExchangeViewModel exchangeViewModel,
diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart
index 548383176..f42ea58f4 100644
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@@ -5,7 +5,6 @@ import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
 import 'package:cake_wallet/src/widgets/address_text_field.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart';
-import 'package:cake_wallet/palette.dart';
 
 class ExchangeCard extends StatefulWidget {
   ExchangeCard(
@@ -22,6 +21,7 @@ class ExchangeCard extends StatefulWidget {
       this.imageArrow,
       this.currencyButtonColor = Colors.transparent,
       this.addressButtonsColor = Colors.transparent,
+      this.borderColor = Colors.transparent,
       this.currencyValueValidator,
       this.addressTextFieldValidator})
       : super(key: key);
@@ -38,6 +38,7 @@ class ExchangeCard extends StatefulWidget {
   final Image imageArrow;
   final Color currencyButtonColor;
   final Color addressButtonsColor;
+  final Color borderColor;
   final FormFieldValidator<String> currencyValueValidator;
   final FormFieldValidator<String> addressTextFieldValidator;
 
@@ -58,10 +59,6 @@ class ExchangeCardState extends State<ExchangeCard> {
   bool _isAddressEditable;
   bool _isAmountEstimated;
 
-  final copyImage = Image.asset('assets/images/copy_content.png',
-      height: 16, width: 16,
-      color: Colors.white);
-
   @override
   void initState() {
     _title = widget.title;
@@ -115,6 +112,10 @@ class ExchangeCardState extends State<ExchangeCard> {
 
   @override
   Widget build(BuildContext context) {
+    final copyImage = Image.asset('assets/images/copy_content.png',
+        height: 16, width: 16,
+        color: Theme.of(context).primaryTextTheme.display2.color);
+
     return Container(
       width: double.infinity,
       color: Colors.transparent,
@@ -129,7 +130,7 @@ class ExchangeCardState extends State<ExchangeCard> {
               style: TextStyle(
                 fontSize: 18,
                 fontWeight: FontWeight.w600,
-                color: PaletteDark.lightBlueGrey
+                color: Theme.of(context).textTheme.headline.color
               ),
             )
           ],
@@ -149,7 +150,7 @@ class ExchangeCardState extends State<ExchangeCard> {
                         RegExp('[\\-|\\ |\\,]'))
                   ],
                   hintText: '0.0000',
-                  borderColor: PaletteDark.blueGrey,
+                  borderColor: widget.borderColor,
                   textStyle: TextStyle(
                     fontSize: 16,
                     fontWeight: FontWeight.w600,
@@ -158,7 +159,7 @@ class ExchangeCardState extends State<ExchangeCard> {
                   placeholderTextStyle: TextStyle(
                     fontSize: 16,
                     fontWeight: FontWeight.w600,
-                    color: PaletteDark.lightBlueGrey
+                    color: Theme.of(context).textTheme.subhead.decorationColor
                   ),
                   validator: _isAmountEditable
                              ? widget.currencyValueValidator
@@ -206,7 +207,7 @@ class ExchangeCardState extends State<ExchangeCard> {
                   style: TextStyle(
                       fontSize: 10,
                       height: 1.2,
-                      color: PaletteDark.lightBlueGrey),
+                      color: Theme.of(context).textTheme.subhead.decorationColor),
                 )
                 : Offstage(),
                 _min != null ? SizedBox(width: 10) : Offstage(),
@@ -217,39 +218,45 @@ class ExchangeCardState extends State<ExchangeCard> {
                     style: TextStyle(
                         fontSize: 10,
                         height: 1.2,
-                        color: PaletteDark.lightBlueGrey))
+                        color: Theme.of(context).textTheme.subhead.decorationColor))
                 : Offstage(),
               ]),
         ),
-        Padding(
+        _isAddressEditable
+        ? Offstage()
+        : Padding(
           padding: EdgeInsets.only(top: 20),
           child: Text(
-            _isAddressEditable
-            ? S.of(context).widgets_address
-            : S.of(context).refund_address,
+            S.of(context).refund_address,
             style: TextStyle(
               fontSize: 14,
               fontWeight: FontWeight.w500,
-              color: PaletteDark.lightBlueGrey
+              color: Theme.of(context).textTheme.subhead.decorationColor
             ),
           )
         ),
         _isAddressEditable
-        ? AddressTextField(
+        ? Padding(
+          padding: EdgeInsets.only(top: 20),
+          child: AddressTextField(
             controller: addressController,
             options: [
               AddressTextFieldOption.paste,
               AddressTextFieldOption.qrCode,
               AddressTextFieldOption.addressBook,
             ],
-            placeholder: '',
             isBorderExist: false,
             textStyle: TextStyle(
                 fontSize: 16,
                 fontWeight: FontWeight.w600,
                 color: Colors.white),
+            hintStyle: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w600,
+                color: Theme.of(context).textTheme.subhead.decorationColor),
             buttonColor: widget.addressButtonsColor,
             validator: widget.addressTextFieldValidator,
+          ),
         )
         : Padding(
           padding: EdgeInsets.only(top: 10),
diff --git a/lib/src/screens/exchange/widgets/present_provider_picker.dart b/lib/src/screens/exchange/widgets/present_provider_picker.dart
index 79fbb80cd..24b0f73a3 100644
--- a/lib/src/screens/exchange/widgets/present_provider_picker.dart
+++ b/lib/src/screens/exchange/widgets/present_provider_picker.dart
@@ -5,7 +5,6 @@ import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
 import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
-import 'package:cake_wallet/palette.dart';
 
 class PresentProviderPicker extends StatelessWidget {
   PresentProviderPicker({@required this.exchangeViewModel});
@@ -41,7 +40,7 @@ class PresentProviderPicker extends StatelessWidget {
                         style: TextStyle(
                             fontSize: 10.0,
                             fontWeight: FontWeight.w500,
-                            color: PaletteDark.lightBlueGrey)))
+                            color: Theme.of(context).textTheme.headline.color)))
               ],
             ),
             SizedBox(width: 5),
diff --git a/lib/src/widgets/trail_button.dart b/lib/src/widgets/trail_button.dart
index 65cfc14dc..a7c4caecb 100644
--- a/lib/src/widgets/trail_button.dart
+++ b/lib/src/widgets/trail_button.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 
 class TrailButton extends StatelessWidget {
   TrailButton({
@@ -22,7 +21,7 @@ class TrailButton extends StatelessWidget {
         child: Text(
           caption,
           style: TextStyle(
-            color: PaletteDark.lightBlueGrey,
+            color: Theme.of(context).textTheme.subhead.decorationColor,
             fontWeight: FontWeight.w500,
             fontSize: 14),
         ),
diff --git a/lib/themes.dart b/lib/themes.dart
index 7a9c37690..beadff9e0 100644
--- a/lib/themes.dart
+++ b/lib/themes.dart
@@ -101,14 +101,26 @@ class Themes {
         decorationColor: Palette.shadowWhite // template background color (send page)
       ),
       display4: TextStyle(
-        color: Palette.darkBlueCraiola // template title (send page)
+        color: Palette.darkBlueCraiola, // template title (send page)
+        decorationColor: Palette.niagara // receive amount text (exchange page)
       ),
+      subtitle: TextStyle(
+        color: Palette.blueCraiola, // first gradient color top panel (exchange page)
+        decorationColor: Palette.pinkFlamingo // second gradient color top panel (exchange page)
+      ),
+      body1: TextStyle(
+        color: Palette.blueCraiola.withOpacity(0.7), // first gradient color bottom panel (exchange page)
+        decorationColor: Palette.pinkFlamingo.withOpacity(0.7) // second gradient color bottom panel (exchange page)
+      ),
+      body2: TextStyle(
+        color: Colors.white.withOpacity(0.5), // text field border on top panel (exchange page)
+        decorationColor: Colors.white.withOpacity(0.5), // text field border on bottom panel (exchange page)
+      )
     ),
+    focusColor: Colors.white.withOpacity(0.2), // text field button (exchange page)
 
 
 
-    focusColor: Colors.white, // wallet card border
-
     cardColor: Palette.blueAlice,
     cardTheme: CardTheme(
       color: Colors.white, // synced card start
@@ -237,13 +249,26 @@ class Themes {
         decorationColor: PaletteDark.darkVioletBlue // template background color (send page)
       ),
       display4: TextStyle(
-        color: PaletteDark.cyanBlue // QR code
+        color: PaletteDark.cyanBlue, // template title (send page)
+        decorationColor: PaletteDark.darkCyanBlue // receive amount text (exchange page)
       ),
+      subtitle: TextStyle(
+        color: PaletteDark.wildVioletBlue, // first gradient color top panel (exchange page)
+        decorationColor: PaletteDark.wildVioletBlue // second gradient color top panel (exchange page)
+      ),
+      body1: TextStyle(
+        color: PaletteDark.darkNightBlue, // first gradient color bottom panel (exchange page)
+        decorationColor: PaletteDark.darkNightBlue // second gradient color bottom panel (exchange page)
+      ),
+      body2: TextStyle(
+        color: PaletteDark.blueGrey, // text field border on top panel (exchange page)
+        decorationColor: PaletteDark.moderateVioletBlue, // text field border on bottom panel (exchange page)
+      )
     ),
+    focusColor: PaletteDark.moderateBlue, // text field button (exchange page)
 
 
 
-    focusColor: PaletteDark.lightDistantBlue, // wallet card border
     cardColor: PaletteDark.darkNightBlue,
     cardTheme: CardTheme(
       color: PaletteDark.moderateBlue, // synced card start

From ecf7a5ba7856c2005903a5f0df44c3cfdc5c50c9 Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Tue, 25 Aug 2020 21:12:14 +0300
Subject: [PATCH 11/15] CAKE-28 | reworked exchange confirm page; applied light
 and dark themes to exchange confirm page, currency picker, picker, base alert
 dialog, alert with one action; applied maximum characters parameter to crypto
 currency text field in the exchange card

---
 assets/images/2.0x/question_mark.png          | Bin 0 -> 1240 bytes
 assets/images/3.0x/question_mark.png          | Bin 0 -> 1662 bytes
 assets/images/question_mark.png               | Bin 0 -> 713 bytes
 lib/palette.dart                              |   2 +
 .../exchange/widgets/currency_picker.dart     | 169 +++++++++---------
 .../exchange/widgets/exchange_card.dart       |   1 +
 .../exchange_trade/exchange_confirm_page.dart | 162 ++++++++++-------
 .../monero_account_list_page.dart             |   4 +-
 lib/src/widgets/alert_with_one_action.dart    |  11 +-
 lib/src/widgets/base_alert_dialog.dart        | 133 ++++++--------
 lib/src/widgets/base_text_form_field.dart     |   5 +-
 lib/src/widgets/picker.dart                   | 154 ++++++++++------
 lib/themes.dart                               |  99 +++++-----
 .../dashboard/dashboard_view_model.dart       |   3 +-
 .../exchange/exchange_view_model.dart         |   2 +-
 15 files changed, 404 insertions(+), 341 deletions(-)
 create mode 100644 assets/images/2.0x/question_mark.png
 create mode 100644 assets/images/3.0x/question_mark.png
 create mode 100644 assets/images/question_mark.png

diff --git a/assets/images/2.0x/question_mark.png b/assets/images/2.0x/question_mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..37f5edfcc923275940547fc9472d59792c020938
GIT binary patch
literal 1240
zcmV;}1Sk86P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1Z_z~K~#7F#hK4*
z8%Gq!-y7MA5-4>pJ%kpNLl2=8RIrP0m1+t-D$ttHOYFZOGL*({50*~Cz1aQ>n%qik
zTIF72`BF-4hz@P(Eh@Anw<w3$Vt>rbn^huq*Q?#x(Kz{nu{EC6eD>|zH}Abc$f0U|
zbMCZQY7pWlKv)5wIWQC<bOq6oaNyo=osGWkb*MXWetE0GlQ*Y<Occ?8h*~H6-|py4
zFX&AAc)8u=Uv2&=fo&m{5b^VCA1vYje;#zRre^{xSOVOH3l;)ab)ZvSA_<m14?x0>
z=bi5MI;{a1sB)`a7Cux9D7ND+M!@dzV513nfhSnD?>bcL<#<Wbq`+q-9`c{%@OT<@
z;Z4CRJ^ABc@Xm)z4-15K{y4UDntPya*hRLQ_tIkM%fa#9cfG7@@>m*ez>ecHh&yqg
z<OTW?uruSx-L!bC3ysslE`0fY1yTM?v4!GN;6(n-G>hv%2f(9EfwsW_7LX3LHxu3@
z0A$SwTFN!GxuEhnUy4VuMK#^v@*_HD4ICg*0K{8(1ruDvan3$U3yF!)e6y}Qye^~^
zx5Kb%L7f-u`E03v&J85(c+Tnd<GuBo`Z;-U_bN(kMsEnpGsP=+(!RU*<3`^VR09?B
z$9IZz>N-J4)z}v{v_cn($fCqx$NL*=am)R_f49YxBY6T_eFZY4p!sP;^9!P?V8Uv6
z%y;Bb)|XZ4+x$eR5+3tBd4JM;*D1DQL*)v)6lBP8io4;@e4`Z+pQK~mQfU}pte<vW
zud_Db)gu4DBHnr%G89}F7Q2N20}Y3zLBziZx|tUdT1iWdfP*_Htc^fv$91WdHh=zB
zyBdi?{Ko(K)7Srifo8x^$9vzX&{fNtr^2R`_ya{ou>*!OvaqgR!XC!MU)B>zld*-f
zGznIPzg}m(4~DuB3#(l)36_2S-boOb&2=Hb&o5oxPJ-p#ZxyDLb>M}sI3Xffi40nT
zRkCkkU&ix<zAacK>%bV>>Vd=xSd?|(xbJej&dg2n$i7R2wrNgPGwZp$vL1)s0<F$U
z2>jS{&ZY`sNy3HYt*7CA-gVBdnl?ymYg7&4<M0^g!xVXJS=E5<LW}iw8K#u)M_*uK
zcN5%*>xKuBWMi7eRQ0W_;urDp{HTd&Bz4mew6el**cGF!K3Y4;A|9GThg$_4;*6fw
zt2`uLYkH2nFH~+z(r-l<h4M7eV`2WJeNxiIm3UKCH9=Sl>ivZ3)(AQh)+krro0j46
zZW+{f<2bCUTN}`>d+DZ6wCba1c+OCJOHP9gXL#qEfnRKGlAvaIOf^3Q_bT$7MdXn#
ztkSu5>wka!a`f(v&lF`fG&~0dtiSjE(!+oMKCl|2^S~wozfS19uuADi1_|z=Dqdv&
z6x?tzb&<68Y#MAP@I>efQWmUI<|)zy_pmM<SS77<It6|0#;4EN6&AtrS>32T3+pHQ
z>svbWGhHGq)wiAT#BEd^&nYY(9G$78i?Eyb`0NE>(ZEj`>jLBe0000<MNUMnLSTZ{
Cf>?zB

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/question_mark.png b/assets/images/3.0x/question_mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b08436f2769cf02f019f49315fd11b07bc51296
GIT binary patch
literal 1662
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
IM6N<$f(<F|DF6Tf

literal 0
HcmV?d00001

diff --git a/assets/images/question_mark.png b/assets/images/question_mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a4b4fa708afeea06050c0aa5117fabfad83c701
GIT binary patch
literal 713
zcmV;)0yh1LP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0$xc(K~#7Ft(DJj
z5<wKl-<!oAJi)E0J#ejhs7WCnsnz?MR^qMr7YHZ73velNT09v~#VgQ=cS-PO_+j>-
zJ!7K17Lz8%QuaBs!{V^rT_EW<fy~al_t`h^?Yu$oQ0!Sb1;}0k&^82$OaxZ#*0b;3
zE1G*Eo-7vu(cr^%SSS=W`o_IIJp116%&oYg1Xz&4K)Tn+y$QnZ92}*QF+-YDsb9|*
zuSKjvae}E{Gxtt~JbYe`Zr*<!{`svva^}uX+h6Y7-TT3Js3TxPjU2t8-IM=0i|-%l
zpfQ60qEm<AWMX9oC$CzLjjRbCtC6ER=>;W?eUJ_~l3)tk&lc_WoB56xoJXHxvidTo
zD%76Rw1R|Sv0u+d#1Hw{Uc_lFrs_5FHL|RXL_r#3$=75r)N^x%+}4fot+l`BKs4e`
z5p^w=tekWA@c8mi#B7yD^J|jFz(-~)GveEB@z>YXc~L}|ro#<Y6@mbD>-neZb3!kK
zFDz!DC=o#?$d|zix>&n?%%M6T4zI@a;zq#YlXRftOWHMC`QeR#`Dbt_{>g&$BIrtB
z{vC^g4g1a9$7Sq8u%yP!dH^ekM~tQzh=vkm7_yiiy0UZZtDR)UX7JsaY(kdZ!9<se
z?^h1}oOt03r;~X}9BE-A!BAyi`B8L^DQQ&mhhtS7dq3!`331kdH~!f%jvrJC#HeT^
zT+Jv*ZfL)mEs620AOAZ2^m%jZiP&?3XI|gfdh}cL+aRdODI&aeL+#+)#%kot$_<^1
vSdDz0-wF&_6c*ikM5cu-H)v$9U19$KH#`^@d>=#}00000NkvXXu0mjf*y>QQ

literal 0
HcmV?d00001

diff --git a/lib/palette.dart b/lib/palette.dart
index aa962f1da..d2c761bff 100644
--- a/lib/palette.dart
+++ b/lib/palette.dart
@@ -31,6 +31,7 @@ class Palette {
   static const Color darkGray = Color.fromRGBO(122, 147, 186, 1.0);
   static const Color shadowWhite = Color.fromRGBO(242, 245, 255, 1.0);
   static const Color niagara = Color.fromRGBO(152, 172, 201, 1.0);
+  static const Color alizarinRed = Color.fromRGBO(233, 45, 45, 1.0);
 
   // FIXME: Rename.
   static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
@@ -79,6 +80,7 @@ class PaletteDark {
   static const Color violetBlue = Color.fromRGBO(59, 72, 119, 1.0);
   static const Color distantBlue = Color.fromRGBO(72, 85, 131, 1.0);
   static const Color moderateVioletBlue = Color.fromRGBO(62, 73, 113, 1.0);
+  static const Color deepVioletBlue = Color.fromRGBO(52, 66, 104, 1.0);
 
   // FIXME: Rename.
   static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
diff --git a/lib/src/screens/exchange/widgets/currency_picker.dart b/lib/src/screens/exchange/widgets/currency_picker.dart
index 32398de65..2cc106b2c 100644
--- a/lib/src/screens/exchange/widgets/currency_picker.dart
+++ b/lib/src/screens/exchange/widgets/currency_picker.dart
@@ -1,8 +1,10 @@
 import 'dart:ui';
+import 'package:cake_wallet/palette.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/src/widgets/alert_background.dart';
+import 'package:cake_wallet/src/widgets/alert_close_button.dart';
 
 class CurrencyPicker extends StatelessWidget {
   CurrencyPicker({
@@ -16,104 +18,103 @@ class CurrencyPicker extends StatelessWidget {
   final List<CryptoCurrency> items;
   final String title;
   final Function(CryptoCurrency) onItemSelected;
+  final closeButton = Image.asset('assets/images/close.png',
+    color: Palette.darkBlueCraiola,
+  );
 
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () => Navigator.of(context).pop(),
-      child: Container(
-        color: Colors.transparent,
-        child: BackdropFilter(
-          filter: ImageFilter.blur(sigmaX: 3.0, sigmaY: 3.0),
-          child: Container(
-            decoration: BoxDecoration(color: PaletteDark.darkNightBlue.withOpacity(0.75)),
-            child: Center(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: <Widget>[
-                  Container(
-                    padding: EdgeInsets.only(left: 24, right: 24),
-                    child: Text(
-                      title,
-                      textAlign: TextAlign.center,
-                      style: TextStyle(
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                          decoration: TextDecoration.none,
-                          color: Colors.white
-                      ),
+    return AlertBackground(
+        child: Stack(
+          alignment: Alignment.center,
+          children: <Widget>[
+            Column(
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                Container(
+                  padding: EdgeInsets.only(left: 24, right: 24),
+                  child: Text(
+                    title,
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                        fontSize: 18,
+                        fontFamily: 'Poppins',
+                        fontWeight: FontWeight.bold,
+                        decoration: TextDecoration.none,
+                        color: Colors.white
                     ),
                   ),
-                  Padding(
-                    padding: EdgeInsets.only(top: 24),
-                    child: GestureDetector(
-                      onTap: () => null,
-                      child: ClipRRect(
-                        borderRadius: BorderRadius.all(Radius.circular(14)),
-                        child: Container(
-                          height: 400,
-                          width: 300,
-                          color: Theme.of(context).dividerColor,
-                          child: GridView.count(
-                              shrinkWrap: true,
-                              crossAxisCount: 3,
-                              childAspectRatio: 1.25,
-                              physics: const NeverScrollableScrollPhysics(),
-                              crossAxisSpacing: 1,
-                              mainAxisSpacing: 1,
-                              children: List.generate(15, (index) {
+                ),
+                Padding(
+                  padding: EdgeInsets.only(top: 24),
+                  child: GestureDetector(
+                    onTap: () => null,
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.all(Radius.circular(14)),
+                      child: Container(
+                        height: 400,
+                        width: 300,
+                        color: Theme.of(context).accentTextTheme.title.backgroundColor,
+                        child: GridView.count(
+                            shrinkWrap: true,
+                            crossAxisCount: 3,
+                            childAspectRatio: 1.25,
+                            physics: const NeverScrollableScrollPhysics(),
+                            crossAxisSpacing: 1,
+                            mainAxisSpacing: 1,
+                            children: List.generate(15, (index) {
 
-                                if (index == 14) {
-                                  return Container(
-                                    color: Theme.of(context).primaryTextTheme.display1.color,
-                                  );
-                                }
+                              if (index == 14) {
+                                return Container(
+                                  color: Theme.of(context).accentTextTheme.title.color,
+                                );
+                              }
 
-                                final item = items[index];
-                                final isItemSelected = index == selectedAtIndex;
+                              final item = items[index];
+                              final isItemSelected = index == selectedAtIndex;
 
-                                final color = isItemSelected
-                                    ? Theme.of(context).accentTextTheme.subtitle.decorationColor
-                                    : Theme.of(context).primaryTextTheme.display1.color;
-                                final textColor = isItemSelected
-                                    ? Colors.blue
-                                    : Theme.of(context).primaryTextTheme.title.color;
+                              final color = isItemSelected
+                                  ? Theme.of(context).textTheme.body2.color
+                                  : Theme.of(context).accentTextTheme.title.color;
+                              final textColor = isItemSelected
+                                  ? Palette.blueCraiola
+                                  : Theme.of(context).primaryTextTheme.title.color;
 
-                                return GestureDetector(
-                                  onTap: () {
-                                    if (onItemSelected == null) {
-                                      return;
-                                    }
-                                    Navigator.of(context).pop();
-                                    onItemSelected(item);
-                                  },
-                                  child: Container(
-                                    color: color,
-                                    child: Center(
-                                      child: Text(
-                                        item.toString(),
-                                        style: TextStyle(
-                                            fontSize: 18,
-                                            fontWeight: FontWeight.bold,
-                                            decoration: TextDecoration.none,
-                                            color: textColor
-                                        ),
+                              return GestureDetector(
+                                onTap: () {
+                                  if (onItemSelected == null) {
+                                    return;
+                                  }
+                                  Navigator.of(context).pop();
+                                  onItemSelected(item);
+                                },
+                                child: Container(
+                                  color: color,
+                                  child: Center(
+                                    child: Text(
+                                      item.toString(),
+                                      style: TextStyle(
+                                          fontSize: 18,
+                                          fontFamily: 'Poppins',
+                                          fontWeight: FontWeight.w600,
+                                          decoration: TextDecoration.none,
+                                          color: textColor
                                       ),
                                     ),
                                   ),
-                                );
-                              })
-                          ),
+                                ),
+                              );
+                            })
                         ),
                       ),
                     ),
-                  )
-                ],
-              ),
-            )
-          ),
-        ),
-      ),
+                  ),
+                )
+              ],
+            ),
+            AlertCloseButton(image: closeButton)
+          ],
+        )
     );
   }
 }
\ No newline at end of file
diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart
index f42ea58f4..9be446fb8 100644
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@@ -146,6 +146,7 @@ class ExchangeCardState extends State<ExchangeCard> {
                   keyboardType: TextInputType.numberWithOptions(
                       signed: false, decimal: true),
                   inputFormatters: [
+                    LengthLimitingTextInputFormatter(15),
                     BlacklistingTextInputFormatter(
                         RegExp('[\\-|\\ |\\,]'))
                   ],
diff --git a/lib/src/screens/exchange_trade/exchange_confirm_page.dart b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
index 97d3b316c..0ad35f423 100644
--- a/lib/src/screens/exchange_trade/exchange_confirm_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
@@ -6,6 +6,7 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/palette.dart';
 
 class ExchangeConfirmPage extends BasePage {
   ExchangeConfirmPage({@required this.trade});
@@ -16,94 +17,123 @@ class ExchangeConfirmPage extends BasePage {
   String get title => S.current.copy_id;
 
   @override
-  Widget body(BuildContext context) {
-    final copyImage = Image.asset('assets/images/copy_content.png',
+  Widget trailing(BuildContext context) {
+    final questionImage = Image.asset('assets/images/question_mark.png',
         color: Theme.of(context).primaryTextTheme.title.color);
 
+    return SizedBox(
+      height: 20.0,
+      width: 20.0,
+      child: ButtonTheme(
+        minWidth: double.minPositive,
+        child: FlatButton(
+          highlightColor: Colors.transparent,
+          splashColor: Colors.transparent,
+          padding: EdgeInsets.all(0),
+          onPressed: () {},
+          child: questionImage),
+      ),
+    );
+  }
+
+  @override
+  Widget body(BuildContext context) {
     return Container(
-      padding: EdgeInsets.all(24),
+      padding: EdgeInsets.fromLTRB(24, 0, 24, 24),
       child: Column(
         children: <Widget>[
           Expanded(
-              child: Center(
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
-                    Text(
-                      S.of(context).exchange_result_write_down_trade_id,
-                      textAlign: TextAlign.center,
-                      style: TextStyle(
-                          fontSize: 18.0,
-                          fontWeight: FontWeight.w600,
-                          color: Theme.of(context).primaryTextTheme.title.color),
-                    ),
-                    Padding(
-                      padding: EdgeInsets.only(top: 60),
+              child: Column(
+                children: <Widget>[
+                  Flexible(
+                    child: Center(
                       child: Text(
-                        S.of(context).trade_id,
+                        S.of(context).exchange_result_write_down_trade_id,
                         textAlign: TextAlign.center,
                         style: TextStyle(
-                            fontSize: 16.0,
-                            fontWeight: FontWeight.w600,
-                            color: Theme.of(context).primaryTextTheme.title.color),
+                          fontSize: 18.0,
+                          fontWeight: FontWeight.w500,
+                          color: Theme.of(context).primaryTextTheme.title.color),
                       ),
+                    )
+                  ),
+                  Container(
+                    height: 178,
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.all(Radius.circular(30)),
+                      border: Border.all(
+                        width: 1,
+                        color: Theme.of(context).accentTextTheme.caption.color
+                      ),
+                      color: Theme.of(context).accentTextTheme.title.color
                     ),
-                    Padding(
-                      padding: EdgeInsets.only(top: 24),
-                      child: Builder(
-                        builder: (context) => GestureDetector(
-                          onTap: () {
-                            Clipboard.setData(ClipboardData(text: trade.id));
-                            Scaffold.of(context).showSnackBar(SnackBar(
-                              content: Text(
-                                S.of(context).copied_to_clipboard,
-                                textAlign: TextAlign.center,
-                                style: TextStyle(color: Colors.white),
-                              ),
-                              backgroundColor: Colors.green,
-                              duration: Duration(milliseconds: 1500),
-                            ));
-                          },
-                          child: Container(
-                            height: 60,
-                            padding: EdgeInsets.only(left: 24, right: 24),
-                            decoration: BoxDecoration(
-                                borderRadius: BorderRadius.all(Radius.circular(30)),
-                                color: Theme.of(context).accentTextTheme.title.backgroundColor
-                            ),
-                            child: Row(
-                              mainAxisSize: MainAxisSize.max,
+                    child: Column(
+                      children: <Widget>[
+                        Expanded(
+                          child: Padding(
+                            padding: EdgeInsets.all(24),
+                            child: Column(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              crossAxisAlignment: CrossAxisAlignment.center,
                               children: <Widget>[
-                                Expanded(
-                                  child: Text(
-                                    trade.id,
-                                    maxLines: 1,
-                                    overflow: TextOverflow.ellipsis,
-                                    style: TextStyle(
-                                        fontSize: 18,
-                                        fontWeight: FontWeight.w600,
-                                        color: Theme.of(context).primaryTextTheme.title.color
-                                    ),
+                                Text(
+                                  S.of(context).trade_id,
+                                  style: TextStyle(
+                                    fontSize: 12.0,
+                                    fontWeight: FontWeight.w500,
+                                    color: Theme.of(context).primaryTextTheme.overline.color
+                                  ),
+                                ),
+                                Text(
+                                  trade.id,
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: TextStyle(
+                                    fontSize: 20,
+                                    fontWeight: FontWeight.w600,
+                                    color: Theme.of(context).primaryTextTheme.title.color
                                   ),
                                 ),
-                                Padding(
-                                  padding: EdgeInsets.only(left: 12),
-                                  child: copyImage,
-                                )
                               ],
                             ),
+                          )
+                        ),
+                        Padding(
+                          padding: EdgeInsets.fromLTRB(10, 0, 10, 10),
+                          child: Builder(
+                            builder: (context) => PrimaryButton(
+                                onPressed: () {
+                                  Clipboard.setData(ClipboardData(text: trade.id));
+                                  Scaffold.of(context).showSnackBar(SnackBar(
+                                    content: Text(
+                                      S.of(context).copied_to_clipboard,
+                                      textAlign: TextAlign.center,
+                                      style: TextStyle(color: Colors.white),
+                                    ),
+                                    backgroundColor: Colors.green,
+                                    duration: Duration(milliseconds: 1500),
+                                  ));
+                                },
+                                text: S.of(context).copy_id,
+                                color: Theme.of(context).accentTextTheme.caption.backgroundColor,
+                                textColor: Theme.of(context).primaryTextTheme.title.color
+                            ),
                           ),
                         )
-                      ),
-                    )
-                  ],
-                ),
-              )),
+                      ],
+                    ),
+                  ),
+                  Flexible(
+                    child: Offstage()
+                  ),
+                ],
+              )
+          ),
           PrimaryButton(
               onPressed: () => Navigator.of(context)
                   .pushReplacementNamed(Routes.exchangeTrade, arguments: trade),
               text: S.of(context).saved_the_trade_id,
-              color: Colors.green,
+              color: Palette.blueCraiola,
               textColor: Colors.white)
         ],
       ),
diff --git a/lib/src/screens/monero_accounts/monero_account_list_page.dart b/lib/src/screens/monero_accounts/monero_account_list_page.dart
index 8c3a5503e..0f4d493fe 100644
--- a/lib/src/screens/monero_accounts/monero_account_list_page.dart
+++ b/lib/src/screens/monero_accounts/monero_account_list_page.dart
@@ -27,7 +27,9 @@ class MoneroAccountListPage extends StatelessWidget {
   }
 
   final MoneroAccountListViewModel accountListViewModel;
-  final closeIcon = Image.asset('assets/images/close.png');
+  final closeIcon = Image.asset('assets/images/close.png',
+    color: Palette.darkBlueCraiola,
+  );
 
   ScrollController controller;
   double backgroundHeight;
diff --git a/lib/src/widgets/alert_with_one_action.dart b/lib/src/widgets/alert_with_one_action.dart
index 704243591..e7f1a0d15 100644
--- a/lib/src/widgets/alert_with_one_action.dart
+++ b/lib/src/widgets/alert_with_one_action.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
+import 'package:cake_wallet/palette.dart';
 
 class AlertWithOneAction extends BaseAlertDialog {
   AlertWithOneAction({
@@ -31,13 +32,7 @@ class AlertWithOneAction extends BaseAlertDialog {
       width: 300,
       height: 52,
       padding: EdgeInsets.only(left: 12, right: 12),
-      decoration: BoxDecoration(
-          borderRadius: BorderRadius.only(
-              bottomLeft: Radius.circular(24),
-              bottomRight: Radius.circular(24)
-          ),
-          color: Colors.white
-      ),
+      color: Palette.blueCraiola,
       child: ButtonTheme(
         minWidth: double.infinity,
         child: FlatButton(
@@ -50,7 +45,7 @@ class AlertWithOneAction extends BaseAlertDialog {
               style: TextStyle(
                 fontSize: 15,
                 fontWeight: FontWeight.w600,
-                color: Colors.blue,
+                color: Colors.white,
                 decoration: TextDecoration.none,
               ),
             )),
diff --git a/lib/src/widgets/base_alert_dialog.dart b/lib/src/widgets/base_alert_dialog.dart
index 8a10d1d3f..30fb6fc23 100644
--- a/lib/src/widgets/base_alert_dialog.dart
+++ b/lib/src/widgets/base_alert_dialog.dart
@@ -17,6 +17,7 @@ class BaseAlertDialog extends StatelessWidget {
       textAlign: TextAlign.center,
       style: TextStyle(
         fontSize: 20,
+        fontFamily: 'Poppins',
         fontWeight: FontWeight.w600,
         color: Theme.of(context).primaryTextTheme.title.color,
         decoration: TextDecoration.none,
@@ -30,7 +31,7 @@ class BaseAlertDialog extends StatelessWidget {
       textAlign: TextAlign.center,
       style: TextStyle(
         fontSize: 16,
-        fontWeight: FontWeight.w600,
+        fontFamily: 'Poppins',
         color: Theme.of(context).primaryTextTheme.title.color,
         decoration: TextDecoration.none,
       ),
@@ -38,55 +39,39 @@ class BaseAlertDialog extends StatelessWidget {
   }
 
   Widget actionButtons(BuildContext context) {
-    return Container(
-      width: 300,
-      height: 52,
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.only(
-          bottomLeft: Radius.circular(24),
-          bottomRight: Radius.circular(24)
-        ),
-        color: Colors.white
-      ),
-      child: Row(
-        mainAxisSize: MainAxisSize.max,
-        children: <Widget>[
-          Flexible(
+    return Row(
+      mainAxisSize: MainAxisSize.max,
+      children: <Widget>[
+        Flexible(
             child: Container(
+              height: 52,
               padding: EdgeInsets.only(left: 12, right: 12),
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24)),
-              ),
+              color: Palette.blueCraiola,
               child: ButtonTheme(
                 minWidth: double.infinity,
                 child: FlatButton(
-                  onPressed: actionLeft,
-                  highlightColor: Colors.transparent,
-                  splashColor: Colors.transparent,
-                  child: Text(
-                    leftActionButtonText,
-                    textAlign: TextAlign.center,
-                    style: TextStyle(
-                      fontSize: 15,
-                      fontWeight: FontWeight.w600,
-                      color: Colors.blue,
-                      decoration: TextDecoration.none,
-                    ),
-                  )),
+                    onPressed: actionLeft,
+                    highlightColor: Colors.transparent,
+                    splashColor: Colors.transparent,
+                    child: Text(
+                      leftActionButtonText,
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                        fontSize: 15,
+                        fontFamily: 'Poppins',
+                        fontWeight: FontWeight.w600,
+                        color: Colors.white,
+                        decoration: TextDecoration.none,
+                      ),
+                    )),
               ),
             )
-          ),
-          Container(
-            height: 52,
-            width: 1,
-            color: Colors.grey.withOpacity(0.2),
-          ),
-          Flexible(
+        ),
+        Flexible(
             child: Container(
+              height: 52,
               padding: EdgeInsets.only(left: 12, right: 12),
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.only(bottomRight: Radius.circular(24)),
-              ),
+              color: Palette.alizarinRed,
               child: ButtonTheme(
                 minWidth: double.infinity,
                 child: FlatButton(
@@ -98,16 +83,16 @@ class BaseAlertDialog extends StatelessWidget {
                       textAlign: TextAlign.center,
                       style: TextStyle(
                         fontSize: 15,
+                        fontFamily: 'Poppins',
                         fontWeight: FontWeight.w600,
-                        color: Colors.red,
+                        color: Colors.white,
                         decoration: TextDecoration.none,
                       ),
                     )),
               ),
             )
-          )
-        ],
-      ),
+        )
+      ],
     );
   }
 
@@ -126,44 +111,30 @@ class BaseAlertDialog extends StatelessWidget {
             child: Center(
               child: GestureDetector(
                 onTap: () => null,
-                child: Container(
-                  width: 300,
-                  height: 257,
-                  decoration: BoxDecoration(
-                    borderRadius: BorderRadius.all(Radius.circular(24)),
-                    color: Theme.of(context).accentTextTheme.title.backgroundColor
-                  ),
-                  child: Column(
-                    children: <Widget>[
-                      Container(
-                        width: 300,
-                        height: 77,
-                        padding: EdgeInsets.only(left: 24, right: 24),
-                        decoration: BoxDecoration(
-                          borderRadius: BorderRadius.only(
-                            topLeft: Radius.circular(24),
-                            topRight: Radius.circular(24)
+                child: ClipRRect(
+                  borderRadius: BorderRadius.all(Radius.circular(30)),
+                  child: Container(
+                    width: 300,
+                    color: Theme.of(context).accentTextTheme.title.decorationColor,
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: <Widget>[
+                        Container(
+                          padding: EdgeInsets.fromLTRB(24, 32, 24, 32),
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: <Widget>[
+                              title(context),
+                              Padding(
+                                padding: EdgeInsets.only(top: 8),
+                                child: content(context),
+                              )
+                            ],
                           ),
                         ),
-                        child: Center(
-                          child: title(context),
-                        ),
-                      ),
-                      Container(
-                        width: 300,
-                        height: 1,
-                        color: Theme.of(context).dividerColor,
-                      ),
-                      Container(
-                        width: 300,
-                        height: 127,
-                        padding: EdgeInsets.all(24),
-                        child: Center(
-                          child: content(context),
-                        ),
-                      ),
-                      actionButtons(context)
-                    ],
+                        actionButtons(context)
+                      ],
+                    ),
                   ),
                 ),
               ),
diff --git a/lib/src/widgets/base_text_form_field.dart b/lib/src/widgets/base_text_form_field.dart
index 21ae78cc5..c1c34345b 100644
--- a/lib/src/widgets/base_text_form_field.dart
+++ b/lib/src/widgets/base_text_form_field.dart
@@ -21,7 +21,8 @@ class BaseTextFormField extends StatelessWidget {
       this.enabled = true,
       this.validator,
       this.textStyle,
-      this.placeholderTextStyle});
+      this.placeholderTextStyle,
+      this.maxLength});
 
   final TextEditingController controller;
   final TextInputType keyboardType;
@@ -42,6 +43,7 @@ class BaseTextFormField extends StatelessWidget {
   final FormFieldValidator<String> validator;
   final TextStyle placeholderTextStyle;
   final TextStyle textStyle;
+  final int maxLength;
 
   @override
   Widget build(BuildContext context) {
@@ -54,6 +56,7 @@ class BaseTextFormField extends StatelessWidget {
       maxLines: maxLines,
       inputFormatters: inputFormatters,
       enabled: enabled,
+      maxLength: maxLength,
       style: textStyle ?? TextStyle(
           fontSize: 16.0,
           color: textColor ?? Theme.of(context).primaryTextTheme.title.color),
diff --git a/lib/src/widgets/picker.dart b/lib/src/widgets/picker.dart
index e9573c1e6..732c2118d 100644
--- a/lib/src/widgets/picker.dart
+++ b/lib/src/widgets/picker.dart
@@ -1,15 +1,20 @@
 import 'dart:ui';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/src/widgets/alert_background.dart';
+import 'package:cake_wallet/src/widgets/cake_scrollbar.dart';
+import 'package:cake_wallet/src/widgets/alert_close_button.dart';
 import 'package:cake_wallet/palette.dart';
 
-class Picker<Item extends Object> extends StatelessWidget {
+class Picker<Item extends Object> extends StatefulWidget {
   Picker({
     @required this.selectedAtIndex,
     @required this.items,
     this.images,
     @required this.title,
     @required this.onItemSelected,
-    this.mainAxisAlignment = MainAxisAlignment.start
+    this.mainAxisAlignment = MainAxisAlignment.start,
+    this.isAlwaysShowScrollThumb = false
   });
 
   final int selectedAtIndex;
@@ -18,59 +23,87 @@ class Picker<Item extends Object> extends StatelessWidget {
   final String title;
   final Function(Item) onItemSelected;
   final MainAxisAlignment mainAxisAlignment;
+  final bool isAlwaysShowScrollThumb;
+
+  @override
+  PickerState createState() => PickerState<Item>(items, images, onItemSelected);
+}
+
+class PickerState<Item> extends State<Picker> {
+  PickerState(this.items, this.images, this.onItemSelected);
+
+  final Function(Item) onItemSelected;
+  final List<Item> items;
+  final List<Image> images;
+
+  final closeButton = Image.asset('assets/images/close.png',
+    color: Palette.darkBlueCraiola,
+  );
+  ScrollController controller = ScrollController();
+
+  final double backgroundHeight = 193;
+  final double thumbHeight = 72;
+  double fromTop = 0;
 
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () => Navigator.of(context).pop(),
-      child: Container(
-        color: Colors.transparent,
-        child: BackdropFilter(
-          filter: ImageFilter.blur(sigmaX: 3.0, sigmaY: 3.0),
-          child: Container(
-              decoration: BoxDecoration(color: PaletteDark.darkNightBlue.withOpacity(0.75)),
-              child: Center(
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
-                    Container(
-                      padding: EdgeInsets.only(left: 24, right: 24),
-                      child: Text(
-                        title,
-                        textAlign: TextAlign.center,
-                        style: TextStyle(
-                            fontSize: 18,
-                            fontWeight: FontWeight.bold,
-                            decoration: TextDecoration.none,
-                            color: Colors.white
-                        ),
-                      ),
+    controller.addListener(() {
+      fromTop = controller.hasClients
+          ? (controller.offset / controller.position.maxScrollExtent * (backgroundHeight - thumbHeight))
+          : 0;
+      setState(() {});
+    });
+
+    return AlertBackground(
+        child: Stack(
+          alignment: Alignment.center,
+          children: <Widget>[
+            Column(
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                Container(
+                  padding: EdgeInsets.only(left: 24, right: 24),
+                  child: Text(
+                    widget.title,
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                        fontSize: 18,
+                        fontFamily: 'Poppins',
+                        fontWeight: FontWeight.bold,
+                        decoration: TextDecoration.none,
+                        color: Colors.white
                     ),
-                    Padding(
-                      padding: EdgeInsets.only(left: 24, right: 24, top: 24),
-                      child: GestureDetector(
-                        onTap: () => null,
-                        child: ClipRRect(
-                          borderRadius: BorderRadius.all(Radius.circular(14)),
-                          child: Container(
-                              height: 233,
-                              color: Theme.of(context).accentTextTheme.title.backgroundColor,
-                              child: ListView.separated(
+                  ),
+                ),
+                Padding(
+                  padding: EdgeInsets.only(left: 24, right: 24, top: 24),
+                  child: GestureDetector(
+                    onTap: () => null,
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.all(Radius.circular(14)),
+                      child: Container(
+                          height: 233,
+                          color: Theme.of(context).accentTextTheme.title.color,
+                          child: Stack(
+                            alignment: Alignment.center,
+                            children: <Widget>[
+                              ListView.separated(
+                                controller: controller,
                                 separatorBuilder: (context, index) => Divider(
-                                  color: Theme.of(context).dividerColor,
+                                  color: Theme.of(context).accentTextTheme.title.backgroundColor,
                                   height: 1,
                                 ),
                                 itemCount: items == null ? 0 : items.length,
                                 itemBuilder: (context, index) {
                                   final item = items[index];
                                   final image = images != null? images[index] : null;
-                                  final isItemSelected = index == selectedAtIndex;
+                                  final isItemSelected = index == widget.selectedAtIndex;
 
                                   final color = isItemSelected
-                                      ? Theme.of(context).accentTextTheme.subtitle.decorationColor
-                                      : Colors.transparent;
+                                      ? Theme.of(context).textTheme.body2.color
+                                      : Theme.of(context).accentTextTheme.title.color;
                                   final textColor = isItemSelected
-                                      ? Colors.blue
+                                      ? Palette.blueCraiola
                                       : Theme.of(context).primaryTextTheme.title.color;
 
                                   return GestureDetector(
@@ -87,21 +120,22 @@ class Picker<Item extends Object> extends StatelessWidget {
                                       color: color,
                                       child: Row(
                                         mainAxisSize: MainAxisSize.max,
-                                        mainAxisAlignment: mainAxisAlignment,
+                                        mainAxisAlignment: widget.mainAxisAlignment,
                                         crossAxisAlignment: CrossAxisAlignment.center,
                                         children: <Widget>[
                                           image != null
-                                          ? image
-                                          : Offstage(),
+                                              ? image
+                                              : Offstage(),
                                           Padding(
                                             padding: EdgeInsets.only(
-                                              left: image != null ? 12 : 0
+                                                left: image != null ? 12 : 0
                                             ),
                                             child: Text(
                                               item.toString(),
                                               style: TextStyle(
                                                 fontSize: 18,
-                                                fontWeight: FontWeight.bold,
+                                                fontFamily: 'Poppins',
+                                                fontWeight: FontWeight.w600,
                                                 color: textColor,
                                                 decoration: TextDecoration.none,
                                               ),
@@ -112,17 +146,25 @@ class Picker<Item extends Object> extends StatelessWidget {
                                     ),
                                   );
                                 },
+                              ),
+                              widget.isAlwaysShowScrollThumb
+                                  ? CakeScrollbar(
+                                  backgroundHeight: backgroundHeight,
+                                  thumbHeight: thumbHeight,
+                                  fromTop: fromTop
                               )
-                          ),
-                        ),
+                                  : Offstage(),
+                            ],
+                          )
                       ),
-                    )
-                  ],
-                ),
-              )
-          ),
-        ),
-      ),
+                    ),
+                  ),
+                )
+              ],
+            ),
+            AlertCloseButton(image: closeButton)
+          ],
+        )
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/themes.dart b/lib/themes.dart
index beadff9e0..be4a5d1d4 100644
--- a/lib/themes.dart
+++ b/lib/themes.dart
@@ -118,6 +118,34 @@ class Themes {
       )
     ),
     focusColor: Colors.white.withOpacity(0.2), // text field button (exchange page)
+    accentTextTheme: TextTheme(
+      title: TextStyle(
+        color: Colors.white, // picker background
+        backgroundColor: Palette.periwinkleCraiola, // picker divider
+        decorationColor: Colors.white // dialog background
+      ),
+      caption: TextStyle(
+        color: Palette.moderateLavender, // container (confirm exchange)
+        backgroundColor: Palette.moderateLavender, // button background (confirm exchange)
+
+
+
+
+        decorationColor: Palette.lavender, // gradient end, wallet label
+      ),
+
+
+
+        subtitle: TextStyle(
+            color: Palette.lightBlueGrey, // border color,  wallet label
+            backgroundColor: Palette.lavender, // address field, wallet card
+            decorationColor: Palette.darkLavender // selected item
+        ),
+        headline: TextStyle(
+            color: Palette.darkLavender, // faq background
+            backgroundColor: Palette.lavender // faq extension
+        )
+    ),
 
 
 
@@ -127,27 +155,7 @@ class Themes {
     ),
 
 
-    accentTextTheme: TextTheme(
-      title: TextStyle(
-        color: Palette.darkLavender, // top panel
-        backgroundColor: Palette.lavender, // bottom panel
-        decorationColor: PaletteDark.distantBlue // select button background color
-      ),
-      caption: TextStyle(
-        color: Palette.blue, // current wallet label
-        backgroundColor: Colors.white, // gradient start, wallet label
-        decorationColor: Palette.lavender, // gradient end, wallet label
-      ),
-      subtitle: TextStyle(
-        color: Palette.lightBlueGrey, // border color,  wallet label
-        backgroundColor: Palette.lavender, // address field, wallet card
-        decorationColor: Palette.darkLavender // selected item
-      ),
-      headline: TextStyle(
-        color: Palette.darkLavender, // faq background
-        backgroundColor: Palette.lavender // faq extension
-      )
-    ),
+
   );
 
 
@@ -266,6 +274,33 @@ class Themes {
       )
     ),
     focusColor: PaletteDark.moderateBlue, // text field button (exchange page)
+    accentTextTheme: TextTheme(
+      title: TextStyle(
+        color: PaletteDark.nightBlue, // picker background
+        backgroundColor: PaletteDark.dividerColor, // picker divider
+        decorationColor: PaletteDark.darkNightBlue // dialog background
+      ),
+      caption: TextStyle(
+        color: PaletteDark.nightBlue, // container (confirm exchange)
+        backgroundColor: PaletteDark.deepVioletBlue, // button background (confirm exchange)
+
+
+
+        decorationColor: PaletteDark.nightBlue, // gradient end, wallet label
+      ),
+
+
+
+        subtitle: TextStyle(
+            color: PaletteDark.darkNightBlue, // border color,  wallet label
+            backgroundColor: PaletteDark.violetBlue, // address field, wallet card
+            decorationColor: PaletteDark.headerNightBlue // selected item
+        ),
+        headline: TextStyle(
+            color: PaletteDark.lightNightBlue, // faq background
+            backgroundColor: PaletteDark.headerNightBlue // faq extension
+        )
+    ),
 
 
 
@@ -276,27 +311,7 @@ class Themes {
 
 
 
-    accentTextTheme: TextTheme(
-      title: TextStyle(
-        color: PaletteDark.moderateBlue, // top panel
-        backgroundColor: PaletteDark.lightNightBlue, // bottom panel
-        decorationColor: Colors.white // select button background color
-      ),
-      caption: TextStyle(
-        color: Colors.white, // current wallet label
-        backgroundColor: PaletteDark.distantBlue, // gradient start, wallet label
-        decorationColor: PaletteDark.nightBlue, // gradient end, wallet label
-      ),
-      subtitle: TextStyle(
-        color: PaletteDark.darkNightBlue, // border color,  wallet label
-        backgroundColor: PaletteDark.violetBlue, // address field, wallet card
-        decorationColor: PaletteDark.headerNightBlue // selected item
-      ),
-      headline: TextStyle(
-        color: PaletteDark.lightNightBlue, // faq background
-        backgroundColor: PaletteDark.headerNightBlue // faq extension
-      )
-    ),
+
   );
 
 }
\ No newline at end of file
diff --git a/lib/view_model/dashboard/dashboard_view_model.dart b/lib/view_model/dashboard/dashboard_view_model.dart
index 65deb5f92..c98ddc1e9 100644
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@@ -108,7 +108,8 @@ abstract class DashboardViewModelBase with Store {
 
     _items
         .addAll(transactionFilterStore.filtered(transactions: transactions));
-    _items.addAll(tradeFilterStore.filtered(trades: trades));
+    //_items.addAll(tradeFilterStore.filtered(trades: trades));
+    _items.addAll(trades); // FIXME
 
     return formattedItemsList(_items);
   }
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 4fb5a1dbf..bec3a5754 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -227,7 +227,7 @@ abstract class ExchangeViewModelBase with Store {
         }
       }
     } else {
-      tradeState = TradeIsCreatedFailure(error: S.current.error_text_limits_loading_failed("${provider.description}"));
+      tradeState = TradeIsCreatedFailure(error: S.current.error_text_limits_loading_failed('${provider.description}'));
     }
 
   }

From 76cde0530de6a02585408e514d0c6e45cee84b06 Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Wed, 26 Aug 2020 20:31:23 +0300
Subject: [PATCH 12/15] CAKE-28 | created information page, exchange trade view
 model, exchange trade item; added trade property to trades store; changed
 filtered method (trade filter store); added tradesStore property to exchange
 view model; applied information page to exchange trade page

---
 lib/di.dart                                   |  22 +++-
 lib/generated/i18n.dart                       |  48 ++++----
 lib/palette.dart                              |   2 +-
 lib/router.dart                               |  11 +-
 .../widgets/base_exchange_widget.dart         |   2 +-
 .../exchange_trade/exchange_confirm_page.dart |  26 +---
 .../exchange_trade/exchange_trade_item.dart   |  13 ++
 .../exchange_trade/exchange_trade_page.dart   | 113 +++++++++++++++---
 .../exchange_trade/information_page.dart      |  57 +++++++++
 .../widgets/exchange_trade_row.dart           |   8 ++
 lib/store/dashboard/trade_filter_store.dart   |   7 +-
 lib/store/dashboard/trades_store.dart         |   6 +
 lib/themes.dart                               |  11 +-
 .../dashboard/dashboard_view_model.dart       |   3 +-
 .../exchange/exchange_trade_view_model.dart   |  68 +++++++++++
 .../exchange/exchange_view_model.dart         |  10 +-
 res/values/strings_de.arb                     |   4 +-
 res/values/strings_en.arb                     |   4 +-
 res/values/strings_es.arb                     |   4 +-
 res/values/strings_hi.arb                     |   4 +-
 res/values/strings_ja.arb                     |   4 +-
 res/values/strings_ko.arb                     |   4 +-
 res/values/strings_nl.arb                     |   4 +-
 res/values/strings_pl.arb                     |   4 +-
 res/values/strings_pt.arb                     |   4 +-
 res/values/strings_ru.arb                     |   4 +-
 res/values/strings_uk.arb                     |   4 +-
 res/values/strings_zh.arb                     |   4 +-
 28 files changed, 344 insertions(+), 111 deletions(-)
 create mode 100644 lib/src/screens/exchange_trade/exchange_trade_item.dart
 create mode 100644 lib/src/screens/exchange_trade/information_page.dart
 create mode 100644 lib/src/screens/exchange_trade/widgets/exchange_trade_row.dart
 create mode 100644 lib/view_model/exchange/exchange_trade_view_model.dart

diff --git a/lib/di.dart b/lib/di.dart
index 1d903d7f7..83846c80b 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -4,6 +4,8 @@ import 'package:cake_wallet/src/domain/common/node.dart';
 import 'package:cake_wallet/src/domain/exchange/trade.dart';
 import 'package:cake_wallet/src/screens/contact/contact_list_page.dart';
 import 'package:cake_wallet/src/screens/contact/contact_page.dart';
+import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dart';
+import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart';
 import 'package:cake_wallet/src/screens/nodes/node_create_or_edit_page.dart';
 import 'package:cake_wallet/src/screens/nodes/nodes_list_page.dart';
 import 'package:cake_wallet/src/screens/seed/wallet_seed_page.dart';
@@ -32,6 +34,7 @@ import 'package:cake_wallet/store/wallet_list_store.dart';
 import 'package:cake_wallet/theme_changer.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_view_model.dart';
+import 'package:cake_wallet/view_model/exchange/exchange_trade_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/node_list_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart';
@@ -118,8 +121,7 @@ Future setup(
   getIt.registerSingleton<TradesStore>(TradesStore(
       tradesSource: tradesSource,
       settingsStore: getIt.get<SettingsStore>()));
-  getIt.registerSingleton<TradeFilterStore>(
-      TradeFilterStore(wallet: getIt.get<AppStore>().wallet));
+  getIt.registerSingleton<TradeFilterStore>(TradeFilterStore());
   getIt.registerSingleton<TransactionFilterStore>(TransactionFilterStore());
   getIt.registerSingleton<FiatConvertationStore>(FiatConvertationStore());
   getIt.registerSingleton<SendTemplateStore>(
@@ -311,12 +313,26 @@ Future setup(
       ExchangeViewModel(
         wallet: getIt.get<AppStore>().wallet,
         exchangeTemplateStore: getIt.get<ExchangeTemplateStore>(),
-        trades: tradesSource
+        trades: tradesSource,
+        tradesStore: getIt.get<TradesStore>()
+      ));
+
+  getIt.registerFactory(() =>
+      ExchangeTradeViewModel(
+        wallet: getIt.get<AppStore>().wallet,
+        trades: tradesSource,
+        tradesStore: getIt.get<TradesStore>()
       ));
 
   getIt.registerFactory(() =>
       ExchangePage(getIt.get<ExchangeViewModel>()));
 
+  getIt.registerFactory(() =>
+      ExchangeConfirmPage(tradesStore: getIt.get<TradesStore>()));
+
+  getIt.registerFactory(() =>
+      ExchangeTradePage(exchangeTradeViewModel: getIt.get<ExchangeTradeViewModel>()));
+
   getIt.registerFactory(() =>
       ExchangeTemplatePage(getIt.get<ExchangeViewModel>()));
 }
diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart
index 4c9a59474..79dfa351a 100644
--- a/lib/generated/i18n.dart
+++ b/lib/generated/i18n.dart
@@ -312,8 +312,8 @@ class S implements WidgetsLocalizations {
   String error_text_limits_loading_failed(String provider) => "Trade for ${provider} is not created. Limits loading failed";
   String error_text_maximum_limit(String provider, String max, String currency) => "Trade for ${provider} is not created. Amount is more then maximum: ${max} ${currency}";
   String error_text_minimal_limit(String provider, String min, String currency) => "Trade for ${provider} is not created. Amount is less then minimal: ${min} ${currency}";
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "By pressing confirm, you will be sending ${fetchingLabel} ${from} from your wallet called ${walletName} to the address shown above. Or you can send from your external wallet to the above address/QR code.\n\nPlease press confirm to continue or go back to change the amounts.\n\n";
-  String exchange_result_description(String fetchingLabel, String from) => "Please send ${fetchingLabel} ${from} to the address shown above.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "By pressing confirm, you will be sending ${fetchingLabel} ${from} from your wallet called ${walletName} to the address shown above. Or you can send from your external wallet to the above address/QR code.\n\nPlease press confirm to continue or go back to change the amounts.";
+  String exchange_result_description(String fetchingLabel, String from) => "Please send ${fetchingLabel} ${from} to the address shown above.";
   String failed_authentication(String state_error) => "Failed authentication. ${state_error}";
   String max_value(String value, String currency) => "Max: ${value} ${currency}";
   String min_value(String value, String currency) => "Min: ${value} ${currency}";
@@ -948,11 +948,11 @@ class $de extends S {
   @override
   String Blocks_remaining(String status) => "${status} Verbleibende Blöcke";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Durch Drücken von Bestätigen wird gesendet ${fetchingLabel} ${from} von Ihrer Brieftasche aus angerufen ${walletName} an die oben angegebene Adresse. Oder Sie können von Ihrem externen Portemonnaie an die oben angegebene Adresse / QR-Code senden.\n\nBitte bestätigen Sie, um fortzufahren, oder gehen Sie zurück, um die Beträge zu änderns.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Durch Drücken von Bestätigen wird gesendet ${fetchingLabel} ${from} von Ihrer Brieftasche aus angerufen ${walletName} an die oben angegebene Adresse. Oder Sie können von Ihrem externen Portemonnaie an die oben angegebene Adresse / QR-Code senden.\n\nBitte bestätigen Sie, um fortzufahren, oder gehen Sie zurück, um die Beträge zu änderns.";
   @override
   String error_text_limits_loading_failed(String provider) => "Handel für ${provider} wird nicht erstellt. Das Laden der Limits ist fehlgeschlagen";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Bitte senden ${fetchingLabel} ${from} an die oben angegebene Adresse.\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "Bitte senden ${fetchingLabel} ${from} an die oben angegebene Adresse.'";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Transaktion festschreiben\nMenge: ${amount}\nGebühr: ${fee}";
   @override
@@ -1580,11 +1580,11 @@ class $hi extends S {
   @override
   String Blocks_remaining(String status) => "${status} शेष रहते हैं";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "पुष्टि दबाकर, आप भेज रहे होंगे ${fetchingLabel} ${from} अपने बटुए से ${walletName} ऊपर दिखाए गए पते पर। या आप अपने बाहरी वॉलेट से उपरोक्त पते / क्यूआर कोड पर भेज सकते हैं।\n\nकृपया जारी रखने या राशि बदलने के लिए वापस जाने के लिए पुष्टि करें दबाएं.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "पुष्टि दबाकर, आप भेज रहे होंगे ${fetchingLabel} ${from} अपने बटुए से ${walletName} ऊपर दिखाए गए पते पर। या आप अपने बाहरी वॉलेट से उपरोक्त पते / क्यूआर कोड पर भेज सकते हैं।\n\nकृपया जारी रखने या राशि बदलने के लिए वापस जाने के लिए पुष्टि करें दबाएं.";
   @override
   String error_text_limits_loading_failed(String provider) => "व्यापार ${provider} के लिए नहीं बनाया गया है। लोडिंग की सीमाएं विफल रहीं";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "कृपया भेजें ${fetchingLabel} ${from} ऊपर दिखाए गए पते पर\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "कृपया भेजें ${fetchingLabel} ${from} ऊपर दिखाए गए पते पर";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "लेन-देन करें\nरकम: ${amount}\nशुल्क: ${fee}";
   @override
@@ -2212,11 +2212,11 @@ class $ru extends S {
   @override
   String Blocks_remaining(String status) => "${status} Осталось блоков";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Нажимая подтвердить, вы отправите ${fetchingLabel} ${from} с вашего кошелька ${walletName} на адрес указанный выше. Или вы можете отправить со своего внешнего кошелька на вышеуказанный адрес/QR-код.\n\nПожалуйста, нажмите подтвердить для продолжения, или вернитесь назад для изменения суммы.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Нажимая подтвердить, вы отправите ${fetchingLabel} ${from} с вашего кошелька ${walletName} на адрес указанный выше. Или вы можете отправить со своего внешнего кошелька на вышеуказанный адрес/QR-код.\n\nПожалуйста, нажмите подтвердить для продолжения, или вернитесь назад для изменения суммы.";
   @override
   String error_text_limits_loading_failed(String provider) => "Сделка для ${provider} не создана. Ошибка загрузки лимитов";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Пожалуйста отправьте ${fetchingLabel} ${from} на адрес, указанный выше.\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "Пожалуйста отправьте ${fetchingLabel} ${from} на адрес, указанный выше.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Подтвердить транзакцию \nСумма: ${amount}\nКомиссия: ${fee}";
   @override
@@ -2844,11 +2844,11 @@ class $ko extends S {
   @override
   String Blocks_remaining(String status) => "${status} 남은 블록";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "확인을 누르면 전송됩니다 ${fetchingLabel} ${from} 지갑에서 ${walletName} 위에 표시된 주소로. 또는 외부 지갑에서 위의 주소 / QR 코드로 보낼 수 있습니다.\n\n확인을 눌러 계속하거나 금액을 변경하려면 돌아가십시오.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "확인을 누르면 전송됩니다 ${fetchingLabel} ${from} 지갑에서 ${walletName} 위에 표시된 주소로. 또는 외부 지갑에서 위의 주소 / QR 코드로 보낼 수 있습니다.\n\n확인을 눌러 계속하거나 금액을 변경하려면 돌아가십시오.";
   @override
   String error_text_limits_loading_failed(String provider) => "거래 ${provider} 가 생성되지 않습니다. 로딩 실패";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "보내주세요 ${fetchingLabel} ${from} 위에 표시된 주소로.\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "보내주세요 ${fetchingLabel} ${from} 위에 표시된 주소로.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "커밋 거래\n양: ${amount}\n보수: ${fee}";
   @override
@@ -3476,11 +3476,11 @@ class $pt extends S {
   @override
   String Blocks_remaining(String status) => "${status} blocos restantes";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Ao confirmar, você enviará ${fetchingLabel} ${from} da sua carteira  ${walletName} para o endereço exibido acima. Você também pode enviar com uma carteira externa para o endereço/código QR acima.\n\nPressione Confirmar para continuar ou volte para alterar os valores.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Ao confirmar, você enviará ${fetchingLabel} ${from} da sua carteira  ${walletName} para o endereço exibido acima. Você também pode enviar com uma carteira externa para o endereço/código QR acima.\n\nPressione Confirmar para continuar ou volte para alterar os valores.";
   @override
   String error_text_limits_loading_failed(String provider) => "A troca por ${provider} não é criada. Falha no carregamento dos limites";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Por favor, envie ${fetchingLabel} ${from} para o endereço mostrado acima.\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "Por favor, envie ${fetchingLabel} ${from} para o endereço mostrado acima.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Confirmar transação\nQuantia: ${amount}\nTaxa: ${fee}";
   @override
@@ -4108,11 +4108,11 @@ class $uk extends S {
   @override
   String Blocks_remaining(String status) => "${status} Залишилось блоків";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Натиснувши підтвердити, ви відправите ${fetchingLabel} ${from} з вашого гаманця ${walletName} на адресу вказану вище. Або ви можете відправити зі свого зовнішнього гаманця на вищевказану адресу/QR-код.\n\nБудь ласка, натисніть підтвердити для продовження або поверніться назад щоб змінити суму.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Натиснувши підтвердити, ви відправите ${fetchingLabel} ${from} з вашого гаманця ${walletName} на адресу вказану вище. Або ви можете відправити зі свого зовнішнього гаманця на вищевказану адресу/QR-код.\n\nБудь ласка, натисніть підтвердити для продовження або поверніться назад щоб змінити суму.";
   @override
   String error_text_limits_loading_failed(String provider) => "Операція для ${provider} не створена. Помилка завантаження лімітів";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Будь ласка, відправте ${fetchingLabel} ${from} на адресу, вказану вище.\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "Будь ласка, відправте ${fetchingLabel} ${from} на адресу, вказану вище.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Підтвердити транзакцію \nСума: ${amount}\nКомісія: ${fee}";
   @override
@@ -4740,11 +4740,11 @@ class $ja extends S {
   @override
   String Blocks_remaining(String status) => "${status} 残りのブロック";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "確認を押すと、送信されます ${fetchingLabel} ${from} と呼ばれるあなたの財布から ${walletName} 上記のアドレスへ. または、外部ウォレットから上記のアドレス/ QRコードに送信できます.\n\n確認を押して続行するか、戻って金額を変更してください.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "確認を押すと、送信されます ${fetchingLabel} ${from} と呼ばれるあなたの財布から ${walletName} 上記のアドレスへ. または、外部ウォレットから上記のアドレス/ QRコードに送信できます.\n\n確認を押して続行するか、戻って金額を変更してください.";
   @override
   String error_text_limits_loading_failed(String provider) => "${provider} の取引は作成されません。 制限の読み込みに失敗しました";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "送信してください ${fetchingLabel} ${from} 上記のアドレスへ.\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "送信してください ${fetchingLabel} ${from} 上記のアドレスへ.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "トランザクションをコミット\n量: ${amount}\n費用: ${fee}";
   @override
@@ -5376,11 +5376,11 @@ class $pl extends S {
   @override
   String Blocks_remaining(String status) => "${status} Bloki pozostałe";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Naciskając Potwierdź, wyślesz ${fetchingLabel} ${from} z twojego portfela ${walletName} z twojego portfela. Lub możesz wysłać z zewnętrznego portfela na powyższy adres / kod QR.\n\nNaciśnij Potwierdź, aby kontynuować lub wróć, aby zmienić kwoty.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Naciskając Potwierdź, wyślesz ${fetchingLabel} ${from} z twojego portfela ${walletName} z twojego portfela. Lub możesz wysłać z zewnętrznego portfela na powyższy adres / kod QR.\n\nNaciśnij Potwierdź, aby kontynuować lub wróć, aby zmienić kwoty.";
   @override
   String error_text_limits_loading_failed(String provider) => "Wymiana dla ${provider} nie została utworzona. Ładowanie limitów nie powiodło się";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Proszę wyślij ${fetchingLabel} ${from} na adres podany powyżej.\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "Proszę wyślij ${fetchingLabel} ${from} na adres podany powyżej.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Zatwierdź transakcję\nIlość: ${amount}\nOpłata: ${fee}";
   @override
@@ -6008,11 +6008,11 @@ class $es extends S {
   @override
   String Blocks_remaining(String status) => "${status} Bloques restantes";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Al presionar confirmar, enviará ${fetchingLabel} ${from} desde su billetera llamada ${walletName} a la dirección que se muestra arriba.  O puede enviar desde su billetera externa a la dirección / código QR anterior.\n\nPresione confirmar para continuar o regrese para cambiar los montos.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Al presionar confirmar, enviará ${fetchingLabel} ${from} desde su billetera llamada ${walletName} a la dirección que se muestra arriba.  O puede enviar desde su billetera externa a la dirección / código QR anterior.\n\nPresione confirmar para continuar o regrese para cambiar los montos.";
   @override
   String error_text_limits_loading_failed(String provider) => "El comercio por ${provider} no se crea. Límites de carga fallidos";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Envíe ${fetchingLabel} ${from} a la dirección que se muestra arriba.\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "Envíe ${fetchingLabel} ${from} a la dirección que se muestra arriba.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Confirmar transacción\nCantidad: ${amount}\nCuota: ${fee}";
   @override
@@ -6640,11 +6640,11 @@ class $nl extends S {
   @override
   String Blocks_remaining(String status) => "${status} Resterende blokken";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Door op bevestigen te drukken, wordt u verzonden ${fetchingLabel} ${from} uit je portemonnee genoemd ${walletName} naar bovenstaand adres. Of u kunt uw externe portemonnee naar bovenstaand adres / QR-code sturen.\n\nDruk op bevestigen om door te gaan of terug te gaan om de bedragen te wijzigen.\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "Door op bevestigen te drukken, wordt u verzonden ${fetchingLabel} ${from} uit je portemonnee genoemd ${walletName} naar bovenstaand adres. Of u kunt uw externe portemonnee naar bovenstaand adres / QR-code sturen.\n\nDruk op bevestigen om door te gaan of terug te gaan om de bedragen te wijzigen.";
   @override
   String error_text_limits_loading_failed(String provider) => "Ruil voor ${provider} is niet gemaakt. Beperkingen laden mislukt";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Zend alstublieft ${fetchingLabel} ${from} naar bovenstaand adres.\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "Zend alstublieft ${fetchingLabel} ${from} naar bovenstaand adres.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Verricht transactie\nBedrag: ${amount}\nhonorarium: ${fee}";
   @override
@@ -7272,11 +7272,11 @@ class $zh extends S {
   @override
   String Blocks_remaining(String status) => "${status} 剩余的块";
   @override
-  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "点击确认 您将发送 ${fetchingLabel} ${from} 从你的钱包里 ${walletName} 到上面显示的地址. 或者，您也可以从外部钱包发送上述地址/ QR码。\n\n请按确认继续或返回以更改金额\n\n";
+  String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "点击确认 您将发送 ${fetchingLabel} ${from} 从你的钱包里 ${walletName} 到上面显示的地址. 或者，您也可以从外部钱包发送上述地址/ QR码。\n\n请按确认继续或返回以更改金额";
   @override
   String error_text_limits_loading_failed(String provider) => "未創建 ${provider} 交易。 限制加載失敗";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "请发送 ${fetchingLabel} ${from} 到上面显示的地址.\n\n'";
+  String exchange_result_description(String fetchingLabel, String from) => "请发送 ${fetchingLabel} ${from} 到上面显示的地址.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "提交交易\n量: ${amount}\nFee: ${fee}";
   @override
diff --git a/lib/palette.dart b/lib/palette.dart
index d2c761bff..d73ad9ba1 100644
--- a/lib/palette.dart
+++ b/lib/palette.dart
@@ -11,7 +11,7 @@ class Palette {
   static const Color lightBlueGrey = Color.fromRGBO(118, 131, 169, 1.0);
   static const Color periwinkle = Color.fromRGBO(197, 208, 230, 1.0);
   static const Color blue = Color.fromRGBO(88, 143, 252, 1.0);
-  static const Color darkLavender = Color.fromRGBO(225, 238, 250, 1.0);
+  static const Color darkLavender = Color.fromRGBO(229, 238, 250, 1.0);
   static const Color nightBlue = Color.fromRGBO(46, 57, 96, 1.0);
 
   // NEW DESIGN
diff --git a/lib/router.dart b/lib/router.dart
index 6c03dc1dd..68e010293 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -358,7 +358,9 @@ class Router {
 
       case Routes.exchangeTrade:
         return CupertinoPageRoute<void>(
-            builder: (_) => MultiProvider(
+            builder: (_) => getIt.get<ExchangeTradePage>());
+
+                /*MultiProvider(
                   providers: [
                     ProxyProvider<SettingsStore, ExchangeTradeStore>(
                       update: (_, settingsStore, __) => ExchangeTradeStore(
@@ -374,12 +376,13 @@ class Router {
                             priceStore: priceStore)),
                   ],
                   child: ExchangeTradePage(),
-                ));
+                ));*/
 
       case Routes.exchangeConfirm:
         return MaterialPageRoute<void>(
-            builder: (_) =>
-                ExchangeConfirmPage(trade: settings.arguments as Trade));
+            builder: (_) => getIt.get<ExchangeConfirmPage>());
+
+                //ExchangeConfirmPage(trade: settings.arguments as Trade));
 
       case Routes.tradeDetails:
         return MaterialPageRoute<void>(builder: (context) {
diff --git a/lib/src/screens/exchange/widgets/base_exchange_widget.dart b/lib/src/screens/exchange/widgets/base_exchange_widget.dart
index 34a5ce94f..f3aa14e0a 100644
--- a/lib/src/screens/exchange/widgets/base_exchange_widget.dart
+++ b/lib/src/screens/exchange/widgets/base_exchange_widget.dart
@@ -486,7 +486,7 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
       }
       if (state is TradeIsCreatedSuccessfully) {
         Navigator.of(context)
-            .pushNamed(Routes.exchangeConfirm, arguments: state.trade);
+            .pushNamed(Routes.exchangeConfirm);
       }
     });
 
diff --git a/lib/src/screens/exchange_trade/exchange_confirm_page.dart b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
index 0ad35f423..7cdb61c47 100644
--- a/lib/src/screens/exchange_trade/exchange_confirm_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
@@ -9,33 +10,14 @@ import 'package:cake_wallet/src/domain/exchange/trade.dart';
 import 'package:cake_wallet/palette.dart';
 
 class ExchangeConfirmPage extends BasePage {
-  ExchangeConfirmPage({@required this.trade});
+  ExchangeConfirmPage({@required this.tradesStore}) : trade = tradesStore.trade;
 
+  final TradesStore tradesStore;
   final Trade trade;
 
   @override
   String get title => S.current.copy_id;
 
-  @override
-  Widget trailing(BuildContext context) {
-    final questionImage = Image.asset('assets/images/question_mark.png',
-        color: Theme.of(context).primaryTextTheme.title.color);
-
-    return SizedBox(
-      height: 20.0,
-      width: 20.0,
-      child: ButtonTheme(
-        minWidth: double.minPositive,
-        child: FlatButton(
-          highlightColor: Colors.transparent,
-          splashColor: Colors.transparent,
-          padding: EdgeInsets.all(0),
-          onPressed: () {},
-          child: questionImage),
-      ),
-    );
-  }
-
   @override
   Widget body(BuildContext context) {
     return Container(
@@ -131,7 +113,7 @@ class ExchangeConfirmPage extends BasePage {
           ),
           PrimaryButton(
               onPressed: () => Navigator.of(context)
-                  .pushReplacementNamed(Routes.exchangeTrade, arguments: trade),
+                  .pushReplacementNamed(Routes.exchangeTrade),
               text: S.of(context).saved_the_trade_id,
               color: Palette.blueCraiola,
               textColor: Colors.white)
diff --git a/lib/src/screens/exchange_trade/exchange_trade_item.dart b/lib/src/screens/exchange_trade/exchange_trade_item.dart
new file mode 100644
index 000000000..78e9995ad
--- /dev/null
+++ b/lib/src/screens/exchange_trade/exchange_trade_item.dart
@@ -0,0 +1,13 @@
+import 'package:flutter/cupertino.dart';
+
+class ExchangeTradeItem {
+  ExchangeTradeItem({
+    @required this.title,
+    @required this.data,
+    @required this.isCopied,
+  });
+
+  final String title;
+  final String data;
+  final bool isCopied;
+}
\ No newline at end of file
diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart
index 05602a7fd..5b8ce2525 100644
--- a/lib/src/screens/exchange_trade/exchange_trade_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart
@@ -1,5 +1,9 @@
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_item.dart';
+import 'package:cake_wallet/src/screens/exchange_trade/information_page.dart';
+import 'package:cake_wallet/view_model/exchange/exchange_trade_view_model.dart';
 import 'package:mobx/mobx.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -19,15 +23,62 @@ import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 
+void showInformation(ExchangeTradeViewModel exchangeTradeViewModel, BuildContext context) {
+  final fetchingLabel = S.current.fetching;
+  final trade = exchangeTradeViewModel.trade;
+  final walletName = exchangeTradeViewModel.wallet.name;
+
+  final information = exchangeTradeViewModel.isSendable
+      ? S.current.exchange_result_confirm(
+      trade.amount ?? fetchingLabel,
+      trade.from.toString(),
+      walletName)
+      : S.current.exchange_result_description(
+      trade.amount ?? fetchingLabel, trade.from.toString());
+
+  showDialog<void>(
+    context: context,
+    builder: (_) => InformationPage(information: information)
+  );
+}
+
 class ExchangeTradePage extends BasePage {
+  ExchangeTradePage({@required this.exchangeTradeViewModel});
+
+  final ExchangeTradeViewModel exchangeTradeViewModel;
+
   @override
   String get title => S.current.exchange;
 
   @override
-  Widget body(BuildContext context) => ExchangeTradeForm();
+  Widget trailing(BuildContext context) {
+    final questionImage = Image.asset('assets/images/question_mark.png',
+        color: Theme.of(context).primaryTextTheme.title.color);
+
+    return SizedBox(
+      height: 20.0,
+      width: 20.0,
+      child: ButtonTheme(
+        minWidth: double.minPositive,
+        child: FlatButton(
+            highlightColor: Colors.transparent,
+            splashColor: Colors.transparent,
+            padding: EdgeInsets.all(0),
+            onPressed: () => showInformation(exchangeTradeViewModel, context),
+            child: questionImage),
+      ),
+    );
+  }
+
+  @override
+  Widget body(BuildContext context) => ExchangeTradeForm(exchangeTradeViewModel);
 }
 
 class ExchangeTradeForm extends StatefulWidget {
+  ExchangeTradeForm(this.exchangeTradeViewModel);
+
+  final ExchangeTradeViewModel exchangeTradeViewModel;
+
   @override
   ExchangeTradeState createState() => ExchangeTradeState();
 }
@@ -35,23 +86,49 @@ class ExchangeTradeForm extends StatefulWidget {
 class ExchangeTradeState extends State<ExchangeTradeForm> {
   final fetchingLabel = S.current.fetching;
   String get title => S.current.exchange;
+  List<ExchangeTradeItem> items;
 
   bool _effectsInstalled = false;
 
   @override
-  Widget build(BuildContext context) {
-    final tradeStore = Provider.of<ExchangeTradeStore>(context);
-    final sendStore = Provider.of<SendStore>(context);
-    final walletStore = Provider.of<WalletStore>(context);
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback(afterLayout);
 
-    _setEffects(context);
+    items = [
+      ExchangeTradeItem(
+        title: S.current.id,
+        data: '${widget.exchangeTradeViewModel.trade.id ?? fetchingLabel}',
+        isCopied: true),
+      ExchangeTradeItem(
+        title: S.current.amount,
+        data: '${widget.exchangeTradeViewModel.trade.amount ?? fetchingLabel}',
+        isCopied: false),
+      ExchangeTradeItem(
+        title: S.current.status,
+        data: '${widget.exchangeTradeViewModel.trade.state ?? fetchingLabel}',
+        isCopied: false),
+      ExchangeTradeItem(
+        title: S.current.widgets_address,
+        data: widget.exchangeTradeViewModel.trade.inputAddress ?? fetchingLabel,
+        isCopied: true),
+    ];
+  }
+
+  void afterLayout(dynamic _) {
+    showInformation(widget.exchangeTradeViewModel, context);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+
+    //_setEffects(context);
 
     return Container(
       child: ScrollableWithBottomSection(
         contentPadding: EdgeInsets.only(left: 24, right: 24, top: 24),
         content: Observer(builder: (_) {
-          final trade = tradeStore.trade;
-          final walletName = walletStore.name;
+          final trade = widget.exchangeTradeViewModel.trade;
 
           return Column(
             mainAxisAlignment: MainAxisAlignment.start,
@@ -268,10 +345,10 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                   ],
                 ),
               ),
-              Container(
+              /*Container(
                 padding: EdgeInsets.only(top: 20),
                 child: Text(
-                  tradeStore.isSendable
+                  widget.exchangeTradeViewModel.isSendable
                       ? S.of(context).exchange_result_confirm(
                       trade.amount ?? fetchingLabel,
                       trade.from.toString(),
@@ -283,7 +360,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                       fontSize: 13.0,
                       color: Theme.of(context).primaryTextTheme.title.color),
                 ),
-              ),
+              ),*/
               Text(
                 S.of(context).exchange_result_write_down_ID,
                 textAlign: TextAlign.left,
@@ -295,7 +372,13 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
           );
         }),
         bottomSectionPadding: EdgeInsets.all(24),
-        bottomSection: Observer(
+        bottomSection: PrimaryButton(
+          onPressed: () {},
+          text: S.of(context).confirm,
+          color: Palette.blueCraiola,
+          textColor: Colors.white
+        )
+        /*Observer(
             builder: (_) => tradeStore.trade.from == CryptoCurrency.xmr &&
                 !(sendStore.state is TransactionCommitted)
                 ? LoadingPrimaryButton(
@@ -312,7 +395,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                     : S.of(context).send_xmr,
                 color: Colors.blue,
                 textColor: Colors.white)
-                : Offstage()),
+                : Offstage()),*/
       ),
     );
   }
@@ -322,7 +405,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
       return;
     }
 
-    final sendStore = Provider.of<SendStore>(context);
+    /*final sendStore = Provider.of<SendStore>(context);
 
     reaction((_) => sendStore.state, (SendingState state) {
       if (state is SendingFailed) {
@@ -376,7 +459,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
               });
         });
       }
-    });
+    });*/
 
     _effectsInstalled = true;
   }
diff --git a/lib/src/screens/exchange_trade/information_page.dart b/lib/src/screens/exchange_trade/information_page.dart
new file mode 100644
index 000000000..bf622cb86
--- /dev/null
+++ b/lib/src/screens/exchange_trade/information_page.dart
@@ -0,0 +1,57 @@
+import 'dart:ui';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/src/widgets/alert_background.dart';
+
+class InformationPage extends StatelessWidget {
+  InformationPage({@required this.information});
+
+  final String information;
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertBackground(
+      child: Center(
+        child: Container(
+          margin: EdgeInsets.only(
+            left: 24,
+            right: 24
+          ),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(30)),
+            color: Theme.of(context).textTheme.body2.decorationColor
+          ),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              Container(
+                padding: EdgeInsets.fromLTRB(24, 28, 24, 24),
+                child: Text(
+                  information,
+                  style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.normal,
+                    fontFamily: 'Poppins',
+                    decoration: TextDecoration.none,
+                    color: Theme.of(context).accentTextTheme.caption.decorationColor
+                  ),
+                ),
+              ),
+              Padding(
+                padding: EdgeInsets.fromLTRB(10, 0, 10, 10),
+                child: PrimaryButton(
+                  onPressed: () => Navigator.of(context).pop(),
+                  text: S.of(context).send_got_it,
+                  color: Theme.of(context).accentTextTheme.caption.backgroundColor,
+                  textColor: Theme.of(context).primaryTextTheme.title.color
+                ),
+              )
+            ],
+          ),
+        ),
+      )
+    );
+  }
+}
diff --git a/lib/src/screens/exchange_trade/widgets/exchange_trade_row.dart b/lib/src/screens/exchange_trade/widgets/exchange_trade_row.dart
new file mode 100644
index 000000000..ba20dd413
--- /dev/null
+++ b/lib/src/screens/exchange_trade/widgets/exchange_trade_row.dart
@@ -0,0 +1,8 @@
+import 'package:flutter/material.dart';
+
+class ExchangeTradeRow extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Container();
+  }
+}
\ No newline at end of file
diff --git a/lib/store/dashboard/trade_filter_store.dart b/lib/store/dashboard/trade_filter_store.dart
index 2e1c7ed62..064b092f6 100644
--- a/lib/store/dashboard/trade_filter_store.dart
+++ b/lib/store/dashboard/trade_filter_store.dart
@@ -11,8 +11,7 @@ abstract class TradeFilterStoreBase with Store {
   TradeFilterStoreBase(
       {this.displayXMRTO = true,
         this.displayChangeNow = true,
-        this.displayMorphToken = true,
-        this.wallet});
+        this.displayMorphToken = true});
 
   @observable
   bool displayXMRTO;
@@ -23,8 +22,6 @@ abstract class TradeFilterStoreBase with Store {
   @observable
   bool displayMorphToken;
 
-  WalletBase wallet;
-
   @action
   void toggleDisplayExchange(ExchangeProviderDescription provider) {
     switch (provider) {
@@ -40,7 +37,7 @@ abstract class TradeFilterStoreBase with Store {
     }
   }
 
-  List<TradeListItem> filtered({List<TradeListItem> trades}) {
+  List<TradeListItem> filtered({List<TradeListItem> trades, WalletBase wallet}) {
     final _trades =
     trades.where((item) => item.trade.walletId == wallet.id).toList();
     final needToFilter = !displayChangeNow || !displayXMRTO || !displayMorphToken;
diff --git a/lib/store/dashboard/trades_store.dart b/lib/store/dashboard/trades_store.dart
index 4f526c637..26a6b292b 100644
--- a/lib/store/dashboard/trades_store.dart
+++ b/lib/store/dashboard/trades_store.dart
@@ -27,6 +27,12 @@ abstract class TradesStoreBase with Store {
   @observable
   List<TradeListItem> trades;
 
+  @observable
+  Trade trade;
+
+  @action
+  void setTrade(Trade trade) => this.trade = trade;
+
   @action
   Future updateTradeList() async => trades =
       tradesSource.values.map((trade) => TradeListItem(
diff --git a/lib/themes.dart b/lib/themes.dart
index be4a5d1d4..f92eb2fa6 100644
--- a/lib/themes.dart
+++ b/lib/themes.dart
@@ -127,11 +127,7 @@ class Themes {
       caption: TextStyle(
         color: Palette.moderateLavender, // container (confirm exchange)
         backgroundColor: Palette.moderateLavender, // button background (confirm exchange)
-
-
-
-
-        decorationColor: Palette.lavender, // gradient end, wallet label
+        decorationColor: Palette.darkBlueCraiola, // text color (information page)
       ),
 
 
@@ -283,10 +279,7 @@ class Themes {
       caption: TextStyle(
         color: PaletteDark.nightBlue, // container (confirm exchange)
         backgroundColor: PaletteDark.deepVioletBlue, // button background (confirm exchange)
-
-
-
-        decorationColor: PaletteDark.nightBlue, // gradient end, wallet label
+        decorationColor: Palette.darkLavender, // text color (information page)
       ),
 
 
diff --git a/lib/view_model/dashboard/dashboard_view_model.dart b/lib/view_model/dashboard/dashboard_view_model.dart
index c98ddc1e9..c2c96eace 100644
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@@ -108,8 +108,7 @@ abstract class DashboardViewModelBase with Store {
 
     _items
         .addAll(transactionFilterStore.filtered(transactions: transactions));
-    //_items.addAll(tradeFilterStore.filtered(trades: trades));
-    _items.addAll(trades); // FIXME
+    _items.addAll(tradeFilterStore.filtered(trades: trades, wallet: wallet));
 
     return formattedItemsList(_items);
   }
diff --git a/lib/view_model/exchange/exchange_trade_view_model.dart b/lib/view_model/exchange/exchange_trade_view_model.dart
new file mode 100644
index 000000000..af988428c
--- /dev/null
+++ b/lib/view_model/exchange/exchange_trade_view_model.dart
@@ -0,0 +1,68 @@
+import 'dart:async';
+import 'package:cake_wallet/core/wallet_base.dart';
+import 'package:cake_wallet/src/domain/exchange/changenow/changenow_exchange_provider.dart';
+import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
+import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart';
+import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.dart';
+import 'package:cake_wallet/store/dashboard/trades_store.dart';
+import 'package:hive/hive.dart';
+import 'package:mobx/mobx.dart';
+
+part 'exchange_trade_view_model.g.dart';
+
+class ExchangeTradeViewModel = ExchangeTradeViewModelBase with _$ExchangeTradeViewModel;
+
+abstract class ExchangeTradeViewModelBase with Store {
+  ExchangeTradeViewModelBase({this.wallet, this.trades, this.tradesStore}) {
+    trade = tradesStore.trade;
+
+    isSendable = trade.from == wallet.currency ||
+        trade.provider == ExchangeProviderDescription.xmrto;
+
+    switch (trade.provider) {
+      case ExchangeProviderDescription.xmrto:
+        _provider = XMRTOExchangeProvider();
+        break;
+      case ExchangeProviderDescription.changeNow:
+        _provider = ChangeNowExchangeProvider();
+        break;
+      case ExchangeProviderDescription.morphToken:
+        _provider = MorphTokenExchangeProvider(trades: trades);
+        break;
+    }
+
+    _updateTrade();
+    _timer = Timer.periodic(Duration(seconds: 20), (_) async => _updateTrade());
+  }
+
+  final WalletBase wallet;
+  final Box<Trade> trades;
+  final TradesStore tradesStore;
+
+  @observable
+  Trade trade;
+
+  @observable
+  bool isSendable;
+
+  ExchangeProvider _provider;
+
+  Timer _timer;
+
+  @action
+  Future<void> _updateTrade() async {
+    try {
+      final updatedTrade = await _provider.findTradeById(id: trade.id);
+
+      if (updatedTrade.createdAt == null && trade.createdAt != null) {
+        updatedTrade.createdAt = trade.createdAt;
+      }
+
+      trade = updatedTrade;
+    } catch (e) {
+      print(e.toString());
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index bec3a5754..44430a073 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -4,6 +4,7 @@ import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
 import 'package:cake_wallet/src/domain/exchange/limits.dart';
 import 'package:cake_wallet/src/domain/exchange/trade.dart';
 import 'package:cake_wallet/src/stores/exchange/limits_state.dart';
+import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:intl/intl.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -24,7 +25,12 @@ part 'exchange_view_model.g.dart';
 class ExchangeViewModel = ExchangeViewModelBase with _$ExchangeViewModel;
 
 abstract class ExchangeViewModelBase with Store {
-  ExchangeViewModelBase({this.wallet, this.trades, this.exchangeTemplateStore}) {
+  ExchangeViewModelBase({
+    this.wallet,
+    this.trades,
+    this.exchangeTemplateStore,
+    this.tradesStore}) {
+
     providerList = [
       XMRTOExchangeProvider(),
       ChangeNowExchangeProvider(),
@@ -50,6 +56,7 @@ abstract class ExchangeViewModelBase with Store {
   final WalletBase wallet;
   final Box<Trade> trades;
   final ExchangeTemplateStore exchangeTemplateStore;
+  final TradesStore tradesStore;
 
   @observable
   ExchangeProvider provider;
@@ -220,6 +227,7 @@ abstract class ExchangeViewModelBase with Store {
           tradeState = TradeIsCreating();
           final trade = await provider.createTrade(request: request);
           trade.walletId = wallet.id;
+          tradesStore.setTrade(trade);
           await trades.add(trade);
           tradeState = TradeIsCreatedSuccessfully(trade: trade);
         } catch (e) {
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index cc97e8a72..68095ca01 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "Angebot läuft ab in: ",
   "trade_is_powered_by" : "Dieser Handel wird betrieben von ${provider}",
   "copy_address" : "Adresse kopieren",
-  "exchange_result_confirm" : "Durch Drücken von Bestätigen wird gesendet ${fetchingLabel} ${from} von Ihrer Brieftasche aus angerufen ${walletName} an die oben angegebene Adresse. Oder Sie können von Ihrem externen Portemonnaie an die oben angegebene Adresse / QR-Code senden.\n\nBitte bestätigen Sie, um fortzufahren, oder gehen Sie zurück, um die Beträge zu änderns.\n\n",
-  "exchange_result_description" : "Bitte senden ${fetchingLabel} ${from} an die oben angegebene Adresse.\n\n'",
+  "exchange_result_confirm" : "Durch Drücken von Bestätigen wird gesendet ${fetchingLabel} ${from} von Ihrer Brieftasche aus angerufen ${walletName} an die oben angegebene Adresse. Oder Sie können von Ihrem externen Portemonnaie an die oben angegebene Adresse / QR-Code senden.\n\nBitte bestätigen Sie, um fortzufahren, oder gehen Sie zurück, um die Beträge zu änderns.",
+  "exchange_result_description" : "Bitte senden ${fetchingLabel} ${from} an die oben angegebene Adresse.'",
   "exchange_result_write_down_ID" : "*Bitte kopieren oder notieren Sie Ihren oben gezeigten Ausweis.",
   "confirm" : "Bestätigen",
   "confirm_sending" : "Bestätigen Sie das Senden",
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 362e493bf..6c0fd2864 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "Offer expires in: ",
   "trade_is_powered_by" : "This trade is powered by ${provider}",
   "copy_address" : "Copy Address",
-  "exchange_result_confirm" : "By pressing confirm, you will be sending ${fetchingLabel} ${from} from your wallet called ${walletName} to the address shown above. Or you can send from your external wallet to the above address/QR code.\n\nPlease press confirm to continue or go back to change the amounts.\n\n",
-  "exchange_result_description" : "Please send ${fetchingLabel} ${from} to the address shown above.\n\n",
+  "exchange_result_confirm" : "By pressing confirm, you will be sending ${fetchingLabel} ${from} from your wallet called ${walletName} to the address shown above. Or you can send from your external wallet to the above address/QR code.\n\nPlease press confirm to continue or go back to change the amounts.",
+  "exchange_result_description" : "Please send ${fetchingLabel} ${from} to the address shown above.",
   "exchange_result_write_down_ID" : "*Please copy or write down your ID shown above.",
   "confirm" : "Confirm",
   "confirm_sending" : "Confirm sending",
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index cfaeb7a42..8b3857186 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "Oferta expira en: ",
   "trade_is_powered_by" : "Este comercio es impulsado por ${provider}",
   "copy_address" : "Copiar dirección ",
-  "exchange_result_confirm" : "Al presionar confirmar, enviará ${fetchingLabel} ${from} desde su billetera llamada ${walletName} a la dirección que se muestra arriba.  O puede enviar desde su billetera externa a la dirección / código QR anterior.\n\nPresione confirmar para continuar o regrese para cambiar los montos.\n\n",
-  "exchange_result_description" : "Envíe ${fetchingLabel} ${from} a la dirección que se muestra arriba.\n\n'",
+  "exchange_result_confirm" : "Al presionar confirmar, enviará ${fetchingLabel} ${from} desde su billetera llamada ${walletName} a la dirección que se muestra arriba.  O puede enviar desde su billetera externa a la dirección / código QR anterior.\n\nPresione confirmar para continuar o regrese para cambiar los montos.",
+  "exchange_result_description" : "Envíe ${fetchingLabel} ${from} a la dirección que se muestra arriba.",
   "exchange_result_write_down_ID" : "*Copie o escriba su identificación que se muestra arriba.",
   "confirm" : "Confirmar",
   "confirm_sending" : "Confirmar envío",
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 7e43ebbc9..2920c8953 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "में ऑफर समाप्त हो रहा है: ",
   "trade_is_powered_by" : "यह व्यापार द्वारा संचालित है ${provider}",
   "copy_address" : "पता कॉपी करें",
-  "exchange_result_confirm" : "पुष्टि दबाकर, आप भेज रहे होंगे ${fetchingLabel} ${from} अपने बटुए से ${walletName} ऊपर दिखाए गए पते पर। या आप अपने बाहरी वॉलेट से उपरोक्त पते / क्यूआर कोड पर भेज सकते हैं।\n\nकृपया जारी रखने या राशि बदलने के लिए वापस जाने के लिए पुष्टि करें दबाएं.\n\n",
-  "exchange_result_description" : "कृपया भेजें ${fetchingLabel} ${from} ऊपर दिखाए गए पते पर\n\n'",
+  "exchange_result_confirm" : "पुष्टि दबाकर, आप भेज रहे होंगे ${fetchingLabel} ${from} अपने बटुए से ${walletName} ऊपर दिखाए गए पते पर। या आप अपने बाहरी वॉलेट से उपरोक्त पते / क्यूआर कोड पर भेज सकते हैं।\n\nकृपया जारी रखने या राशि बदलने के लिए वापस जाने के लिए पुष्टि करें दबाएं.",
+  "exchange_result_description" : "कृपया भेजें ${fetchingLabel} ${from} ऊपर दिखाए गए पते पर",
   "exchange_result_write_down_ID" : "*कृपया ऊपर दिखाए गए अपने ID को कॉपी या लिख लें.",
   "confirm" : "की पुष्टि करें",
   "confirm_sending" : "भेजने की पुष्टि करें",
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 173317288..a7602342c 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "で有効期限が切れます: ",
   "trade_is_powered_by" : "この取引は ${provider}",
   "copy_address" : "住所をコピー",
-  "exchange_result_confirm" : "確認を押すと、送信されます ${fetchingLabel} ${from} と呼ばれるあなたの財布から ${walletName} 上記のアドレスへ. または、外部ウォレットから上記のアドレス/ QRコードに送信できます.\n\n確認を押して続行するか、戻って金額を変更してください.\n\n",
-  "exchange_result_description" : "送信してください ${fetchingLabel} ${from} 上記のアドレスへ.\n\n'",
+  "exchange_result_confirm" : "確認を押すと、送信されます ${fetchingLabel} ${from} と呼ばれるあなたの財布から ${walletName} 上記のアドレスへ. または、外部ウォレットから上記のアドレス/ QRコードに送信できます.\n\n確認を押して続行するか、戻って金額を変更してください.",
+  "exchange_result_description" : "送信してください ${fetchingLabel} ${from} 上記のアドレスへ.",
   "exchange_result_write_down_ID" : "*上記のIDをコピーまたは書き留めてください.",
   "confirm" : "確認する",
   "confirm_sending" : "送信を確認",
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 3c817739c..31d7f6cfd 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "쿠폰 만료일: ",
   "trade_is_powered_by" : "이 거래는 ${provider}",
   "copy_address" : "주소 복사",
-  "exchange_result_confirm" : "확인을 누르면 전송됩니다 ${fetchingLabel} ${from} 지갑에서 ${walletName} 위에 표시된 주소로. 또는 외부 지갑에서 위의 주소 / QR 코드로 보낼 수 있습니다.\n\n확인을 눌러 계속하거나 금액을 변경하려면 돌아가십시오.\n\n",
-  "exchange_result_description" : "보내주세요 ${fetchingLabel} ${from} 위에 표시된 주소로.\n\n'",
+  "exchange_result_confirm" : "확인을 누르면 전송됩니다 ${fetchingLabel} ${from} 지갑에서 ${walletName} 위에 표시된 주소로. 또는 외부 지갑에서 위의 주소 / QR 코드로 보낼 수 있습니다.\n\n확인을 눌러 계속하거나 금액을 변경하려면 돌아가십시오.",
+  "exchange_result_description" : "보내주세요 ${fetchingLabel} ${from} 위에 표시된 주소로.",
   "exchange_result_write_down_ID" : "*위에 표시된 ID를 복사하거나 적어 두십시오.",
   "confirm" : "확인",
   "confirm_sending" : "전송 확인",
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 3e2e4cb0c..8bdebe752 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "Aanbieding verloopt over: ",
   "trade_is_powered_by" : "Deze transactie wordt mogelijk gemaakt door ${provider}",
   "copy_address" : "Adres kopiëren",
-  "exchange_result_confirm" : "Door op bevestigen te drukken, wordt u verzonden ${fetchingLabel} ${from} uit je portemonnee genoemd ${walletName} naar bovenstaand adres. Of u kunt uw externe portemonnee naar bovenstaand adres / QR-code sturen.\n\nDruk op bevestigen om door te gaan of terug te gaan om de bedragen te wijzigen.\n\n",
-  "exchange_result_description" : "Zend alstublieft ${fetchingLabel} ${from} naar bovenstaand adres.\n\n'",
+  "exchange_result_confirm" : "Door op bevestigen te drukken, wordt u verzonden ${fetchingLabel} ${from} uit je portemonnee genoemd ${walletName} naar bovenstaand adres. Of u kunt uw externe portemonnee naar bovenstaand adres / QR-code sturen.\n\nDruk op bevestigen om door te gaan of terug te gaan om de bedragen te wijzigen.",
+  "exchange_result_description" : "Zend alstublieft ${fetchingLabel} ${from} naar bovenstaand adres.",
   "exchange_result_write_down_ID" : "*Kopieer of noteer uw hierboven getoonde ID.",
   "confirm" : "Bevestigen",
   "confirm_sending" : "Bevestig verzending",
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index e992deb50..142813bad 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "Oferta wygasa za ",
   "trade_is_powered_by" : "Ten handel jest zasilany przez ${provider}",
   "copy_address" : "Skopiuj adress",
-  "exchange_result_confirm" : "Naciskając Potwierdź, wyślesz ${fetchingLabel} ${from} z twojego portfela ${walletName} z twojego portfela. Lub możesz wysłać z zewnętrznego portfela na powyższy adres / kod QR.\n\nNaciśnij Potwierdź, aby kontynuować lub wróć, aby zmienić kwoty.\n\n",
-  "exchange_result_description" : "Proszę wyślij ${fetchingLabel} ${from} na adres podany powyżej.\n\n'",
+  "exchange_result_confirm" : "Naciskając Potwierdź, wyślesz ${fetchingLabel} ${from} z twojego portfela ${walletName} z twojego portfela. Lub możesz wysłać z zewnętrznego portfela na powyższy adres / kod QR.\n\nNaciśnij Potwierdź, aby kontynuować lub wróć, aby zmienić kwoty.",
+  "exchange_result_description" : "Proszę wyślij ${fetchingLabel} ${from} na adres podany powyżej.",
   "exchange_result_write_down_ID" : "*Skopiuj lub zanotuj swój identyfikator pokazany powyżej.",
   "confirm" : "Potwierdzać",
   "confirm_sending" : "Potwierdź wysłanie",
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 59919ecbf..d0492d3c3 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "A oferta expira em: ",
   "trade_is_powered_by" : "Troca realizada por ${provider}",
   "copy_address" : "Copiar endereço",
-  "exchange_result_confirm" : "Ao confirmar, você enviará ${fetchingLabel} ${from} da sua carteira  ${walletName} para o endereço exibido acima. Você também pode enviar com uma carteira externa para o endereço/código QR acima.\n\nPressione Confirmar para continuar ou volte para alterar os valores.\n\n",
-  "exchange_result_description" : "Por favor, envie ${fetchingLabel} ${from} para o endereço mostrado acima.\n\n'",
+  "exchange_result_confirm" : "Ao confirmar, você enviará ${fetchingLabel} ${from} da sua carteira  ${walletName} para o endereço exibido acima. Você também pode enviar com uma carteira externa para o endereço/código QR acima.\n\nPressione Confirmar para continuar ou volte para alterar os valores.",
+  "exchange_result_description" : "Por favor, envie ${fetchingLabel} ${from} para o endereço mostrado acima.",
   "exchange_result_write_down_ID" : "*Copie ou anote seu ID mostrado acima.",
   "confirm" : "Confirmar",
   "confirm_sending" : "Confirmar o envio",
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 81a2c76b8..48a757456 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "Предложение истекает через: ",
   "trade_is_powered_by" : "Сделка выполнена через ${provider}",
   "copy_address" : "Cкопировать адрес",
-  "exchange_result_confirm" : "Нажимая подтвердить, вы отправите ${fetchingLabel} ${from} с вашего кошелька ${walletName} на адрес указанный выше. Или вы можете отправить со своего внешнего кошелька на вышеуказанный адрес/QR-код.\n\nПожалуйста, нажмите подтвердить для продолжения, или вернитесь назад для изменения суммы.\n\n",
-  "exchange_result_description" : "Пожалуйста отправьте ${fetchingLabel} ${from} на адрес, указанный выше.\n\n'",
+  "exchange_result_confirm" : "Нажимая подтвердить, вы отправите ${fetchingLabel} ${from} с вашего кошелька ${walletName} на адрес указанный выше. Или вы можете отправить со своего внешнего кошелька на вышеуказанный адрес/QR-код.\n\nПожалуйста, нажмите подтвердить для продолжения, или вернитесь назад для изменения суммы.",
+  "exchange_result_description" : "Пожалуйста отправьте ${fetchingLabel} ${from} на адрес, указанный выше.",
   "exchange_result_write_down_ID" : "*Пожалуйста, скопируйте или запишите ID, указанный выше.",
   "confirm" : "Подтвердить",
   "confirm_sending" : "Подтвердить отправку",
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 31268c9d3..07aee1b92 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "Пропозиція закінчиться через: ",
   "trade_is_powered_by" : "Операція виконана через ${provider}",
   "copy_address" : "Cкопіювати адресу",
-  "exchange_result_confirm" : "Натиснувши підтвердити, ви відправите ${fetchingLabel} ${from} з вашого гаманця ${walletName} на адресу вказану вище. Або ви можете відправити зі свого зовнішнього гаманця на вищевказану адресу/QR-код.\n\nБудь ласка, натисніть підтвердити для продовження або поверніться назад щоб змінити суму.\n\n",
-  "exchange_result_description" : "Будь ласка, відправте ${fetchingLabel} ${from} на адресу, вказану вище.\n\n'",
+  "exchange_result_confirm" : "Натиснувши підтвердити, ви відправите ${fetchingLabel} ${from} з вашого гаманця ${walletName} на адресу вказану вище. Або ви можете відправити зі свого зовнішнього гаманця на вищевказану адресу/QR-код.\n\nБудь ласка, натисніть підтвердити для продовження або поверніться назад щоб змінити суму.",
+  "exchange_result_description" : "Будь ласка, відправте ${fetchingLabel} ${from} на адресу, вказану вище.",
   "exchange_result_write_down_ID" : "*Будь ласка, скопіюйте або запишіть ID, вказаний вище.",
   "confirm" : "Підтвердити",
   "confirm_sending" : "Підтвердити відправлення",
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 0450aa214..6ae909518 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -88,8 +88,8 @@
   "offer_expires_in" : "优惠有效期至 ",
   "trade_is_powered_by" : "该交易由 ${provider}",
   "copy_address" : "复制地址",
-  "exchange_result_confirm" : "点击确认 您将发送 ${fetchingLabel} ${from} 从你的钱包里 ${walletName} 到上面显示的地址. 或者，您也可以从外部钱包发送上述地址/ QR码。\n\n请按确认继续或返回以更改金额\n\n",
-  "exchange_result_description" : "请发送 ${fetchingLabel} ${from} 到上面显示的地址.\n\n'",
+  "exchange_result_confirm" : "点击确认 您将发送 ${fetchingLabel} ${from} 从你的钱包里 ${walletName} 到上面显示的地址. 或者，您也可以从外部钱包发送上述地址/ QR码。\n\n请按确认继续或返回以更改金额",
+  "exchange_result_description" : "请发送 ${fetchingLabel} ${from} 到上面显示的地址.",
   "exchange_result_write_down_ID" : "*请复制或写下您上面显示的ID.",
   "confirm" : "确认",
   "confirm_sending" : "确认发送",

From 56519bbe8607e3e4e12582ae9559e3bed5b66e7e Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Thu, 27 Aug 2020 22:42:28 +0300
Subject: [PATCH 13/15] CAKE-28 | reworked standart_list_row (added image);
 applied new design, light and dark themes to exchange trade page

---
 .../exchange_trade/exchange_trade_item.dart   |   6 +-
 .../exchange_trade/exchange_trade_page.dart   | 351 +++++-------------
 .../widgets/exchange_trade_row.dart           |   8 -
 .../exchange_trade/widgets/timer_widget.dart  |  10 +-
 lib/src/widgets/standart_list_row.dart        |  42 ++-
 lib/themes.dart                               |  28 +-
 .../exchange/exchange_trade_view_model.dart   |  24 ++
 7 files changed, 183 insertions(+), 286 deletions(-)
 delete mode 100644 lib/src/screens/exchange_trade/widgets/exchange_trade_row.dart

diff --git a/lib/src/screens/exchange_trade/exchange_trade_item.dart b/lib/src/screens/exchange_trade/exchange_trade_item.dart
index 78e9995ad..4de324e9c 100644
--- a/lib/src/screens/exchange_trade/exchange_trade_item.dart
+++ b/lib/src/screens/exchange_trade/exchange_trade_item.dart
@@ -7,7 +7,7 @@ class ExchangeTradeItem {
     @required this.isCopied,
   });
 
-  final String title;
-  final String data;
-  final bool isCopied;
+  String title;
+  String data;
+  bool isCopied;
 }
\ No newline at end of file
diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart
index 5b8ce2525..61b1b024d 100644
--- a/lib/src/screens/exchange_trade/exchange_trade_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart
@@ -3,6 +3,7 @@ import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_item.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/information_page.dart';
+import 'package:cake_wallet/src/widgets/standart_list_row.dart';
 import 'package:cake_wallet/view_model/exchange/exchange_trade_view_model.dart';
 import 'package:mobx/mobx.dart';
 import 'package:provider/provider.dart';
@@ -86,7 +87,6 @@ class ExchangeTradeForm extends StatefulWidget {
 class ExchangeTradeState extends State<ExchangeTradeForm> {
   final fetchingLabel = S.current.fetching;
   String get title => S.current.exchange;
-  List<ExchangeTradeItem> items;
 
   bool _effectsInstalled = false;
 
@@ -94,25 +94,6 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback(afterLayout);
-
-    items = [
-      ExchangeTradeItem(
-        title: S.current.id,
-        data: '${widget.exchangeTradeViewModel.trade.id ?? fetchingLabel}',
-        isCopied: true),
-      ExchangeTradeItem(
-        title: S.current.amount,
-        data: '${widget.exchangeTradeViewModel.trade.amount ?? fetchingLabel}',
-        isCopied: false),
-      ExchangeTradeItem(
-        title: S.current.status,
-        data: '${widget.exchangeTradeViewModel.trade.state ?? fetchingLabel}',
-        isCopied: false),
-      ExchangeTradeItem(
-        title: S.current.widgets_address,
-        data: widget.exchangeTradeViewModel.trade.inputAddress ?? fetchingLabel,
-        isCopied: true),
-    ];
   }
 
   void afterLayout(dynamic _) {
@@ -121,257 +102,121 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
 
   @override
   Widget build(BuildContext context) {
+    final copyImage = Image.asset('assets/images/copy_content.png',
+        height: 16, width: 16,
+        color: Theme.of(context).primaryTextTheme.overline.color);
 
     //_setEffects(context);
 
     return Container(
       child: ScrollableWithBottomSection(
-        contentPadding: EdgeInsets.only(left: 24, right: 24, top: 24),
+        contentPadding: EdgeInsets.only(top: 10, bottom: 16),
         content: Observer(builder: (_) {
           final trade = widget.exchangeTradeViewModel.trade;
 
           return Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
-              Container(
-                child: Row(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: <Widget>[
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          children: <Widget>[
-                            Text(
-                              S.of(context).id,
-                              style: TextStyle(
-                                  height: 2,
-                                  fontWeight: FontWeight.bold,
-                                  fontSize: 14.0,
-                                  color: Theme.of(context).primaryTextTheme.title.color),
-                            ),
-                            Text(
-                              '${trade.id ?? fetchingLabel}',
-                              style: TextStyle(
-                                  fontSize: 14.0,
-                                  height: 2,
-                                  color: Theme.of(context).primaryTextTheme.caption.color),
-                            )
-                          ],
-                        ),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          children: <Widget>[
-                            Text(
-                              S.of(context).amount,
-                              style: TextStyle(
-                                  height: 2,
-                                  fontWeight: FontWeight.bold,
-                                  fontSize: 14.0,
-                                  color: Theme.of(context).primaryTextTheme.title.color),
-                            ),
-                            Text(
-                              '${trade.amount ?? fetchingLabel}',
-                              style: TextStyle(
-                                  fontSize: 14.0,
-                                  height: 2,
-                                  color: Theme.of(context).primaryTextTheme.caption.color),
-                            )
-                          ],
-                        ),
-                        trade.extraId != null
-                            ? Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          children: <Widget>[
-                            Text(
-                              S.of(context).payment_id,
-                              style: TextStyle(
-                                  height: 2,
-                                  fontWeight: FontWeight.bold,
-                                  fontSize: 14.0,
-                                  color: Theme.of(context).primaryTextTheme.title.color),
-                            ),
-                            Text(
-                              '${trade.extraId ?? fetchingLabel}',
-                              style: TextStyle(
-                                  fontSize: 14.0,
-                                  height: 2,
-                                  color: Theme.of(context).primaryTextTheme.caption.color),
-                            )
-                          ],
-                        )
-                            : Container(),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          children: <Widget>[
-                            Text(
-                              S.of(context).status,
-                              style: TextStyle(
-                                  fontSize: 14.0,
-                                  fontWeight: FontWeight.bold,
-                                  color: Theme.of(context).primaryTextTheme.title.color,
-                                  height: 2),
-                            ),
-                            Text(
-                              '${trade.state ?? fetchingLabel}',
-                              style: TextStyle(
-                                  fontSize: 14.0,
-                                  height: 2,
-                                  color: Theme.of(context).primaryTextTheme.caption.color),
-                            )
-                          ],
-                        ),
-                        trade.expiredAt != null
-                            ? Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          children: <Widget>[
-                            Text(
-                              S.of(context).offer_expires_in,
-                              style: TextStyle(
-                                  fontSize: 14.0,
-                                  color: Theme.of(context).primaryTextTheme.title.color),
-                            ),
-                            TimerWidget(trade.expiredAt,
-                                color: Theme.of(context).primaryTextTheme.caption.color)
-                          ],
-                        )
-                            : Container(),
-                      ],
-                    ),
-                  ],
-                ),
+              trade.expiredAt != null
+              ? Row(
+                  mainAxisSize: MainAxisSize.max,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: <Widget>[
+                  Text(
+                    S.of(context).offer_expires_in,
+                    style: TextStyle(
+                      fontSize: 14.0,
+                      fontWeight: FontWeight.w500,
+                      color: Theme.of(context).primaryTextTheme.overline.color),
+                  ),
+                  TimerWidget(trade.expiredAt,
+                    color: Theme.of(context).primaryTextTheme.title.color)
+                ])
+              : Offstage(),
+              Padding(
+                padding: EdgeInsets.only(top: 32),
+                child: Row(children: <Widget>[
+                  Spacer(flex: 3),
+                  Flexible(
+                      flex: 4,
+                      child: Center(
+                          child: AspectRatio(
+                              aspectRatio: 1.0,
+                              child: QrImage(
+                                data: trade.inputAddress ?? fetchingLabel,
+                                backgroundColor: Colors.transparent,
+                                foregroundColor: Theme.of(context)
+                                    .accentTextTheme.subtitle.color,
+                              )))),
+                  Spacer(flex: 3)
+                ]),
               ),
               Padding(
-                padding: EdgeInsets.only(top: 20),
-                child: Row(
-                  children: <Widget>[
-                    Spacer(
-                      flex: 1,
-                    ),
-                    Flexible(
-                        flex: 1,
-                        child: Center(
-                          child: AspectRatio(
-                            aspectRatio: 1.0,
-                            child: QrImage(
-                              data: trade.inputAddress ?? fetchingLabel,
-                              backgroundColor: Colors.transparent,
-                              foregroundColor: Theme.of(context).primaryTextTheme.display4.color,
-                            ),
-                          ),
-                        )),
-                    Spacer(
-                      flex: 1,
-                    )
-                  ],
-                ),
-              ),
-              SizedBox(
-                height: 20.0,
-              ),
-              Center(
-                child: Text(
-                  S.of(context).trade_is_powered_by(trade.provider != null
-                      ? trade.provider.title
-                      : fetchingLabel),
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                      fontSize: 14.0,
-                      fontWeight: FontWeight.bold,
-                      color: Theme.of(context).primaryTextTheme.title.color),
-                ),
-              ),
-              Container(
-                padding: EdgeInsets.only(top: 20, bottom: 20),
-                child: Center(
-                  child: Text(
-                    trade.inputAddress ?? fetchingLabel,
-                    textAlign: TextAlign.center,
-                    style: TextStyle(
-                        fontSize: 14.0,
-                        color: Theme.of(context).primaryTextTheme.caption.color),
+                padding: EdgeInsets.only(top: 16),
+                child: ListView.separated(
+                  shrinkWrap: true,
+                  physics: NeverScrollableScrollPhysics(),
+                  itemCount: widget.exchangeTradeViewModel.items.length,
+                  separatorBuilder: (context, index) => Container(
+                    height: 1,
+                    color: Theme.of(context).accentTextTheme.subtitle.backgroundColor,
                   ),
+                  itemBuilder: (context, index) {
+                    final item = widget.exchangeTradeViewModel.items[index];
+                    String value;
+
+                    final content = Observer(
+                        builder: (_) {
+                          switch (index) {
+                            case 0:
+                              value = '${widget.exchangeTradeViewModel.trade.id ?? fetchingLabel}';
+                              break;
+                            case 1:
+                              value = '${widget.exchangeTradeViewModel.trade.amount ?? fetchingLabel}';
+                              break;
+                            case 2:
+                              value = '${widget.exchangeTradeViewModel.trade.state ?? fetchingLabel}';
+                              break;
+                            case 3:
+                              value = widget.exchangeTradeViewModel.trade.inputAddress ?? fetchingLabel;
+                              break;
+                          }
+
+                          return StandartListRow(
+                            title: item.title,
+                            value: value,
+                            valueFontSize: 14,
+                            image: item.isCopied ? copyImage : null,
+                          );
+                        }
+                    );
+
+                    return item.isCopied
+                        ? Builder(
+                        builder: (context) =>
+                            GestureDetector(
+                              onTap: () {
+                                Clipboard.setData(ClipboardData(text: value));
+                                Scaffold.of(context).showSnackBar(SnackBar(
+                                  content: Text(
+                                    S.of(context).copied_to_clipboard,
+                                    textAlign: TextAlign.center,
+                                    style: TextStyle(color: Colors.white),
+                                  ),
+                                  backgroundColor: Colors.green,
+                                  duration: Duration(milliseconds: 1500),
+                                ));
+                              },
+                              child: content,
+                            )
+                    )
+                        : content;
+                  },
                 ),
               ),
-              Container(
-                child: Row(
-                  children: <Widget>[
-                    Flexible(
-                        child: Container(
-                          padding: EdgeInsets.only(right: 5.0),
-                          child: Builder(
-                            builder: (context) => PrimaryButton(
-                                onPressed: () {
-                                  Clipboard.setData(ClipboardData(text: trade.inputAddress));
-                                  Scaffold.of(context).showSnackBar(SnackBar(
-                                    content: Text(
-                                      S.of(context).copied_to_clipboard,
-                                      textAlign: TextAlign.center,
-                                      style: TextStyle(color: Colors.white),
-                                    ),
-                                    backgroundColor: Colors.green,
-                                    duration: Duration(milliseconds: 1500),
-                                  ));
-                                },
-                                text: S.of(context).copy_address,
-                                color: Theme.of(context).accentTextTheme.title.backgroundColor,
-                                textColor: Theme.of(context).primaryTextTheme.title.color)
-                          ),
-                        )),
-                    Flexible(
-                        child: Container(
-                          padding: EdgeInsets.only(left: 5.0),
-                          child: Builder(
-                            builder: (context) => PrimaryButton(
-                                onPressed: () {
-                                  Clipboard.setData(ClipboardData(text: trade.id));
-                                  Scaffold.of(context).showSnackBar(SnackBar(
-                                    content: Text(
-                                      S.of(context).copied_to_clipboard,
-                                      textAlign: TextAlign.center,
-                                      style: TextStyle(color: Colors.white),
-                                    ),
-                                    backgroundColor: Colors.green,
-                                    duration: Duration(milliseconds: 1500),
-                                  ));
-                                },
-                                text: S.of(context).copy_id,
-                                color: Theme.of(context).accentTextTheme.title.backgroundColor,
-                                textColor: Theme.of(context).primaryTextTheme.title.color)
-                          ),
-                        ))
-                  ],
-                ),
-              ),
-              /*Container(
-                padding: EdgeInsets.only(top: 20),
-                child: Text(
-                  widget.exchangeTradeViewModel.isSendable
-                      ? S.of(context).exchange_result_confirm(
-                      trade.amount ?? fetchingLabel,
-                      trade.from.toString(),
-                      walletName)
-                      : S.of(context).exchange_result_description(
-                      trade.amount ?? fetchingLabel, trade.from.toString()),
-                  textAlign: TextAlign.left,
-                  style: TextStyle(
-                      fontSize: 13.0,
-                      color: Theme.of(context).primaryTextTheme.title.color),
-                ),
-              ),*/
-              Text(
-                S.of(context).exchange_result_write_down_ID,
-                textAlign: TextAlign.left,
-                style: TextStyle(
-                    fontSize: 13.0,
-                    color: Theme.of(context).primaryTextTheme.title.color),
-              )
             ],
           );
         }),
-        bottomSectionPadding: EdgeInsets.all(24),
+        bottomSectionPadding: EdgeInsets.fromLTRB(24, 0, 24, 24),
         bottomSection: PrimaryButton(
           onPressed: () {},
           text: S.of(context).confirm,
diff --git a/lib/src/screens/exchange_trade/widgets/exchange_trade_row.dart b/lib/src/screens/exchange_trade/widgets/exchange_trade_row.dart
deleted file mode 100644
index ba20dd413..000000000
--- a/lib/src/screens/exchange_trade/widgets/exchange_trade_row.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ExchangeTradeRow extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return Container();
-  }
-}
\ No newline at end of file
diff --git a/lib/src/screens/exchange_trade/widgets/timer_widget.dart b/lib/src/screens/exchange_trade/widgets/timer_widget.dart
index 713148fed..e826993fd 100644
--- a/lib/src/screens/exchange_trade/widgets/timer_widget.dart
+++ b/lib/src/screens/exchange_trade/widgets/timer_widget.dart
@@ -53,10 +53,16 @@ class TimerWidgetState extends State<TimerWidget> {
   Widget build(BuildContext context) {
     return _isExpired
         ? Text(S.of(context).expired,
-            style: TextStyle(fontSize: 14.0, color: Colors.red))
+            style: TextStyle(
+                fontSize: 14.0,
+                fontWeight: FontWeight.w500,
+                color: Colors.red))
         : Text(
             S.of(context).time(_minutes.toString(), _seconds.toString()),
-            style: TextStyle(fontSize: 14.0, color: widget.color),
+            style: TextStyle(
+                fontSize: 14.0,
+                fontWeight: FontWeight.w500,
+                color: widget.color),
           );
   }
 
diff --git a/lib/src/widgets/standart_list_row.dart b/lib/src/widgets/standart_list_row.dart
index d573e6e5f..d29e84065 100644
--- a/lib/src/widgets/standart_list_row.dart
+++ b/lib/src/widgets/standart_list_row.dart
@@ -1,13 +1,20 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class StandartListRow extends StatelessWidget {
   StandartListRow(
       {this.title,
       this.value,
+      this.titleFontSize = 14,
+      this.valueFontSize = 16,
+      this.image,
       this.isDrawBottom = false});
 
   final String title;
   final String value;
+  final double titleFontSize;
+  final double valueFontSize;
+  final Image image;
   final bool isDrawBottom;
 
   @override
@@ -19,27 +26,42 @@ class StandartListRow extends StatelessWidget {
           color: Theme.of(context).backgroundColor,
           child: Padding(
             padding:
-                const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
+              const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
             child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
                   Text(title,
                       style: TextStyle(
-                          fontSize: 14,
+                          fontSize: titleFontSize,
                           fontWeight: FontWeight.w500,
                           color:
                               Theme.of(context).primaryTextTheme.overline.color),
                       textAlign: TextAlign.left),
                   Padding(
                     padding: const EdgeInsets.only(top: 12),
-                    child: Text(value,
-                        style: TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context)
-                                .primaryTextTheme
-                                .title
-                                .color)),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.max,
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: <Widget>[
+                        Expanded(
+                          child: Text(value,
+                              style: TextStyle(
+                                  fontSize: valueFontSize,
+                                  fontWeight: FontWeight.w500,
+                                  color: Theme.of(context)
+                                      .primaryTextTheme
+                                      .title
+                                      .color)),
+                        ),
+                        image != null
+                        ? Padding(
+                          padding: EdgeInsets.only(left: 24),
+                          child: image,
+                        )
+                        : Offstage()
+                      ],
+                    ),
                   )
                 ]),
           ),
diff --git a/lib/themes.dart b/lib/themes.dart
index f92eb2fa6..ecf41da62 100644
--- a/lib/themes.dart
+++ b/lib/themes.dart
@@ -129,14 +129,18 @@ class Themes {
         backgroundColor: Palette.moderateLavender, // button background (confirm exchange)
         decorationColor: Palette.darkBlueCraiola, // text color (information page)
       ),
+      subtitle: TextStyle(
+        color: Palette.darkBlueCraiola, // QR code (exchange trade page)
+        backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page)
+
+
+
+        decorationColor: Palette.darkLavender // selected item
+      ),
+
 
 
 
-        subtitle: TextStyle(
-            color: Palette.lightBlueGrey, // border color,  wallet label
-            backgroundColor: Palette.lavender, // address field, wallet card
-            decorationColor: Palette.darkLavender // selected item
-        ),
         headline: TextStyle(
             color: Palette.darkLavender, // faq background
             backgroundColor: Palette.lavender // faq extension
@@ -281,14 +285,18 @@ class Themes {
         backgroundColor: PaletteDark.deepVioletBlue, // button background (confirm exchange)
         decorationColor: Palette.darkLavender, // text color (information page)
       ),
+      subtitle: TextStyle(
+        color: PaletteDark.lightBlueGrey, // QR code (exchange trade page)
+        backgroundColor: PaletteDark.deepVioletBlue, // divider (exchange trade page)
+
+
+
+        decorationColor: PaletteDark.headerNightBlue // selected item
+      ),
+
 
 
 
-        subtitle: TextStyle(
-            color: PaletteDark.darkNightBlue, // border color,  wallet label
-            backgroundColor: PaletteDark.violetBlue, // address field, wallet card
-            decorationColor: PaletteDark.headerNightBlue // selected item
-        ),
         headline: TextStyle(
             color: PaletteDark.lightNightBlue, // faq background
             backgroundColor: PaletteDark.headerNightBlue // faq extension
diff --git a/lib/view_model/exchange/exchange_trade_view_model.dart b/lib/view_model/exchange/exchange_trade_view_model.dart
index af988428c..b623673ed 100644
--- a/lib/view_model/exchange/exchange_trade_view_model.dart
+++ b/lib/view_model/exchange/exchange_trade_view_model.dart
@@ -9,6 +9,8 @@ import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.da
 import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_item.dart';
+import 'package:cake_wallet/generated/i18n.dart';
 
 part 'exchange_trade_view_model.g.dart';
 
@@ -33,6 +35,25 @@ abstract class ExchangeTradeViewModelBase with Store {
         break;
     }
 
+    items = ObservableList.of([
+      ExchangeTradeItem(
+          title: S.current.id,
+          data: '${trade.id}',
+          isCopied: true),
+      ExchangeTradeItem(
+          title: S.current.amount,
+          data: '${trade.amount}',
+          isCopied: false),
+      ExchangeTradeItem(
+          title: S.current.status,
+          data: '${trade.state}',
+          isCopied: false),
+      ExchangeTradeItem(
+          title: S.current.widgets_address + ':',
+          data: trade.inputAddress,
+          isCopied: true),
+    ]);
+
     _updateTrade();
     _timer = Timer.periodic(Duration(seconds: 20), (_) async => _updateTrade());
   }
@@ -47,6 +68,9 @@ abstract class ExchangeTradeViewModelBase with Store {
   @observable
   bool isSendable;
 
+  @observable
+  ObservableList<ExchangeTradeItem> items;// = ObservableList();
+
   ExchangeProvider _provider;
 
   Timer _timer;

From 4ed7f6ec1825f577278013eba55123872846b168 Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Fri, 28 Aug 2020 23:04:48 +0300
Subject: [PATCH 14/15] CAKE-28 | created filter tile, filter widget, checkbox
 widget and filter item; applied filter items to filter widget, also applied
 filter widget to dashboard page; reworked wallet list page and menu widget;
 applied light and dark themes to filter widget and wallet list age; fixed
 filtered method in the trade filter store

---
 assets/images/2.0x/back_vector.png            | Bin 0 -> 337 bytes
 assets/images/3.0x/back_vector.png            | Bin 0 -> 459 bytes
 assets/images/back_vector.png                 | Bin 0 -> 251 bytes
 lib/palette.dart                              |  11 +-
 .../dashboard/widgets/filter_tile.dart        |  21 +++
 .../dashboard/widgets/filter_widget.dart      | 155 ++++++++++++++++
 .../screens/dashboard/widgets/header_row.dart | 175 +-----------------
 .../dashboard/widgets/menu_widget.dart        |  43 +++--
 .../send/widgets/base_send_widget.dart        |  58 ++++--
 .../screens/wallet_list/wallet_list_page.dart |  42 +++--
 lib/src/screens/wallet_list/wallet_menu.dart  |  50 +++--
 .../wallet_list/widgets/wallet_tile.dart      |  67 ++++---
 lib/src/widgets/checkbox_widget.dart          |  81 ++++++++
 lib/store/dashboard/trade_filter_store.dart   |   2 +-
 lib/themes.dart                               |  62 ++++---
 .../dashboard/dashboard_view_model.dart       |  41 ++++
 lib/view_model/dashboard/filter_item.dart     |   7 +
 .../exchange/exchange_trade_view_model.dart   |   5 +-
 18 files changed, 531 insertions(+), 289 deletions(-)
 create mode 100644 assets/images/2.0x/back_vector.png
 create mode 100644 assets/images/3.0x/back_vector.png
 create mode 100644 assets/images/back_vector.png
 create mode 100644 lib/src/screens/dashboard/widgets/filter_tile.dart
 create mode 100644 lib/src/screens/dashboard/widgets/filter_widget.dart
 create mode 100644 lib/src/widgets/checkbox_widget.dart
 create mode 100644 lib/view_model/dashboard/filter_item.dart

diff --git a/assets/images/2.0x/back_vector.png b/assets/images/2.0x/back_vector.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d9239aa9e6a7270adcadc3513f6bad6728a6d81
GIT binary patch
literal 337
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Eu!3HE}2mdz#Qk(@Ik;M!QVyYm_=ozH)0Vv2=
z9OUlAu<o49OCX0O-O<;Pfnj4m_n$;oApe=Ci(^Oy<I!opd`$)dt@ppM$Q+E8EU#b@
z*ZbS)-E&cTg|@K&QNb!knP}F|8(|)&zO3b#P!oUY<ZFSdw4J-3yI3?uHgC`kyR5C`
z^7ZFS-si>#W;XguSSSYl<J$7U?8t=<5mS-8;F-z}O9a{uHU1HJ`DZUvP{HyBl|Swd
zQvXyZF#QwsV6Er;@nCU#;4QaMwtbFWS9-I$I*e4hazl>B=uS{slDqhtbA@s7f|%k7
z;>rAppC@=N3U>J<)TcFV>W3J&BB93D5pGRR@~SFL(iiJ&cN^G0yZe2S^+Io_9Q6{9
eDZb5$LGxAy_GukjXCMmnF@vY8pUXO@geCx7wta#C

literal 0
HcmV?d00001

diff --git a/assets/images/3.0x/back_vector.png b/assets/images/3.0x/back_vector.png
new file mode 100644
index 0000000000000000000000000000000000000000..d01030e5d3b48bacf214089a53e45fffd63dd43a
GIT binary patch
literal 459
zcmV;+0W|)JP)<h;3K|Lk000e1NJLTq001xm001Ni1^@s6&qcWk00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0bof)K~#7F)tFCC
z!ax+pzgIUN$;6e1(7Lmp08NA)h<2wWa)i39@eYIq_u&K#^O}?d=rA)S8Q%LPgnwOp
zzos+!-Vn}YSk_Yl4Vo{;R9}<)6$!b*8H~!hB7nnRH!s4??cF_Ai~l7Ok)bCX-o8B@
z{%!~_NJuXMSNKa1E#M1Jb{!xg6mzjJyn(5{$B)lQNU(s!@Jx_^)bNZ~KyrBIq=5AB
zj8i~Ec&1Z8OL*o;KvQ^TPe5CEW+$LAJktnB>Na7}x~=XsEdS;NGk``6rWvWa^ZRgh
z?>!GlA+yiY97^Hp-YnubyNEMoi+E#i{A`kc?6y&#gaO%Y^g-q}+M-e7s7h#)=qz)Z
zB%F0xi^R!+MuUWRq?9fZG}KF$2tHPkDiL+CB~c=(%+1Dmu>pQv|Jzz#j6UmkBqX|x
z`Xp4GPWvQM(t93oNr*n3?!rFvKOidjb6atdkS$Ri)(GpUyPp66002ovPDHLkV1n`_
BzzYBX

literal 0
HcmV?d00001

diff --git a/assets/images/back_vector.png b/assets/images/back_vector.png
new file mode 100644
index 0000000000000000000000000000000000000000..8717a346362a230171c36cf48b0b218bb832c7ac
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~e!3HF=pW8M9Db50q$YKTtZeb8+WSBKa0w~B>
z9OUlAu<o49OCX0O-O<;Pfnj4m_n$;oAb*0Vi(^Oy<I)L^e69u}uKB;8u3tPYNi<2^
z?TCvK+o2PBN3?WYuPd%_cM9ov#52o$=klG?A3Dqkb^5xek*Vv()<R}`US_7Y50^JI
zy=l8>D7ayD!OV(F9v@Wqa5Qbn`?z2;TkVODf~z;XJ>S3jzzU~-OAh_{vE^_yXLSGe
uNx98NpPt0D`*}t!tm}Rwmh0l1bb_T)I+nMiplLJEZ492SelF{r5}E*0U|hBU

literal 0
HcmV?d00001

diff --git a/lib/palette.dart b/lib/palette.dart
index d73ad9ba1..809c4f085 100644
--- a/lib/palette.dart
+++ b/lib/palette.dart
@@ -9,11 +9,20 @@ class Palette {
   static const Color lavender = Color.fromRGBO(237, 245, 252, 1.0);
   static const Color oceanBlue = Color.fromRGBO(30, 52, 78, 1.0);
   static const Color lightBlueGrey = Color.fromRGBO(118, 131, 169, 1.0);
-  static const Color periwinkle = Color.fromRGBO(197, 208, 230, 1.0);
+  static const Color periwinkle = Color.fromRGBO(195, 210, 227, 1.0);
   static const Color blue = Color.fromRGBO(88, 143, 252, 1.0);
   static const Color darkLavender = Color.fromRGBO(229, 238, 250, 1.0);
   static const Color nightBlue = Color.fromRGBO(46, 57, 96, 1.0);
 
+  static const Color moderateOrangeYellow = Color.fromRGBO(245, 134, 82, 1.0);
+  static const Color moderateOrange = Color.fromRGBO(235, 117, 63, 1.0);
+  static const Color shineGreen = Color.fromRGBO(76, 189, 87, 1.0);
+  static const Color moderateGreen = Color.fromRGBO(45, 158, 56, 1.0);
+  static const Color cornflower = Color.fromRGBO(85, 147, 240, 1.0);
+  static const Color royalBlue = Color.fromRGBO(43, 114, 221, 1.0);
+  static const Color lightRed = Color.fromRGBO(227, 87, 87, 1.0);
+  static const Color persianRed = Color.fromRGBO(206, 55, 55, 1.0);
+
   // NEW DESIGN
   static const Color blueCraiola = Color.fromRGBO(69, 110, 255, 1.0);
   static const Color darkBlueCraiola = Color.fromRGBO(53, 86, 136, 1.0);
diff --git a/lib/src/screens/dashboard/widgets/filter_tile.dart b/lib/src/screens/dashboard/widgets/filter_tile.dart
new file mode 100644
index 000000000..3dbd5b5bc
--- /dev/null
+++ b/lib/src/screens/dashboard/widgets/filter_tile.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+
+class FilterTile extends StatelessWidget {
+  FilterTile({@required this.child});
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: double.infinity,
+      padding: EdgeInsets.only(
+          top: 18,
+          bottom: 18,
+          left: 24,
+          right: 24
+      ),
+      child: child,
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/src/screens/dashboard/widgets/filter_widget.dart b/lib/src/screens/dashboard/widgets/filter_widget.dart
new file mode 100644
index 000000000..d5197c355
--- /dev/null
+++ b/lib/src/screens/dashboard/widgets/filter_widget.dart
@@ -0,0 +1,155 @@
+import 'dart:ui';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/src/screens/dashboard/widgets/filter_tile.dart';
+import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/src/widgets/alert_background.dart';
+import 'package:cake_wallet/src/widgets/alert_close_button.dart';
+import 'package:cake_wallet/src/widgets/checkbox_widget.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:date_range_picker/date_range_picker.dart' as date_rage_picker;
+
+class FilterWidget extends StatelessWidget {
+  FilterWidget({@required this.dashboardViewModel});
+
+  final DashboardViewModel dashboardViewModel;
+  final backVector = Image.asset('assets/images/back_vector.png',
+    color: Palette.darkBlueCraiola
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertBackground(
+      child: Stack(
+        alignment: Alignment.center,
+        children: <Widget>[
+          Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              Text(
+                S.of(context).filters,
+                style: TextStyle(
+                  color: Colors.white,
+                  fontSize: 18,
+                  fontWeight: FontWeight.bold,
+                  fontFamily: 'Poppins',
+                  decoration: TextDecoration.none,
+                ),
+              ),
+              Padding(
+                padding: EdgeInsets.only(
+                  left: 24,
+                  right: 24,
+                  top: 24
+                ),
+                child: ClipRRect(
+                  borderRadius: BorderRadius.all(Radius.circular(14)),
+                  child: Container(
+                    color: Theme.of(context).textTheme.body2.decorationColor,
+                    child: ListView.separated(
+                      shrinkWrap: true,
+                      physics: const NeverScrollableScrollPhysics(),
+                      itemCount: dashboardViewModel.filterItems.length,
+                      separatorBuilder: (context, _) => Container(
+                        height: 1,
+                        color: Theme.of(context).accentTextTheme.subhead.backgroundColor,
+                      ),
+                      itemBuilder: (_, index1) {
+                        final title = dashboardViewModel.filterItems.keys.elementAt(index1);
+                        final section = dashboardViewModel.filterItems.values.elementAt(index1);
+
+                        return Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: <Widget>[
+                            Padding(
+                              padding: EdgeInsets.only(
+                                top: 20,
+                                left: 24,
+                                right: 24
+                              ),
+                              child: Text(
+                                title,
+                                style: TextStyle(
+                                    color: Theme.of(context).accentTextTheme.subhead.color,
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.w500,
+                                    fontFamily: 'Poppins',
+                                    decoration: TextDecoration.none
+                                ),
+                              ),
+                            ),
+                            ListView.separated(
+                              shrinkWrap: true,
+                              physics: const NeverScrollableScrollPhysics(),
+                              itemCount: section.length,
+                              separatorBuilder: (context, _) => Container(
+                                height: 1,
+                                padding: EdgeInsets.only(left: 24),
+                                color: Theme.of(context).textTheme.body2.decorationColor,
+                                child: Container(
+                                  height: 1,
+                                  color: Theme.of(context).accentTextTheme.subhead.backgroundColor,
+                                ),
+                              ),
+                              itemBuilder: (_, index2) {
+
+                                final item = section[index2];
+                                final content = item.onChanged != null
+                                    ? CheckboxWidget(
+                                    value: item.value,
+                                    caption: item.caption,
+                                    onChanged: item.onChanged
+                                )
+                                    : GestureDetector(
+                                  onTap: () async {
+                                    final List<DateTime> picked =
+                                    await date_rage_picker.showDatePicker(
+                                        context: context,
+                                        initialFirstDate: DateTime.now()
+                                            .subtract(Duration(days: 1)),
+                                        initialLastDate: (DateTime.now()),
+                                        firstDate: DateTime(2015),
+                                        lastDate: DateTime.now()
+                                            .add(Duration(days: 1)));
+
+                                    if (picked != null && picked.length == 2) {
+                                      dashboardViewModel.transactionFilterStore
+                                          .changeStartDate(picked.first);
+                                      dashboardViewModel.transactionFilterStore
+                                          .changeEndDate(picked.last);
+                                    }
+                                  },
+                                  child: Padding(
+                                    padding: EdgeInsets.only(left: 32),
+                                    child: Text(
+                                      item.caption,
+                                      style: TextStyle(
+                                          color: Theme.of(context).primaryTextTheme.title.color,
+                                          fontSize: 18,
+                                          fontFamily: 'Poppins',
+                                          fontWeight: FontWeight.w500,
+                                          decoration: TextDecoration.none
+                                      ),
+                                    ),
+                                  ),
+                                );
+
+                                return FilterTile(child: content);
+                              },
+                            )
+                          ],
+                        );
+                      },
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+          AlertCloseButton(image: backVector)
+        ],
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/src/screens/dashboard/widgets/header_row.dart b/lib/src/screens/dashboard/widgets/header_row.dart
index 7542e7371..a878ff11f 100644
--- a/lib/src/screens/dashboard/widgets/header_row.dart
+++ b/lib/src/screens/dashboard/widgets/header_row.dart
@@ -1,9 +1,7 @@
+import 'package:cake_wallet/src/screens/dashboard/widgets/filter_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:date_range_picker/date_range_picker.dart' as date_rage_picker;
-import 'package:flutter_mobx/flutter_mobx.dart';
 
 class HeaderRow extends StatelessWidget {
   HeaderRow({this.dashboardViewModel});
@@ -31,148 +29,13 @@ class HeaderRow extends StatelessWidget {
               color: Colors.white
             ),
           ),
-          PopupMenuButton<int>(
-            itemBuilder: (context) => [
-              PopupMenuItem(
-                  enabled: false,
-                  value: -1,
-                  child: Text(S.of(context).transactions,
-                      style: TextStyle(
-                          fontWeight: FontWeight.bold,
-                          color: Theme.of(context).primaryTextTheme.title.color))),
-              PopupMenuItem(
-                  value: 0,
-                  child: Observer(
-                      builder: (_) => Row(
-                          mainAxisAlignment:
-                          MainAxisAlignment
-                              .spaceBetween,
-                          children: [
-                            Text(S.of(context).incoming,
-                              style: TextStyle(
-                                color: Theme.of(context).primaryTextTheme.title.color
-                              ),
-                            ),
-                            Checkbox(
-                                value: dashboardViewModel
-                                    .transactionFilterStore
-                                    .displayIncoming,
-                                onChanged: (value) => dashboardViewModel
-                                    .transactionFilterStore
-                                    .toggleIncoming()
-                            )
-                          ]))),
-              PopupMenuItem(
-                  value: 1,
-                  child: Observer(
-                      builder: (_) => Row(
-                          mainAxisAlignment:
-                          MainAxisAlignment
-                              .spaceBetween,
-                          children: [
-                            Text(S.of(context).outgoing,
-                                style: TextStyle(
-                                    color: Theme.of(context).primaryTextTheme.title.color
-                                )
-                            ),
-                            Checkbox(
-                              value: dashboardViewModel
-                                  .transactionFilterStore
-                                  .displayOutgoing,
-                              onChanged: (value) => dashboardViewModel
-                                  .transactionFilterStore
-                                  .toggleOutgoing(),
-                            )
-                          ]))),
-              PopupMenuItem(
-                  value: 2,
-                  child:
-                  Text(S.of(context).transactions_by_date,
-                      style: TextStyle(
-                          color: Theme.of(context).primaryTextTheme.title.color
-                      )
-                  )),
-              PopupMenuDivider(),
-              PopupMenuItem(
-                  enabled: false,
-                  value: -1,
-                  child: Text(S.of(context).trades,
-                      style: TextStyle(
-                          fontWeight: FontWeight.bold,
-                          color: Theme.of(context).primaryTextTheme.title.color))),
-              PopupMenuItem(
-                  value: 3,
-                  child: Observer(
-                      builder: (_) => Row(
-                          mainAxisAlignment:
-                          MainAxisAlignment
-                              .spaceBetween,
-                          children: [
-                            Text('XMR.TO',
-                                style: TextStyle(
-                                    color: Theme.of(context).primaryTextTheme.title.color
-                                )
-                            ),
-                            Checkbox(
-                              value: dashboardViewModel
-                                  .tradeFilterStore
-                                  .displayXMRTO,
-                              onChanged: (value) => dashboardViewModel
-                                  .tradeFilterStore
-                                  .toggleDisplayExchange(
-                                  ExchangeProviderDescription
-                                      .xmrto),
-                            )
-                          ]))),
-              PopupMenuItem(
-                  value: 4,
-                  child: Observer(
-                      builder: (_) => Row(
-                          mainAxisAlignment:
-                          MainAxisAlignment
-                              .spaceBetween,
-                          children: [
-                            Text('Change.NOW',
-                                style: TextStyle(
-                                    color: Theme.of(context).primaryTextTheme.title.color
-                                )
-                            ),
-                            Checkbox(
-                              value: dashboardViewModel
-                                  .tradeFilterStore
-                                  .displayChangeNow,
-                              onChanged: (value) => dashboardViewModel
-                                  .tradeFilterStore
-                                  .toggleDisplayExchange(
-                                  ExchangeProviderDescription
-                                      .changeNow),
-                            )
-                          ]))),
-              PopupMenuItem(
-                  value: 5,
-                  child: Observer(
-                      builder: (_) => Row(
-                          mainAxisAlignment:
-                          MainAxisAlignment
-                              .spaceBetween,
-                          children: [
-                            Text('MorphToken',
-                                style: TextStyle(
-                                    color: Theme.of(context).primaryTextTheme.title.color
-                                )
-                            ),
-                            Checkbox(
-                              value: dashboardViewModel
-                                  .tradeFilterStore
-                                  .displayMorphToken,
-                              onChanged: (value) => dashboardViewModel
-                                  .tradeFilterStore
-                                  .toggleDisplayExchange(
-                                  ExchangeProviderDescription
-                                      .morphToken),
-                            )
-                          ])))
-            ],
+          GestureDetector(
+            onTap: () {
+              showDialog<void>(
+                context: context,
+                builder: (context) => FilterWidget(dashboardViewModel: dashboardViewModel)
+              );
+            },
             child: Container(
               height: 36,
               width: 36,
@@ -182,27 +45,7 @@ class HeaderRow extends StatelessWidget {
               ),
               child: filterIcon,
             ),
-            onSelected: (item) async {
-              if (item == 2) {
-                final picked =
-                await date_rage_picker.showDatePicker(
-                    context: context,
-                    initialFirstDate: DateTime.now()
-                        .subtract(Duration(days: 1)),
-                    initialLastDate: (DateTime.now()),
-                    firstDate: DateTime(2015),
-                    lastDate: DateTime.now()
-                        .add(Duration(days: 1)));
-
-                if (picked != null && picked.length == 2) {
-                  dashboardViewModel.transactionFilterStore
-                      .changeStartDate(picked.first);
-                  dashboardViewModel.transactionFilterStore
-                      .changeEndDate(picked.last);
-                }
-              }
-            },
-          ),
+          )
         ],
       ),
     );
diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart
index ed32d755d..6cf6570db 100644
--- a/lib/src/screens/dashboard/widgets/menu_widget.dart
+++ b/lib/src/screens/dashboard/widgets/menu_widget.dart
@@ -17,8 +17,8 @@ class MenuWidget extends StatefulWidget {
 }
 
 class MenuWidgetState extends State<MenuWidget> {
-  final moneroIcon = Image.asset('assets/images/monero_menu.png');
-  final bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png');
+  Image moneroIcon;
+  Image bitcoinIcon;
   final largeScreen = 731;
 
   double menuWidth;
@@ -36,10 +36,10 @@ class MenuWidgetState extends State<MenuWidget> {
     screenWidth = 0;
     screenHeight = 0;
 
-    headerHeight = 125;
+    headerHeight = 137;
     tileHeight = 75;
-    fromTopEdge = 30;
-    fromBottomEdge = 21;
+    fromTopEdge = 50;
+    fromBottomEdge = 30;
 
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback(afterLayout);
@@ -67,6 +67,15 @@ class MenuWidgetState extends State<MenuWidget> {
     final walletMenu = WalletMenu(context);
     final itemCount = walletMenu.items.length;
 
+    moneroIcon = Image.asset('assets/images/monero_menu.png',
+      color: Theme.of(context)
+          .accentTextTheme
+          .overline.decorationColor);
+    bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png',
+      color: Theme.of(context)
+          .accentTextTheme
+          .overline.decorationColor);
+
     return Row(
       mainAxisSize: MainAxisSize.max,
       crossAxisAlignment: CrossAxisAlignment.center,
@@ -87,17 +96,22 @@ class MenuWidgetState extends State<MenuWidget> {
                   topLeft: Radius.circular(24),
                   bottomLeft: Radius.circular(24)),
               child: Container(
-                width: menuWidth,
-                height: double.infinity,
-                color: Theme.of(context).textTheme.body2.color,
-                alignment: Alignment.topCenter,
+                color: Theme.of(context).textTheme.body2.decorationColor,
                 child: ListView.separated(
+                    padding: EdgeInsets.only(top: 0),
                     itemBuilder: (_, index) {
 
                       if (index == 0) {
                         return Container(
                           height: headerHeight,
-                          color: Theme.of(context).textTheme.body2.color,
+                          decoration: BoxDecoration(
+                            gradient: LinearGradient(colors: [
+                              Theme.of(context).accentTextTheme.display1.color,
+                              Theme.of(context).accentTextTheme.display1.decorationColor,
+                            ],
+                                begin: Alignment.topLeft,
+                                end: Alignment.bottomRight),
+                          ),
                           padding: EdgeInsets.only(
                               left: 24,
                               top: fromTopEdge,
@@ -121,8 +135,7 @@ class MenuWidgetState extends State<MenuWidget> {
                                         Text(
                                           widget.name,
                                           style: TextStyle(
-                                              color: Theme.of(context).textTheme
-                                                  .display2.color,
+                                              color: Colors.white,
                                               fontSize: 16,
                                               fontWeight: FontWeight.bold),
                                         ),
@@ -131,8 +144,8 @@ class MenuWidgetState extends State<MenuWidget> {
                                             widget.subname,
                                             style: TextStyle(
                                                 color: Theme.of(context)
-                                                    .primaryTextTheme
-                                                    .caption.color,
+                                                    .accentTextTheme
+                                                    .overline.decorationColor,
                                                 fontWeight: FontWeight.w500,
                                                 fontSize: 12),
                                           )
@@ -194,7 +207,7 @@ class MenuWidgetState extends State<MenuWidget> {
                       color: Theme.of(context).primaryTextTheme.caption.decorationColor,
                     ),
                     itemCount: itemCount + 1),
-              ),
+              )
             )
         )
       ],
diff --git a/lib/src/screens/send/widgets/base_send_widget.dart b/lib/src/screens/send/widgets/base_send_widget.dart
index 0ce6e55ac..c8d03f389 100644
--- a/lib/src/screens/send/widgets/base_send_widget.dart
+++ b/lib/src/screens/send/widgets/base_send_widget.dart
@@ -247,26 +247,44 @@ class BaseSendWidget extends StatelessWidget {
                       ),
                       isTemplate
                       ? Offstage()
-                      : Padding(
-                        padding: const EdgeInsets.only(top: 24),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: <Widget>[
-                            Text(S.of(context).send_estimated_fee,
-                                style: TextStyle(
-                                  fontSize: 12,
-                                  fontWeight: FontWeight.w500,
-                                  color: Theme.of(context).primaryTextTheme.display2.color,
-                                )),
-                            Text(
-                                sendViewModel.estimatedFee.toString() + ' '
-                                    + sendViewModel.currency.title,
-                                style: TextStyle(
-                                  fontSize: 12,
-                                  fontWeight: FontWeight.w600,
-                                  color: Theme.of(context).primaryTextTheme.display2.color,
-                                ))
-                          ],
+                      : GestureDetector(
+                        onTap: () {},
+                        child: Container(
+                          padding: EdgeInsets.only(top: 24),
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: <Widget>[
+                              Text(S.of(context).send_estimated_fee,
+                                  style: TextStyle(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                      //color: Theme.of(context).primaryTextTheme.display2.color,
+                                      color: Colors.white
+                                  )),
+                              Container(
+                                child: Row(
+                                  children: <Widget>[
+                                    Text(
+                                        sendViewModel.estimatedFee.toString() + ' '
+                                            + sendViewModel.currency.title,
+                                        style: TextStyle(
+                                            fontSize: 12,
+                                            fontWeight: FontWeight.w600,
+                                            //color: Theme.of(context).primaryTextTheme.display2.color,
+                                            color: Colors.white
+                                        )),
+                                    Padding(
+                                      padding: EdgeInsets.only(left: 5),
+                                      child: Icon(
+                                        Icons.arrow_forward_ios,
+                                        size: 12,
+                                        color: Colors.white,),
+                                    )
+                                  ],
+                                ),
+                              )
+                            ],
+                          ),
                         ),
                       )
                     ],
diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart
index 6b8e047cf..bac8e0990 100644
--- a/lib/src/screens/wallet_list/wallet_list_page.dart
+++ b/lib/src/screens/wallet_list/wallet_list_page.dart
@@ -37,11 +37,14 @@ class WalletListBodyState extends State<WalletListBody> {
   final bitcoinIcon =
       Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
   final scrollController = ScrollController();
+  final double tileHeight = 60;
 
   @override
   Widget build(BuildContext context) {
     final newWalletImage = Image.asset('assets/images/new_wallet.png',
-        height: 12, width: 12, color: Palette.oceanBlue);
+        height: 12,
+        width: 12,
+        color: Theme.of(context).accentTextTheme.headline.decorationColor);
     final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
         height: 12,
         width: 12,
@@ -58,7 +61,7 @@ class WalletListBodyState extends State<WalletListBody> {
                   shrinkWrap: true,
                   physics: const NeverScrollableScrollPhysics(),
                   separatorBuilder: (_, index) => Divider(
-                      color: Theme.of(context).backgroundColor, height: 16),
+                      color: Theme.of(context).backgroundColor, height: 32),
                   itemCount: widget.walletListViewModel.wallets.length,
                   itemBuilder: (__, index) {
                     final wallet = widget.walletListViewModel.wallets[index];
@@ -80,7 +83,7 @@ class WalletListBodyState extends State<WalletListBody> {
                         .generateImagesForWalletMenu(wallet.isCurrent);
 
                     return Container(
-                      height: 108,
+                      height: tileHeight,
                       width: double.infinity,
                       child: CustomScrollView(
                         scrollDirection: Axis.horizontal,
@@ -90,7 +93,7 @@ class WalletListBodyState extends State<WalletListBody> {
                             pinned: false,
                             floating: true,
                             delegate: WalletTile(
-                                min: screenWidth - 228,
+                                min: screenWidth - 170,
                                 max: screenWidth,
                                 image: _imageFor(type: wallet.type),
                                 walletName: wallet.name,
@@ -101,10 +104,11 @@ class WalletListBodyState extends State<WalletListBody> {
                               delegate:
                                   SliverChildBuilderDelegate((context, index) {
                             final item = items[index];
-                            final color = colors[index];
                             final image = images[index];
+                            final firstColor = colors[index*2];
+                            final secondColor = colors[index*2 + 1];
 
-                            final radius = index == 0 ? 12.0 : 0.0;
+                            final radius = index == 0 ? 10.0 : 0.0;
 
                             return GestureDetector(
                               onTap: () {
@@ -117,8 +121,8 @@ class WalletListBodyState extends State<WalletListBody> {
                                     wallet.isCurrent);
                               },
                               child: Container(
-                                height: 108,
-                                width: 108,
+                                height: tileHeight,
+                                width: 80,
                                 color: Theme.of(context).backgroundColor,
                                 child: Container(
                                   padding: EdgeInsets.only(left: 5, right: 5),
@@ -126,18 +130,27 @@ class WalletListBodyState extends State<WalletListBody> {
                                       borderRadius: BorderRadius.only(
                                           topLeft: Radius.circular(radius),
                                           bottomLeft: Radius.circular(radius)),
-                                      color: color),
+                                      gradient: LinearGradient(
+                                          begin: Alignment.topCenter,
+                                          end: Alignment.bottomCenter,
+                                          colors: [
+                                            firstColor,
+                                            secondColor
+                                          ]
+                                      )
+                                  ),
                                   child: Center(
                                     child: Column(
                                       mainAxisSize: MainAxisSize.min,
                                       children: <Widget>[
                                         image,
-                                        SizedBox(height: 5),
+                                        SizedBox(height: 2),
                                         Text(
                                           item,
                                           textAlign: TextAlign.center,
                                           style: TextStyle(
-                                              fontSize: 12,
+                                              fontSize: 7,
+                                              fontWeight: FontWeight.w500,
                                               color: Colors.white),
                                         )
                                       ],
@@ -159,9 +172,8 @@ class WalletListBodyState extends State<WalletListBody> {
                   Navigator.of(context).pushNamed(Routes.newWalletType),
               image: newWalletImage,
               text: S.of(context).wallet_list_create_new_wallet,
-              color: Colors.white,
-              textColor: Palette.oceanBlue,
-              borderColor: Palette.oceanBlue,
+              color: Theme.of(context).accentTextTheme.subtitle.decorationColor,
+              textColor: Theme.of(context).accentTextTheme.headline.decorationColor,
             ),
             SizedBox(height: 10.0),
             PrimaryImageButton(
@@ -169,7 +181,7 @@ class WalletListBodyState extends State<WalletListBody> {
                     .pushNamed(Routes.restoreWalletType),
                 image: restoreWalletImage,
                 text: S.of(context).wallet_list_restore_wallet,
-                color: Theme.of(context).primaryTextTheme.overline.color,
+                color: Theme.of(context).accentTextTheme.caption.color,
                 textColor: Theme.of(context).primaryTextTheme.title.color)
           ])),
     ));
diff --git a/lib/src/screens/wallet_list/wallet_menu.dart b/lib/src/screens/wallet_list/wallet_menu.dart
index b6654d0e8..360f55759 100644
--- a/lib/src/screens/wallet_list/wallet_menu.dart
+++ b/lib/src/screens/wallet_list/wallet_menu.dart
@@ -6,6 +6,7 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/stores/wallet_list/wallet_list_store.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
+import 'package:cake_wallet/palette.dart';
 
 class WalletMenu {
   WalletMenu(this.context, this.walletListViewModel);
@@ -20,18 +21,25 @@ class WalletMenu {
     S.current.rescan
   ];
 
-  final List<Color> listColors = [
-    Colors.blue,
-    Colors.orange,
-    Colors.red,
-    Colors.green
+  final List<Color> firstColors = [
+    Palette.cornflower,
+    Palette.moderateOrangeYellow,
+    Palette.lightRed,
+    Palette.shineGreen
+  ];
+
+  final List<Color> secondColors = [
+    Palette.royalBlue,
+    Palette.moderateOrange,
+    Palette.persianRed,
+    Palette.moderateGreen
   ];
 
   final List<Image> listImages = [
-    Image.asset('assets/images/load.png', height: 32, width: 32, color: Colors.white),
-    Image.asset('assets/images/eye_action.png', height: 32, width: 32, color: Colors.white),
-    Image.asset('assets/images/trash.png', height: 32, width: 32, color: Colors.white),
-    Image.asset('assets/images/scanner.png', height: 32, width: 32, color: Colors.white)
+    Image.asset('assets/images/load.png', height: 24, width: 24, color: Colors.white),
+    Image.asset('assets/images/eye_action.png', height: 24, width: 24, color: Colors.white),
+    Image.asset('assets/images/trash.png', height: 24, width: 24, color: Colors.white),
+    Image.asset('assets/images/scanner.png', height: 24, width: 24, color: Colors.white)
   ];
 
   List<String> generateItemsForWalletMenu(bool isCurrentWallet) {
@@ -46,18 +54,30 @@ class WalletMenu {
   }
 
   List<Color> generateColorsForWalletMenu(bool isCurrentWallet) {
-    final colors = List<Color>();
+    final colors = <Color>[];
 
-    if (!isCurrentWallet) colors.add(listColors[0]);
-    if (isCurrentWallet) colors.add(listColors[1]);
-    if (!isCurrentWallet) colors.add(listColors[2]);
-    if (isCurrentWallet) colors.add(listColors[3]);
+    if (!isCurrentWallet) {
+      colors.add(firstColors[0]);
+      colors.add(secondColors[0]);
+    }
+    if (isCurrentWallet) {
+      colors.add(firstColors[1]);
+      colors.add(secondColors[1]);
+    }
+    if (!isCurrentWallet) {
+      colors.add(firstColors[2]);
+      colors.add(secondColors[2]);
+    }
+    if (isCurrentWallet) {
+      colors.add(firstColors[3]);
+      colors.add(secondColors[3]);
+    }
 
     return colors;
   }
 
   List<Image> generateImagesForWalletMenu(bool isCurrentWallet) {
-    final images = List<Image>();
+    final images = <Image>[];
 
     if (!isCurrentWallet) images.add(listImages[0]);
     if (isCurrentWallet) images.add(listImages[1]);
diff --git a/lib/src/screens/wallet_list/widgets/wallet_tile.dart b/lib/src/screens/wallet_list/widgets/wallet_tile.dart
index 42a2301a9..4e4165341 100644
--- a/lib/src/screens/wallet_list/widgets/wallet_tile.dart
+++ b/lib/src/screens/wallet_list/widgets/wallet_tile.dart
@@ -17,17 +17,18 @@ class WalletTile extends SliverPersistentHeaderDelegate {
   final String walletName;
   final String walletAddress;
   final bool isCurrent;
+  final double tileHeight = 60;
 
   @override
   Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) {
     var opacity = 1 - shrinkOffset / (max - min);
     opacity = opacity >= 0 ? opacity : 0;
 
-    var panelWidth = 12 * opacity;
-    panelWidth = panelWidth < 12 ? 0 : 12;
+    var panelWidth = 10 * opacity;
+    panelWidth = panelWidth < 10 ? 0 : 10;
 
     final currentColor = isCurrent
-        ? Theme.of(context).accentTextTheme.caption.color
+        ? Theme.of(context).accentTextTheme.subtitle.decorationColor
         : Theme.of(context).backgroundColor;
 
     return Stack(
@@ -38,7 +39,7 @@ class WalletTile extends SliverPersistentHeaderDelegate {
           top: 0,
           right: max - 4,
           child: Container(
-            height: 108,
+            height: tileHeight,
             width: 4,
             decoration: BoxDecoration(
                 borderRadius: BorderRadius.only(topRight: Radius.circular(4), bottomRight: Radius.circular(4)),
@@ -48,13 +49,30 @@ class WalletTile extends SliverPersistentHeaderDelegate {
         ),
         Positioned(
           top: 0,
-          right: 12,
+          right: 10,
           child: Container(
-            height: 108,
-            width: max - 16,
+            height: tileHeight,
+            width: max - 14,
             padding: EdgeInsets.only(left: 20, right: 20),
             color: Theme.of(context).backgroundColor,
-            child: Column(
+            alignment: Alignment.centerLeft,
+            child: Row(
+              //mainAxisAlignment: MainAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: <Widget>[
+                image,
+                SizedBox(width: 10),
+                Text(
+                  walletName,
+                  style: TextStyle(
+                      fontSize: 22,
+                      fontWeight: FontWeight.w600,
+                      color: Theme.of(context).primaryTextTheme.title.color
+                  ),
+                )
+              ],
+            ),
+            /*Column(
               mainAxisSize: MainAxisSize.max,
               mainAxisAlignment: MainAxisAlignment.center,
               children: <Widget>[
@@ -92,7 +110,7 @@ class WalletTile extends SliverPersistentHeaderDelegate {
                 )
                 : Offstage()
               ],
-            ),
+            ),*/
           ),
         ),
         Positioned(
@@ -101,29 +119,18 @@ class WalletTile extends SliverPersistentHeaderDelegate {
             child: Opacity(
               opacity: opacity,
               child: Container(
-                height: 108,
+                height: tileHeight,
                 width: panelWidth,
-                padding: EdgeInsets.only(
-                  top: 1,
-                  left: 1,
-                  bottom: 1
-                ),
                 decoration: BoxDecoration(
-                  borderRadius: BorderRadius.only(topLeft: Radius.circular(12), bottomLeft: Radius.circular(12)),
-                  color: Theme.of(context).accentTextTheme.subtitle.color
-                ),
-                child: Container(
-                  decoration: BoxDecoration(
-                    borderRadius: BorderRadius.only(topLeft: Radius.circular(12), bottomLeft: Radius.circular(12)),
-                    gradient: LinearGradient(
-                      begin: Alignment.topCenter,
-                      end: Alignment.bottomCenter,
-                      colors: [
-                        Theme.of(context).accentTextTheme.caption.backgroundColor,
-                        Theme.of(context).accentTextTheme.caption.decorationColor
-                      ]
-                    )
-                  ),
+                  borderRadius: BorderRadius.only(topLeft: Radius.circular(10), bottomLeft: Radius.circular(10)),
+                  gradient: LinearGradient(
+                        begin: Alignment.topCenter,
+                        end: Alignment.bottomCenter,
+                        colors: [
+                          Theme.of(context).accentTextTheme.headline.color,
+                          Theme.of(context).accentTextTheme.headline.backgroundColor
+                        ]
+                  )
                 ),
               ),
             )
diff --git a/lib/src/widgets/checkbox_widget.dart b/lib/src/widgets/checkbox_widget.dart
new file mode 100644
index 000000000..9bb8b74a8
--- /dev/null
+++ b/lib/src/widgets/checkbox_widget.dart
@@ -0,0 +1,81 @@
+import 'dart:ui';
+import 'package:cake_wallet/palette.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+class CheckboxWidget extends StatefulWidget {
+  CheckboxWidget({
+    @required this.value,
+    @required this.caption,
+    @required this.onChanged});
+
+  final bool value;
+  final String caption;
+  final Function(bool) onChanged;
+
+  @override
+  CheckboxWidgetState createState() => CheckboxWidgetState(value, caption, onChanged);
+}
+
+class CheckboxWidgetState extends State<CheckboxWidget> {
+  CheckboxWidgetState(this.value, this.caption, this.onChanged);
+
+  bool value;
+  String caption;
+  Function(bool) onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () {
+        value = !value;
+        onChanged(value);
+        setState(() {});
+      },
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        mainAxisAlignment: MainAxisAlignment.start,
+        children: <Widget>[
+          Container(
+            height: 16,
+            width: 16,
+            decoration: BoxDecoration(
+                color: value
+                    ? Palette.blueCraiola
+                    : Theme.of(context).accentTextTheme.subhead.decorationColor,
+                borderRadius: BorderRadius.all(Radius.circular(2)),
+                border: Border.all(
+                    color: value
+                        ? Palette.blueCraiola
+                        : Theme.of(context).accentTextTheme.overline.color,
+                    width: 1
+                )
+            ),
+            child: value
+                ? Center(
+              child: Icon(
+                Icons.done,
+                color: Colors.white,
+                size: 14,
+              ),
+            )
+                : Offstage(),
+          ),
+          Padding(
+            padding: EdgeInsets.only(left: 16),
+            child: Text(
+              caption,
+              style: TextStyle(
+                  color: Theme.of(context).primaryTextTheme.title.color,
+                  fontSize: 18,
+                  fontFamily: 'Poppins',
+                  fontWeight: FontWeight.w500,
+                  decoration: TextDecoration.none
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/store/dashboard/trade_filter_store.dart b/lib/store/dashboard/trade_filter_store.dart
index 064b092f6..181f9b0f0 100644
--- a/lib/store/dashboard/trade_filter_store.dart
+++ b/lib/store/dashboard/trade_filter_store.dart
@@ -43,7 +43,7 @@ abstract class TradeFilterStoreBase with Store {
     final needToFilter = !displayChangeNow || !displayXMRTO || !displayMorphToken;
 
     return needToFilter
-        ? trades
+        ? _trades
         .where((item) =>
     (displayXMRTO &&
         item.trade.provider == ExchangeProviderDescription.xmrto) ||
diff --git a/lib/themes.dart b/lib/themes.dart
index ecf41da62..6b9241664 100644
--- a/lib/themes.dart
+++ b/lib/themes.dart
@@ -132,19 +132,26 @@ class Themes {
       subtitle: TextStyle(
         color: Palette.darkBlueCraiola, // QR code (exchange trade page)
         backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page)
-
-
-
-        decorationColor: Palette.darkLavender // selected item
+        decorationColor: Palette.blueCraiola // crete new wallet button background (wallet list page)
+      ),
+      headline: TextStyle(
+        color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page)
+        backgroundColor: Palette.moderateLavender, // second gradient color of wallet action buttons (wallet list page)
+        decorationColor: Colors.white // restore wallet button text color (wallet list page)
+      ),
+      subhead: TextStyle(
+        color: Palette.darkGray, // titles color (filter widget)
+        backgroundColor: Palette.periwinkle, // divider color (filter widget)
+        decorationColor: Colors.white // checkbox background (filter widget)
+      ),
+      overline: TextStyle(
+        color: Palette.wildPeriwinkle, // checkbox bounds (filter widget)
+        decorationColor: Colors.white, // menu subname
+      ),
+      display1: TextStyle(
+        color: Palette.blueCraiola, // first gradient color (menu header)
+        decorationColor: Palette.pinkFlamingo // second gradient color(menu header)
       ),
-
-
-
-
-        headline: TextStyle(
-            color: Palette.darkLavender, // faq background
-            backgroundColor: Palette.lavender // faq extension
-        )
     ),
 
 
@@ -288,19 +295,26 @@ class Themes {
       subtitle: TextStyle(
         color: PaletteDark.lightBlueGrey, // QR code (exchange trade page)
         backgroundColor: PaletteDark.deepVioletBlue, // divider (exchange trade page)
-
-
-
-        decorationColor: PaletteDark.headerNightBlue // selected item
+        decorationColor: Colors.white // crete new wallet button background (wallet list page)
+      ),
+      headline: TextStyle(
+        color: PaletteDark.distantBlue, // first gradient color of wallet action buttons (wallet list page)
+        backgroundColor: PaletteDark.distantNightBlue, // second gradient color of wallet action buttons (wallet list page)
+        decorationColor: Palette.darkBlueCraiola // restore wallet button text color (wallet list page)
+      ),
+      subhead: TextStyle(
+        color: Colors.white, // titles color (filter widget)
+        backgroundColor: PaletteDark.darkOceanBlue, // divider color (filter widget)
+        decorationColor: PaletteDark.wildVioletBlue.withOpacity(0.3) // checkbox background (filter widget)
+      ),
+      overline: TextStyle(
+        color: PaletteDark.wildVioletBlue, // checkbox bounds (filter widget)
+        decorationColor: PaletteDark.darkCyanBlue, // menu subname
+      ),
+      display1: TextStyle(
+        color: PaletteDark.deepPurpleBlue, // first gradient color (menu header)
+        decorationColor: PaletteDark.deepPurpleBlue // second gradient color(menu header)
       ),
-
-
-
-
-        headline: TextStyle(
-            color: PaletteDark.lightNightBlue, // faq background
-            backgroundColor: PaletteDark.headerNightBlue // faq extension
-        )
     ),
 
 
diff --git a/lib/view_model/dashboard/dashboard_view_model.dart b/lib/view_model/dashboard/dashboard_view_model.dart
index c2c96eace..705b4e8fe 100644
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@@ -8,6 +8,7 @@ import 'package:cake_wallet/src/domain/common/transaction_info.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/src/domain/exchange/trade.dart';
 import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
+import 'package:cake_wallet/view_model/dashboard/filter_item.dart';
 import 'package:cake_wallet/view_model/dashboard/trade_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/transaction_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
@@ -35,6 +36,44 @@ abstract class DashboardViewModelBase with Store {
     this.tradeFilterStore,
     this.transactionFilterStore}) {
 
+    filterItems = {S.current.transactions : [
+      FilterItem(
+        value: transactionFilterStore.displayIncoming,
+        caption: S.current.incoming,
+        onChanged: (value) => transactionFilterStore.toggleIncoming()
+      ),
+      FilterItem(
+        value: transactionFilterStore.displayOutgoing,
+        caption: S.current.outgoing,
+        onChanged: (value) => transactionFilterStore.toggleOutgoing()
+      ),
+      FilterItem(
+        value: false,
+        caption: S.current.transactions_by_date,
+        onChanged: null
+      ),
+    ],
+    S.current.trades : [
+      FilterItem(
+        value: tradeFilterStore.displayXMRTO,
+        caption: 'XMR.TO',
+        onChanged: (value) => tradeFilterStore
+            .toggleDisplayExchange(ExchangeProviderDescription.xmrto)
+      ),
+      FilterItem(
+        value: tradeFilterStore.displayChangeNow,
+        caption: 'Change.NOW',
+        onChanged: (value) => tradeFilterStore
+              .toggleDisplayExchange(ExchangeProviderDescription.changeNow)
+      ),
+      FilterItem(
+          value: tradeFilterStore.displayMorphToken,
+          caption: 'MorphToken',
+          onChanged: (value) => tradeFilterStore
+              .toggleDisplayExchange(ExchangeProviderDescription.morphToken)
+      ),
+    ]};
+
     name = appStore.wallet?.name;
     wallet ??= appStore.wallet;
     type = wallet.type;
@@ -125,6 +164,8 @@ abstract class DashboardViewModelBase with Store {
 
   TransactionFilterStore transactionFilterStore;
 
+  Map<String, List<FilterItem>> filterItems;
+
   ReactionDisposer _reaction;
 
   void _onWalletChange(WalletBase wallet) {
diff --git a/lib/view_model/dashboard/filter_item.dart b/lib/view_model/dashboard/filter_item.dart
new file mode 100644
index 000000000..33500b345
--- /dev/null
+++ b/lib/view_model/dashboard/filter_item.dart
@@ -0,0 +1,7 @@
+class FilterItem {
+  FilterItem({this.value, this.caption, this.onChanged});
+
+  bool value;
+  String caption;
+  Function(bool) onChanged;
+}
\ No newline at end of file
diff --git a/lib/view_model/exchange/exchange_trade_view_model.dart b/lib/view_model/exchange/exchange_trade_view_model.dart
index b623673ed..f773cab37 100644
--- a/lib/view_model/exchange/exchange_trade_view_model.dart
+++ b/lib/view_model/exchange/exchange_trade_view_model.dart
@@ -35,7 +35,8 @@ abstract class ExchangeTradeViewModelBase with Store {
         break;
     }
 
-    items = ObservableList.of([
+    items = ObservableList<ExchangeTradeItem>();
+    items.addAll([
       ExchangeTradeItem(
           title: S.current.id,
           data: '${trade.id}',
@@ -69,7 +70,7 @@ abstract class ExchangeTradeViewModelBase with Store {
   bool isSendable;
 
   @observable
-  ObservableList<ExchangeTradeItem> items;// = ObservableList();
+  ObservableList<ExchangeTradeItem> items;
 
   ExchangeProvider _provider;
 

From 81cdf0d878d5c55648c696643bb4847f5367e7b5 Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Fri, 28 Aug 2020 23:17:36 +0300
Subject: [PATCH 15/15] CAKE-28 | changed filters to filter

---
 lib/generated/i18n.dart   | 20 ++++++++++----------
 res/values/strings_en.arb |  2 +-
 res/values/strings_es.arb |  2 +-
 res/values/strings_hi.arb |  2 +-
 res/values/strings_ja.arb |  2 +-
 res/values/strings_nl.arb |  2 +-
 res/values/strings_pl.arb |  2 +-
 res/values/strings_pt.arb |  2 +-
 res/values/strings_ru.arb |  2 +-
 res/values/strings_uk.arb |  2 +-
 res/values/strings_zh.arb |  2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart
index 79dfa351a..5408734ae 100644
--- a/lib/generated/i18n.dart
+++ b/lib/generated/i18n.dart
@@ -96,7 +96,7 @@ class S implements WidgetsLocalizations {
   String get expired => "Expired";
   String get faq => "FAQ";
   String get fetching => "Fetching";
-  String get filters => "Filters";
+  String get filters => "Filter";
   String get first_wallet_text => "Awesome wallet for Monero";
   String get full_balance => "Full Balance";
   String get hidden_balance => "Hidden Balance";
@@ -1216,7 +1216,7 @@ class $hi extends S {
   @override
   String get estimated => "अनुमानित";
   @override
-  String get filters => "फिल्टर";
+  String get filters => "फ़िल्टर";
   @override
   String get settings_current_node => "वर्तमान नोड";
   @override
@@ -1848,7 +1848,7 @@ class $ru extends S {
   @override
   String get estimated => "Примерно";
   @override
-  String get filters => "Фильтры";
+  String get filters => "Фильтр";
   @override
   String get settings_current_node => "Текущая нода";
   @override
@@ -3112,7 +3112,7 @@ class $pt extends S {
   @override
   String get estimated => "Estimado";
   @override
-  String get filters => "Filtros";
+  String get filters => "Filtro";
   @override
   String get settings_current_node => "Nó atual";
   @override
@@ -3744,7 +3744,7 @@ class $uk extends S {
   @override
   String get estimated => "Приблизно ";
   @override
-  String get filters => "Фільтри";
+  String get filters => "Фільтр";
   @override
   String get settings_current_node => "Поточний вузол";
   @override
@@ -4376,7 +4376,7 @@ class $ja extends S {
   @override
   String get estimated => "推定";
   @override
-  String get filters => "フィルター";
+  String get filters => "フィルタ";
   @override
   String get settings_current_node => "現在のノード";
   @override
@@ -5012,7 +5012,7 @@ class $pl extends S {
   @override
   String get estimated => "Oszacowano";
   @override
-  String get filters => "Filtry";
+  String get filters => "Filtr";
   @override
   String get settings_current_node => "Bieżący węzeł";
   @override
@@ -5644,7 +5644,7 @@ class $es extends S {
   @override
   String get estimated => "Estimado";
   @override
-  String get filters => "Filtros";
+  String get filters => "Filtrar";
   @override
   String get settings_current_node => "Nodo actual";
   @override
@@ -6276,7 +6276,7 @@ class $nl extends S {
   @override
   String get estimated => "Geschatte";
   @override
-  String get filters => "Filters";
+  String get filters => "Filter";
   @override
   String get settings_current_node => "Huidige knooppunt";
   @override
@@ -6908,7 +6908,7 @@ class $zh extends S {
   @override
   String get estimated => "估计的";
   @override
-  String get filters => "筛选器";
+  String get filters => "過濾";
   @override
   String get settings_current_node => "当前节点";
   @override
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 6c0fd2864..277ce28ba 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -43,7 +43,7 @@
   "outgoing" : "Outgoing",
   "transactions_by_date" : "Transactions by date",
   "trades" : "Trades",
-  "filters" : "Filters",
+  "filters" : "Filter",
   "today" : "Today",
   "yesterday" : "Yesterday",
   "received" : "Received",
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 8b3857186..f6cc257f6 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -43,7 +43,7 @@
   "outgoing" : "Saliente",
   "transactions_by_date" : "Transacciones por fecha",
   "trades" : "Cambios",
-  "filters" : "Filtros",
+  "filters" : "Filtrar",
   "today" : "Hoy",
   "yesterday" : "Ayer",
   "received" : "Recibido",
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 2920c8953..9e0e1a032 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -43,7 +43,7 @@
   "outgoing" : "निवर्तमान",
   "transactions_by_date" : "तारीख से लेन-देन",
   "trades" : "ट्रेडों",
-  "filters" : "फिल्टर",
+  "filters" : "फ़िल्टर",
   "today" : "आज",
   "yesterday" : "बिता कल",
   "received" : "प्राप्त किया",
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index a7602342c..a1822f806 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -43,7 +43,7 @@
   "outgoing" : "発信",
   "transactions_by_date" : "日付ごとの取引",
   "trades" : "取引",
-  "filters" : "フィルター",
+  "filters" : "フィルタ",
   "today" : "今日",
   "yesterday" : "昨日",
   "received" : "受け取った",
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 8bdebe752..542be0271 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -43,7 +43,7 @@
   "outgoing" : "Uitgaande",
   "transactions_by_date" : "Transacties op datum",
   "trades" : "Trades",
-  "filters" : "Filters",
+  "filters" : "Filter",
   "today" : "Vandaag",
   "yesterday" : "Gisteren",
   "received" : "Ontvangen",
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 142813bad..da2bd6f2e 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -43,7 +43,7 @@
   "outgoing" : "Towarzyski",
   "transactions_by_date" : "Transakcje według daty",
   "trades" : "Transakcje",
-  "filters" : "Filtry",
+  "filters" : "Filtr",
   "today" : "Dzisiaj",
   "yesterday" : "Wczoraj",
   "received" : "Odebrane",
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index d0492d3c3..7f4df2a4a 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -43,7 +43,7 @@
   "outgoing" : "Enviadas",
   "transactions_by_date" : "Transações por data",
   "trades" : "Trocas",
-  "filters" : "Filtros",
+  "filters" : "Filtro",
   "today" : "Hoje",
   "yesterday" : "Ontem",
   "received" : "Recebida",
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 48a757456..b5f82e379 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -43,7 +43,7 @@
   "outgoing" : "Исходящие",
   "transactions_by_date" : "Сортировать по дате",
   "trades" : "Сделки",
-  "filters" : "Фильтры",
+  "filters" : "Фильтр",
   "today" : "Сегодня",
   "yesterday" : "Вчера",
   "received" : "Полученные",
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 07aee1b92..bcfc96688 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -43,7 +43,7 @@
   "outgoing" : "Вихідні",
   "transactions_by_date" : "Сортувати по даті",
   "trades" : "Торгові операції",
-  "filters" : "Фільтри",
+  "filters" : "Фільтр",
   "today" : "Сьогодні",
   "yesterday" : "Вчора",
   "received" : "Отримані",
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 6ae909518..0f5794a10 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -43,7 +43,7 @@
   "outgoing" : "外向",
   "transactions_by_date" : "按日期交易",
   "trades" : "交易",
-  "filters" : "筛选器",
+  "filters" : "過濾",
   "today" : "今天",
   "yesterday" : "昨天",
   "received" : "已收到",