Fixes

lib/src/screens/dashboard/dashboard_page.dart

@@ -108,17 +108,13 @@ class DashboardPage extends BasePage {
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: <Widget>[
               ActionButton(
-                image: sendImage,
-                title: S.of(context).send,
-                route: Routes.send,
-                alignment: Alignment.centerLeft,
-              ),
+                  image: sendImage,
+                  title: S.of(context).send,
+                  route: Routes.send),
               ActionButton(
-                image: sendImage,
-                title: S.of(context).send,
-                route: Routes.send,
-                alignment: Alignment.centerLeft,
-              ),
+                  image: exchangeImage,
+                  title: S.of(context).exchange,
+                  route: Routes.exchange),
             ],
           ),
         )

lib/src/screens/dashboard/widgets/balance_page.dart

@@ -20,7 +20,7 @@ class BalancePage extends StatelessWidget {
             children: <Widget>[
               Observer(builder: (_) {
                 return Text(
-                  dashboardViewModel.wallet.currency.toString(),
+                  dashboardViewModel.balanceViewModel.currency.toString(),
                   style: TextStyle(
                       fontSize: 40,
                       fontWeight: FontWeight.bold,

lib/src/screens/wallet_list/wallet_list_page.dart

@@ -1,4 +1,5 @@
 import 'package:cake_wallet/src/screens/wallet_list/widgets/wallet_menu_alert.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -73,7 +74,7 @@ class WalletListBodyState extends State<WalletListBody> {
 
                     return GestureDetector(
                       onTap: () {
-                        showDialog<void>(
+                        showPopUp<void>(
                             context: context,
                             builder: (dialogContext) {
                               return WalletMenuAlert(

lib/src/screens/welcome/welcome_page.dart

@@ -103,7 +103,7 @@ class WelcomePage extends BasePage {
                     Padding(
                       padding: EdgeInsets.only(top: 24),
                       child: PrimaryImageButton(
-                        onPressed: () => Navigator.pushNamed(context, Routes.newWalletFromWelcome),
+                        onPressed: () => Navigator.pushNamed(context, Routes.newWallet),
                         image: newWalletImage,
                         text: S.of(context).create_new,
                         color: Theme.of(context).accentTextTheme.subtitle.decorationColor,
@@ -113,7 +113,7 @@ class WelcomePage extends BasePage {
                     Padding(
                       padding: EdgeInsets.only(top: 10),
                       child: PrimaryImageButton(
-                          onPressed: () => Navigator.pushNamed(context, Routes.restoreWalletOptionsFromWelcome),
+                          onPressed: () => Navigator.pushNamed(context, Routes.restoreWalletOptions),
                           image: restoreWalletImage,
                           text: S.of(context).restore_wallet,
                           color: Theme.of(context).accentTextTheme.caption.color,