Merge branch 'master' into CWA-169-add-morph-exchange-to-the-app

lib/src/screens/dashboard/dashboard_page.dart

@@ -112,7 +112,7 @@ class DashboardPageBody extends StatefulWidget {
 }
 
 class DashboardPageBodyState extends State<DashboardPageBody> {
-  static final transactionDateFormat = DateFormat("MMM d, yyyy HH:mm");
+  static final transactionDateFormat = DateFormat("MMMM d, yyyy HH:mm");
 
   final _connectionStatusObserverKey = GlobalKey();
   final _balanceObserverKey = GlobalKey();
@@ -587,7 +587,7 @@ class DashboardPageBodyState extends State<DashboardPageBody> {
                       from: trade.from,
                       to: trade.to,
                       createdAtFormattedDate:
-                          DateFormat("dd.MM.yyyy, H:m").format(trade.createdAt),
+                          transactionDateFormat.format(trade.createdAt),
                       formattedAmount: formattedAmount);
                 }
 

lib/src/screens/settings/items/item_headers.dart

@@ -14,4 +14,5 @@ class ItemHeaders {
   static const support = 'Support';
   static const termsAndConditions = 'Terms and conditions';
   static const faq = 'FAQ';
+  static const version = 'Version';
 }

lib/src/screens/settings/settings.dart

@@ -351,9 +351,9 @@ class SettingsFormState extends State<SettingsForm> {
               final item = _items[index];
               bool _isDrawDivider = true;
 
-              if (item.attribute == Attributes.header) {
+              if (item.attribute == Attributes.header || item == _items.last) {
                 _isDrawDivider = false;
-              } else if (index < _items.length - 1) {
+              } else {
                 if (_items[index + 1].attribute == Attributes.header) {
                   _isDrawDivider = false;
                 }
@@ -381,9 +381,13 @@ class SettingsFormState extends State<SettingsForm> {
                 ],
               );
             }),
-        Container(
-          height: 20.0,
-          color: Theme.of(context).accentTextTheme.headline.backgroundColor,
+        ListTile(
+          contentPadding: EdgeInsets.only(left: 20.0),
+          title: Text(
+            settingsStore.itemHeaders[ItemHeaders.version],
+            style: TextStyle(
+              fontSize: 14.0, color: Palette.wildDarkBlue)
+          ),
         )
       ],
     ));

lib/src/stores/settings/settings_store.dart

@@ -12,6 +12,7 @@ import 'package:cake_wallet/src/stores/action_list/action_list_display_mode.dart
 import 'package:cake_wallet/src/screens/settings/items/item_headers.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/domain/common/default_settings_migration.dart';
+import 'package:package_info/package_info.dart';
 
 part 'settings_store.g.dart';
 
@@ -46,6 +47,9 @@ abstract class SettingsStoreBase with Store {
         (dynamic _) => _sharedPreferences.setInt(displayActionListModeKey,
             serializeActionlistDisplayModes(actionlistDisplayMode)),
         fireImmediately: false);
+
+    PackageInfo.fromPlatform().then((PackageInfo packageInfo) => currentVersion = packageInfo.version);
+
   }
 
   static const currentNodeIdKey = 'current_node_id';
@@ -143,6 +147,7 @@ abstract class SettingsStoreBase with Store {
 
   SharedPreferences _sharedPreferences;
   Box<Node> _nodes;
+  String currentVersion;
 
   @action
   Future setAllowBiometricalAuthentication(
@@ -264,7 +269,8 @@ abstract class SettingsStoreBase with Store {
       ItemHeaders.darkMode: S.current.settings_dark_mode,
       ItemHeaders.support: S.current.settings_support,
       ItemHeaders.termsAndConditions: S.current.settings_terms_and_conditions,
-      ItemHeaders.faq: S.current.faq
+      ItemHeaders.faq: S.current.faq,
+      ItemHeaders.version: S.current.version(currentVersion)
     });
   }