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(