From a47c0ba905b7cef8c6f8e4cc61b61b98ba580dff Mon Sep 17 00:00:00 2001
From: Sergio Yepes <sa.yepes@uniandes.edu.co>
Date: Fri, 15 May 2020 17:44:09 -0500
Subject: [PATCH] no network connection method changed

---
 lib/localization.dart            | 576 +++++++++++++++++--------------
 lib/network/account_service.dart | 284 ++++++++-------
 lib/ui/home_page.dart            |  70 +++-
 pubspec.yaml                     |   3 +
 4 files changed, 546 insertions(+), 387 deletions(-)

diff --git a/lib/localization.dart b/lib/localization.dart
index 74086adc..4f78fb2e 100644
--- a/lib/localization.dart
+++ b/lib/localization.dart
@@ -28,23 +28,19 @@ class AppLocalization {
 
   /// -- GENERIC ITEMS
   String get cancel {
-    return Intl.message('Cancel',
-        desc: 'dialog_cancel', name: 'cancel');
+    return Intl.message('Cancel', desc: 'dialog_cancel', name: 'cancel');
   }
 
   String get close {
-    return Intl.message('Close',
-        desc: 'dialog_close', name: 'close');
+    return Intl.message('Close', desc: 'dialog_close', name: 'close');
   }
 
   String get confirm {
-    return Intl.message('Confirm',
-        desc: 'dialog_confirm', name: 'confirm');
+    return Intl.message('Confirm', desc: 'dialog_confirm', name: 'confirm');
   }
 
   String get no {
-    return Intl.message('No',
-        desc: 'intro_new_wallet_backup_no', name: 'no');
+    return Intl.message('No', desc: 'intro_new_wallet_backup_no', name: 'no');
   }
 
   String get yes {
@@ -53,33 +49,27 @@ class AppLocalization {
   }
 
   String get onStr {
-    return Intl.message('On',
-        desc: 'generic_on', name: 'onStr');
+    return Intl.message('On', desc: 'generic_on', name: 'onStr');
   }
 
   String get off {
-    return Intl.message('Off',
-        desc: 'generic_off', name: 'off');
+    return Intl.message('Off', desc: 'generic_off', name: 'off');
   }
 
   String get send {
-    return Intl.message('Send',
-        desc: 'home_send_cta', name: 'send');
+    return Intl.message('Send', desc: 'home_send_cta', name: 'send');
   }
 
   String get receive {
-    return Intl.message('Receive',
-        desc: 'home_receive_cta', name: 'receive');
+    return Intl.message('Receive', desc: 'home_receive_cta', name: 'receive');
   }
 
   String get sent {
-    return Intl.message('Sent',
-        desc: 'history_sent', name: 'sent');
+    return Intl.message('Sent', desc: 'history_sent', name: 'sent');
   }
 
   String get received {
-    return Intl.message('Received',
-        desc: 'history_received', name: 'received');
+    return Intl.message('Received', desc: 'history_received', name: 'received');
   }
 
   String get transactions {
@@ -109,56 +99,69 @@ class AppLocalization {
 
   String get seed {
     return Intl.message('Seed',
-      desc: 'intro_new_wallet_seed_header', name: 'seed');
+        desc: 'intro_new_wallet_seed_header', name: 'seed');
   }
 
   String get seedInvalid {
     return Intl.message('Seed is Invalid',
-      desc: 'intro_seed_invalid', name: 'seedInvalid');
+        desc: 'intro_seed_invalid', name: 'seedInvalid');
   }
 
   String get seedCopied {
-    return Intl.message('Seed Copied to Clipboard\nIt is pasteable for 2 minutes.',
-      desc: 'intro_new_wallet_seed_copied', name: 'seedCopied');
+    return Intl.message(
+        'Seed Copied to Clipboard\nIt is pasteable for 2 minutes.',
+        desc: 'intro_new_wallet_seed_copied',
+        name: 'seedCopied');
   }
 
   String get scanQrCode {
     return Intl.message('Scan QR Code',
-      desc: 'send_scan_qr', name: 'scanQrCode');
+        desc: 'send_scan_qr', name: 'scanQrCode');
   }
 
   String get contactsImportErr {
     return Intl.message('Failed to import contacts',
-      desc: 'contact_import_error', name: 'contactsImportErr');
+        desc: 'contact_import_error', name: 'contactsImportErr');
   }
 
   String get viewDetails {
     return Intl.message("View Details",
-      desc: "transaction_details", name: 'viewDetails');  
+        desc: "transaction_details", name: 'viewDetails');
   }
 
   String get qrInvalidSeed {
     return Intl.message("QR code does not contain a valid seed or private key",
-      desc: "qr_invalid_seed", name: 'qrInvalidSeed');
+        desc: "qr_invalid_seed", name: 'qrInvalidSeed');
   }
 
   String get qrInvalidAddress {
     return Intl.message("QR code does not contain a valid destination",
-      desc: "qr_invalid_address", name: 'qrInvalidAddress');
+        desc: "qr_invalid_address", name: 'qrInvalidAddress');
   }
 
   String get qrInvalidPermissions {
     return Intl.message("Please Grant Camera Permissions to scan QR Codes",
-      desc: "User did not grant camera permissions to the app", name: "qrInvalidPermissions");
+        desc: "User did not grant camera permissions to the app",
+        name: "qrInvalidPermissions");
   }
 
   String get qrUnknownError {
     return Intl.message("Could not Read QR Code",
-      desc: "An unknown error occurred with the QR scanner", name: "qrUnknownError");
+        desc: "An unknown error occurred with the QR scanner",
+        name: "qrUnknownError");
   }
 
   /// -- END GENERIC ITEMS
 
+  
+
+  /// -- CONECTIVITY ISSUES
+  String get noNetworkConnection {
+    return Intl.message('Check your network connection!',
+        desc: 'home_network_connection_failed', name: 'noNetworkConnection');
+  }
+  /// -- END CONECTIVITY ISSUES
+  
   /// -- CONTACT ITEMS
 
   String get removeContact {
@@ -168,17 +171,17 @@ class AppLocalization {
 
   String get removeContactConfirmation {
     return Intl.message('Are you sure you want to delete %1?',
-      desc: 'contact_remove_sure', name: 'removeContactConfirmation');
+        desc: 'contact_remove_sure', name: 'removeContactConfirmation');
   }
 
   String get contactHeader {
     return Intl.message('Contact',
-      desc: 'contact_view_header', name: 'contactHeader');
+        desc: 'contact_view_header', name: 'contactHeader');
   }
 
   String get contactsHeader {
     return Intl.message('Contacts',
-      desc: 'contact_header', name: 'contactsHeader');
+        desc: 'contact_header', name: 'contactsHeader');
   }
 
   String get addContact {
@@ -193,42 +196,42 @@ class AppLocalization {
 
   String get contactInvalid {
     return Intl.message("Invalid Contact Name",
-      desc: 'contact_invalid_name', name: 'contactInvalid');
+        desc: 'contact_invalid_name', name: 'contactInvalid');
   }
 
   String get noContactsExport {
     return Intl.message("There's no contacts to export.",
-      desc: 'contact_export_none', name: 'noContactsExport');
+        desc: 'contact_export_none', name: 'noContactsExport');
   }
 
   String get noContactsImport {
     return Intl.message("No new contacts to import.",
-      desc: 'contact_import_none', name: 'noContactsImport');
+        desc: 'contact_import_none', name: 'noContactsImport');
   }
 
   String get contactsImportSuccess {
     return Intl.message("Sucessfully imported %1 contacts.",
-      desc: 'contact_import_success', name: 'contactsImportSuccess');
+        desc: 'contact_import_success', name: 'contactsImportSuccess');
   }
 
   String get contactAdded {
     return Intl.message("%1 added to contacts.",
-      desc: 'contact_added', name: 'contactAdded');
+        desc: 'contact_added', name: 'contactAdded');
   }
 
   String get contactRemoved {
     return Intl.message("%1 has been removed from contacts!",
-      desc: 'contact_removed', name: 'contactRemoved');
+        desc: 'contact_removed', name: 'contactRemoved');
   }
 
   String get contactNameMissing {
     return Intl.message("Choose a Name for this Contact",
-      desc: 'contact_name_missing', name: 'contactNameMissing');
+        desc: 'contact_name_missing', name: 'contactNameMissing');
   }
 
   String get contactExists {
     return Intl.message("Contact Already Exists",
-      desc: 'contact_name_exists', name: 'contactExists');
+        desc: 'contact_name_exists', name: 'contactExists');
   }
 
   /// -- END CONTACT ITEMS
@@ -245,18 +248,19 @@ class AppLocalization {
   }
 
   String get seedBackupInfo {
-    return Intl.message("Below is your wallet's seed. It is crucial that you backup your seed and never store it as plaintext or a screenshot.",
-        desc: 'intro_new_wallet_seed', name: 'seedBackupInfo');
+    return Intl.message(
+        "Below is your wallet's seed. It is crucial that you backup your seed and never store it as plaintext or a screenshot.",
+        desc: 'intro_new_wallet_seed',
+        name: 'seedBackupInfo');
   }
 
   String get copySeed {
-    return Intl.message("Copy Seed",
-      desc: 'copy_seed_btn', name: 'copySeed');
+    return Intl.message("Copy Seed", desc: 'copy_seed_btn', name: 'copySeed');
   }
 
   String get seedCopiedShort {
     return Intl.message("Seed Copied",
-      desc: 'seed_copied_btn', name: 'seedCopiedShort');
+        desc: 'seed_copied_btn', name: 'seedCopiedShort');
   }
 
   String get importSeed {
@@ -270,8 +274,10 @@ class AppLocalization {
   }
 
   String get welcomeText {
-    return Intl.message("Welcome to Natrium. To begin, you may create a new wallet or import an existing one.",
-        desc: 'intro_welcome_title', name: 'welcomeText');
+    return Intl.message(
+        "Welcome to Natrium. To begin, you may create a new wallet or import an existing one.",
+        desc: 'intro_welcome_title',
+        name: 'welcomeText');
   }
 
   String get newWallet {
@@ -283,22 +289,20 @@ class AppLocalization {
     return Intl.message("Import Wallet",
         desc: 'intro_welcome_have_wallet', name: 'importWallet');
   }
+
   /// -- END INTRO ITEMS
 
   /// -- SEND ITEMS
   String get sentTo {
-    return Intl.message("Sent To",
-        desc: 'sent_to', name: 'sentTo');
+    return Intl.message("Sent To", desc: 'sent_to', name: 'sentTo');
   }
 
   String get sending {
-    return Intl.message("Sending",
-        desc: 'send_sending', name: 'sending');
+    return Intl.message("Sending", desc: 'send_sending', name: 'sending');
   }
 
   String get to {
-    return Intl.message("To",
-        desc: 'send_to', name: 'to');
+    return Intl.message("To", desc: 'send_to', name: 'to');
   }
 
   String get sendAmountConfirm {
@@ -312,79 +316,81 @@ class AppLocalization {
 
   String get sendError {
     return Intl.message("An error occured. Try again later.",
-      desc: 'send_generic_error', name: 'sendError');
+        desc: 'send_generic_error', name: 'sendError');
   }
 
   String get mantaError {
     return Intl.message("Couldn't Verify Request",
-      desc: 'Was unable to verify the manta/appia payment request (from scanning QR code, etc.)', name: 'mantaError');
+        desc:
+            'Was unable to verify the manta/appia payment request (from scanning QR code, etc.)',
+        name: 'mantaError');
   }
 
   String get enterAmount {
     return Intl.message("Enter Amount",
-      desc: 'send_amount_hint', name: 'enterAmount');
+        desc: 'send_amount_hint', name: 'enterAmount');
   }
 
   String get enterAddress {
     return Intl.message("Enter Address",
-      desc: 'enter_address', name: 'enterAddress');
+        desc: 'enter_address', name: 'enterAddress');
   }
 
   String get invalidAddress {
     return Intl.message("Address entered was invalid",
-      desc: 'send_invalid_address', name: 'invalidAddress');
+        desc: 'send_invalid_address', name: 'invalidAddress');
   }
 
   String get addressMising {
     return Intl.message("Please Enter an Address",
-      desc: 'send_enter_address', name: 'addressMising');
+        desc: 'send_enter_address', name: 'addressMising');
   }
-  
+
   String get amountMissing {
     return Intl.message("Please Enter an Amount",
-      desc: 'send_enter_amount', name: 'amountMissing');
+        desc: 'send_enter_amount', name: 'amountMissing');
   }
 
   String get minimumSend {
     return Intl.message("Minimum send amount is %1 NANO",
-      desc: 'send_minimum_error', name: 'amountMinimumError');
+        desc: 'send_minimum_error', name: 'amountMinimumError');
   }
 
   String get insufficientBalance {
     return Intl.message("Insufficient Balance",
-      desc: 'send_insufficient_balance', name: 'insufficientBalance');
+        desc: 'send_insufficient_balance', name: 'insufficientBalance');
   }
 
   String get sendFrom {
-    return Intl.message("Send From",
-      desc: 'send_title', name: 'sendFrom');
+    return Intl.message("Send From", desc: 'send_title', name: 'sendFrom');
   }
+
   /// -- END SEND ITEMS
 
   /// -- PIN SCREEN
   String get pinCreateTitle {
     return Intl.message("Create a 6-digit pin",
-      desc: 'pin_create_title', name: 'pinCreateTitle');
+        desc: 'pin_create_title', name: 'pinCreateTitle');
   }
 
   String get pinConfirmTitle {
     return Intl.message("Confirm your pin",
-      desc: 'pin_confirm_title', name: 'pinConfirmTitle');
+        desc: 'pin_confirm_title', name: 'pinConfirmTitle');
   }
 
   String get pinEnterTitle {
     return Intl.message("Enter pin",
-      desc: 'pin_enter_title', name: 'pinEnterTitle');
+        desc: 'pin_enter_title', name: 'pinEnterTitle');
   }
 
   String get pinConfirmError {
     return Intl.message("Pins do not match",
-      desc: 'pin_confirm_error', name: 'pinConfirmError');
+        desc: 'pin_confirm_error', name: 'pinConfirmError');
   }
 
   String get pinInvalid {
     return Intl.message("Invalid pin entered",
-      desc: 'pin_error', name: 'pinInvalid');
+        desc: 'pin_error', name: 'pinInvalid');
   }
 
   /// -- END PIN SCREEN
@@ -392,324 +398,339 @@ class AppLocalization {
   /// -- SETTINGS ITEMS
 
   String get themeHeader {
-    return Intl.message("Theme",
-      desc: 'theme_header', name: 'themeHeader');
+    return Intl.message("Theme", desc: 'theme_header', name: 'themeHeader');
   }
 
   String get changeRepButton {
     return Intl.message("Change",
-      desc: 'change_representative_change', name: 'changeRepButton');
+        desc: 'change_representative_change', name: 'changeRepButton');
   }
 
   String get changeRepAuthenticate {
     return Intl.message("Change Representative",
-      desc: 'settings_change_rep', name: 'changeRepAuthenticate');
+        desc: 'settings_change_rep', name: 'changeRepAuthenticate');
   }
 
   String get currentlyRepresented {
     return Intl.message("Currently Represented By",
-      desc: 'change_representative_current_header', name: 'currentlyRepresented');
+        desc: 'change_representative_current_header',
+        name: 'currentlyRepresented');
   }
 
   String get changeRepSucces {
     return Intl.message("Representative Changed Successfully",
-      desc: 'change_representative_success', name: 'changeRepSucces');
+        desc: 'change_representative_success', name: 'changeRepSucces');
   }
 
   String get repInfoHeader {
     return Intl.message("What is a representative?",
-      desc: 'change_representative_info_header', name: 'repInfoHeader');
+        desc: 'change_representative_info_header', name: 'repInfoHeader');
   }
-  
+
   String get repInfo {
-    return Intl.message("A representative is an account that votes for network consensus. Voting power is weighted by balance, you may delegate your balance to increase the voting weight of a representative you trust. Your representative does not have spending power over your funds. You should choose a representative that has little downtime and is trustworthy.",
-      desc: 'change_representative_info', name: 'repInfo');
+    return Intl.message(
+        "A representative is an account that votes for network consensus. Voting power is weighted by balance, you may delegate your balance to increase the voting weight of a representative you trust. Your representative does not have spending power over your funds. You should choose a representative that has little downtime and is trustworthy.",
+        desc: 'change_representative_info',
+        name: 'repInfo');
   }
 
   String get pinRepChange {
     return Intl.message("Enter PIN to change representative.",
-      desc: 'change_representative_pin', name: 'pinRepChange');
+        desc: 'change_representative_pin', name: 'pinRepChange');
   }
 
   String get changeRepHint {
     return Intl.message("Enter New Representative",
-      desc: 'change_representative_hint', name: 'changeRepHint');
+        desc: 'change_representative_hint', name: 'changeRepHint');
   }
 
   String get representatives {
     return Intl.message("Representatives",
-      desc: 'representatives', name: 'representatives');
+        desc: 'representatives', name: 'representatives');
   }
 
   String get pickFromList {
     return Intl.message("Pick From a List",
-      desc: 'pick rep from list', name: 'pickFromList');
+        desc: 'pick rep from list', name: 'pickFromList');
   }
 
   String get votingWeight {
     return Intl.message("Voting Weight",
-      desc: 'Representative Voting Weight', name: 'votingWeight');
+        desc: 'Representative Voting Weight', name: 'votingWeight');
   }
 
   String get uptime {
-    return Intl.message("Uptime",
-      desc: 'Rep uptime', name: 'uptime');
+    return Intl.message("Uptime", desc: 'Rep uptime', name: 'uptime');
   }
 
   String get authMethod {
     return Intl.message("Authentication Method",
-      desc: 'settings_disable_fingerprint', name: 'authMethod');
+        desc: 'settings_disable_fingerprint', name: 'authMethod');
   }
 
   String get pinMethod {
-    return Intl.message("PIN",
-      desc: 'settings_pin_method', name: 'pinMethod');
+    return Intl.message("PIN", desc: 'settings_pin_method', name: 'pinMethod');
   }
 
   String get privacyPolicy {
     return Intl.message("Privacy Policy",
-      desc: 'settings_privacy_policy', name: 'privacyPolicy');
+        desc: 'settings_privacy_policy', name: 'privacyPolicy');
   }
 
   String get biometricsMethod {
     return Intl.message("Biometrics",
-      desc: 'settings_fingerprint_method', name: 'biometricsMethod');
+        desc: 'settings_fingerprint_method', name: 'biometricsMethod');
   }
 
   String get currency {
     return Intl.message("Currency",
-      desc: 'A settings menu item for changing currency', name: 'currency');
+        desc: 'A settings menu item for changing currency', name: 'currency');
   }
 
   String get changeCurrency {
     return Intl.message("Change Currency",
-      desc: 'settings_local_currency', name: 'changeCurrency');
+        desc: 'settings_local_currency', name: 'changeCurrency');
   }
 
   String get language {
     return Intl.message("Language",
-      desc: 'settings_change_language', name: 'language');
+        desc: 'settings_change_language', name: 'language');
   }
 
   String get shareNatrium {
     return Intl.message("Share Natrium",
-      desc: 'settings_share', name: 'shareNatrium');
+        desc: 'settings_share', name: 'shareNatrium');
   }
 
   String get shareNatriumText {
     return Intl.message("Check out Natrium! A premier NANO mobile wallet!",
-      desc: 'share_extra', name: 'shareNatriumText');
+        desc: 'share_extra', name: 'shareNatriumText');
   }
 
   String get logout {
-    return Intl.message("Logout",
-      desc: 'settings_logout', name: 'logout');
+    return Intl.message("Logout", desc: 'settings_logout', name: 'logout');
   }
 
   String get rootWarning {
-    return Intl.message('It appears your device is "rooted", "jailbroken", or modified in a way that compromises security. It is recommended that you reset your device to its original state before proceeding.',
-    desc: "Shown to users if they have a rooted Android device or jailbroken iOS device", name: 'rootWarning');
+    return Intl.message(
+        'It appears your device is "rooted", "jailbroken", or modified in a way that compromises security. It is recommended that you reset your device to its original state before proceeding.',
+        desc:
+            "Shown to users if they have a rooted Android device or jailbroken iOS device",
+        name: 'rootWarning');
   }
 
   String get iUnderstandTheRisks {
     return Intl.message("I Understand the Risks",
-    desc: "Shown to users if they have a rooted Android device or jailbroken iOS device", name: 'iUnderstandTheRisks');
+        desc:
+            "Shown to users if they have a rooted Android device or jailbroken iOS device",
+        name: 'iUnderstandTheRisks');
   }
 
   String get exit {
     return Intl.message("Exit",
-    desc: "Exit action, like a button", name: 'exit');
+        desc: "Exit action, like a button", name: 'exit');
   }
 
   String get warning {
     return Intl.message("Warning",
-      desc: 'settings_logout_alert_title', name: 'warning');
+        desc: 'settings_logout_alert_title', name: 'warning');
   }
 
   String get logoutDetail {
-    return Intl.message("Logging out will remove your seed and all Natrium-related data from this device. If your seed is not backed up, you will never be able to access your funds again",
-      desc: 'settings_logout_alert_message', name: 'logoutDetail');
+    return Intl.message(
+        "Logging out will remove your seed and all Natrium-related data from this device. If your seed is not backed up, you will never be able to access your funds again",
+        desc: 'settings_logout_alert_message',
+        name: 'logoutDetail');
   }
 
   String get logoutAction {
     return Intl.message("Delete Seed and Logout",
-      desc: 'settings_logout_alert_confirm_cta', name: 'logoutAction');
+        desc: 'settings_logout_alert_confirm_cta', name: 'logoutAction');
   }
 
   String get logoutAreYouSure {
     return Intl.message("Are you sure?",
-      desc: 'settings_logout_warning_title', name: 'logoutAreYouSure');
+        desc: 'settings_logout_warning_title', name: 'logoutAreYouSure');
   }
 
   String get logoutReassurance {
-    return Intl.message("As long as you've backed up your seed you have nothing to worry about.",
-      desc: 'settings_logout_warning_message', name: 'logoutReassurance');
+    return Intl.message(
+        "As long as you've backed up your seed you have nothing to worry about.",
+        desc: 'settings_logout_warning_message',
+        name: 'logoutReassurance');
   }
 
   String get settingsHeader {
     return Intl.message("Settings",
-      desc: 'settings_title', name: 'settingsHeader');
+        desc: 'settings_title', name: 'settingsHeader');
   }
 
   String get preferences {
     return Intl.message("Preferences",
-      desc: 'settings_preferences_header', name: 'preferences');
+        desc: 'settings_preferences_header', name: 'preferences');
   }
 
   String get manage {
     return Intl.message("Manage",
-      desc: 'settings_manage_header', name: 'manage');
+        desc: 'settings_manage_header', name: 'manage');
   }
 
   String get backupSeed {
     return Intl.message("Backup Seed",
-      desc: 'settings_backup_seed', name: 'backupSeed');
+        desc: 'settings_backup_seed', name: 'backupSeed');
   }
 
   String get fingerprintSeedBackup {
     return Intl.message("Authenticate to backup seed.",
-      desc: 'settings_fingerprint_title', name: 'fingerprintSeedBackup');
+        desc: 'settings_fingerprint_title', name: 'fingerprintSeedBackup');
   }
 
   String get pinSeedBackup {
     return Intl.message("Enter PIN to Backup Seed",
-      desc: 'settings_pin_title', name: 'pinSeedBackup');
+        desc: 'settings_pin_title', name: 'pinSeedBackup');
   }
 
   String get systemDefault {
     return Intl.message("System Default",
-      desc: 'settings_default_language_string', name: 'systemDefault');
+        desc: 'settings_default_language_string', name: 'systemDefault');
   }
 
   String get notifications {
     return Intl.message("Notifications",
-      desc: 'notifications_settings', name: 'notifications');
+        desc: 'notifications_settings', name: 'notifications');
   }
 
   String get notificationTitle {
     return Intl.message("Received %1 NANO",
-      desc: 'notification_title', name: 'notificationTitle');
+        desc: 'notification_title', name: 'notificationTitle');
   }
 
   String get notificationBody {
     return Intl.message("Open Natrium to view this transaction",
-      desc: 'notification_body', name: 'notificationBody');
+        desc: 'notification_body', name: 'notificationBody');
   }
 
   String get notificationHeaderSupplement {
     return Intl.message("Tap to open",
-      desc: 'notificaiton_header_suplement', name: 'notificationHeaderSupplement');
+        desc: 'notificaiton_header_suplement',
+        name: 'notificationHeaderSupplement');
   }
 
-
   /// -- END SETTINGS ITEMS
 
   /// -- TRANSFER
   // Settings
   String get settingsTransfer {
     return Intl.message("Load from Paper Wallet",
-      desc: 'settings_transfer', name: 'settingsTransfer');
+        desc: 'settings_transfer', name: 'settingsTransfer');
   }
 
   String get transferError {
-    return Intl.message("An error has occurred during the transfer. Please try again later.",
-      desc: 'transfer_error', name: 'transferError');
+    return Intl.message(
+        "An error has occurred during the transfer. Please try again later.",
+        desc: 'transfer_error',
+        name: 'transferError');
   }
 
   String get paperWallet {
     return Intl.message("Paper Wallet",
-      desc: 'paper_wallet', name: 'paperWallet');
+        desc: 'paper_wallet', name: 'paperWallet');
   }
 
   String get kaliumWallet {
     return Intl.message("Natrium Wallet",
-      desc: 'kalium_wallet', name: 'kaliumWallet');
+        desc: 'kalium_wallet', name: 'kaliumWallet');
   }
 
   String get manualEntry {
     return Intl.message("Manual Entry",
-      desc: 'transfer_manual_entry', name: 'manualEntry');
-  } 
+        desc: 'transfer_manual_entry', name: 'manualEntry');
+  }
 
   String get mnemonicPhrase {
     return Intl.message("Mnemonic Phrase",
-      desc: 'mnemonic_phrase', name: 'mnemonicPhrase');
-  }  
+        desc: 'mnemonic_phrase', name: 'mnemonicPhrase');
+  }
 
   String get rawSeed {
-    return Intl.message("Raw Seed",
-      desc: 'raw_seed', name: 'rawSeed');
+    return Intl.message("Raw Seed", desc: 'raw_seed', name: 'rawSeed');
   }
 
   // Initial Screen
 
   String get transferHeader {
     return Intl.message("Transfer Funds",
-      desc: 'transfer_header', name: 'transferHeader');
+        desc: 'transfer_header', name: 'transferHeader');
   }
 
   String get transfer {
-    return Intl.message("Transfer",
-      desc: 'transfer_btn', name: 'transfer');
+    return Intl.message("Transfer", desc: 'transfer_btn', name: 'transfer');
   }
 
   String get transferManualHint {
     return Intl.message("Please enter the seed below.",
-      desc: 'transfer_hint', name: 'transferManualHint');
+        desc: 'transfer_hint', name: 'transferManualHint');
   }
 
   String get transferIntro {
-    return Intl.message("This process will transfer the funds from a paper wallet to your Natrium wallet.\n\nTap the \"%1\" button to start.",
-      desc: 'transfer_intro', name: 'transferIntro');
+    return Intl.message(
+        "This process will transfer the funds from a paper wallet to your Natrium wallet.\n\nTap the \"%1\" button to start.",
+        desc: 'transfer_intro',
+        name: 'transferIntro');
   }
 
   String get transferQrScanHint {
     return Intl.message("Scan a Nano \nseed or private key",
-      desc: 'transfer_qr_scan_hint', name: 'transferQrScanHint');
+        desc: 'transfer_qr_scan_hint', name: 'transferQrScanHint');
   }
 
   String get transferQrScanError {
     return Intl.message("This QR code does not contain a valid seed.",
-      desc: 'transfer_qr_scan_error', name: 'transferQrScanError');
+        desc: 'transfer_qr_scan_error', name: 'transferQrScanError');
   }
 
   String get transferNoFunds {
     return Intl.message("This seed does not have any NANO on it",
-      desc: 'transfer_no_funds_toast', name: 'transferNoFunds');
+        desc: 'transfer_no_funds_toast', name: 'transferNoFunds');
   }
 
   // Confirm screen
 
   String get transferConfirmInfo {
-    return Intl.message("A wallet with a balance of %1 NANO has been detected.\n",
-      desc: 'transfer_confirm_info_first', name: 'transferConfirmInfo');
+    return Intl.message(
+        "A wallet with a balance of %1 NANO has been detected.\n",
+        desc: 'transfer_confirm_info_first',
+        name: 'transferConfirmInfo');
   }
 
   String get transferConfirmInfoSecond {
     return Intl.message("Tap confirm to transfer the funds.\n",
-      desc: 'transfer_confirm_info_second', name: 'transferConfirmInfoSecond');
+        desc: 'transfer_confirm_info_second',
+        name: 'transferConfirmInfoSecond');
   }
 
   String get transferConfirmInfoThird {
     return Intl.message("Transfer may take several seconds to complete.",
-      desc: 'transfer_confirm_info_third', name: 'transferConfirmInfoThird');
+        desc: 'transfer_confirm_info_third', name: 'transferConfirmInfoThird');
   }
 
   String get transferLoading {
     return Intl.message("Transferring",
-      desc: 'transfer_loading_text', name: 'transferLoading');
+        desc: 'transfer_loading_text', name: 'transferLoading');
   }
 
   // Compelte screen
 
   String get transferComplete {
-    return Intl.message("%1 NANO successfully transferred to your Natrium Wallet.\n",
-      desc: 'transfer_complete_text', name: 'transferComplete');
+    return Intl.message(
+        "%1 NANO successfully transferred to your Natrium Wallet.\n",
+        desc: 'transfer_complete_text',
+        name: 'transferComplete');
   }
 
   String get transferClose {
     return Intl.message("Tap anywhere to close the window.",
-      desc: 'transfer_close_text', name: 'transferClose');
+        desc: 'transfer_close_text', name: 'transferClose');
   }
 
   // -- END TRANSFER ITEMS
@@ -718,99 +739,100 @@ class AppLocalization {
 
   String get scanInstructions {
     return Intl.message("Scan a Nano \naddress QR code",
-      desc: 'scan_send_instruction_label', name: 'scanInstructions');
+        desc: 'scan_send_instruction_label', name: 'scanInstructions');
   }
 
-  /// -- LOCK SCREEN 
+  /// -- LOCK SCREEN
 
   String get unlockPin {
     return Intl.message("Enter PIN to Unlock Natrium",
-      desc: 'unlock_kalium_pin', name: 'unlockPin');
+        desc: 'unlock_kalium_pin', name: 'unlockPin');
   }
 
   String get unlockBiometrics {
     return Intl.message("Authenticate to Unlock Natrium",
-      desc: 'unlock_kalium_bio', name: 'unlockBiometrics');
+        desc: 'unlock_kalium_bio', name: 'unlockBiometrics');
   }
 
   String get lockAppSetting {
     return Intl.message("Authenticate on Launch",
-      desc: 'authenticate_on_launch', name: 'lockAppSetting');
+        desc: 'authenticate_on_launch', name: 'lockAppSetting');
   }
 
   String get locked {
-    return Intl.message("Locked",
-      desc: 'lockedtxt', name: 'locked');
+    return Intl.message("Locked", desc: 'lockedtxt', name: 'locked');
   }
 
   String get unlock {
-    return Intl.message("Unlock",
-      desc: 'unlocktxt', name: 'unlock');
+    return Intl.message("Unlock", desc: 'unlocktxt', name: 'unlock');
   }
 
   String get tooManyFailedAttempts {
     return Intl.message("Too many failed unlock attempts.",
-      desc: 'fail_toomany_attempts', name: 'tooManyFailedAttempts');
+        desc: 'fail_toomany_attempts', name: 'tooManyFailedAttempts');
   }
 
-
   /// -- END LOCK SCREEN
 
   /// -- SECURITY SETTINGS SUBMENU
 
   String get securityHeader {
     return Intl.message("Security",
-      desc: 'security_header', name:'securityHeader');
+        desc: 'security_header', name: 'securityHeader');
   }
 
   String get autoLockHeader {
     return Intl.message("Automatically Lock",
-      desc: 'auto_lock_header', name:'autoLockHeader');
+        desc: 'auto_lock_header', name: 'autoLockHeader');
   }
 
   String get xMinutes {
     return Intl.message("After %1 minutes",
-      desc: 'after_minutes', name: 'xMinutes');
+        desc: 'after_minutes', name: 'xMinutes');
   }
 
   String get xMinute {
     return Intl.message("After %1 minute",
-      desc: 'after_minute', name: 'xMinute');
+        desc: 'after_minute', name: 'xMinute');
   }
 
   String get instantly {
-    return Intl.message("Instantly",
-      desc: 'insantly', name: 'instantly');
+    return Intl.message("Instantly", desc: 'insantly', name: 'instantly');
   }
 
   String get setWalletPassword {
     return Intl.message("Set Wallet Password",
-      desc: 'Allows user to encrypt wallet with a password', name: 'setWalletPassword');
+        desc: 'Allows user to encrypt wallet with a password',
+        name: 'setWalletPassword');
   }
 
   String get setPassword {
     return Intl.message("Set Password",
-      desc: 'A button that sets the wallet password', name: 'setPassword');
+        desc: 'A button that sets the wallet password', name: 'setPassword');
   }
 
   String get disableWalletPassword {
     return Intl.message("Disable Wallet Password",
-      desc: 'Allows user to deencrypt wallet with a password', name: 'disableWalletPassword');
+        desc: 'Allows user to deencrypt wallet with a password',
+        name: 'disableWalletPassword');
   }
 
   String get encryptionFailedError {
     return Intl.message("Failed to set a wallet password",
-      desc: 'If encrypting a wallet raised an error', name: 'encryptionFailedError');
+        desc: 'If encrypting a wallet raised an error',
+        name: 'encryptionFailedError');
   }
 
   String get setPasswordSuccess {
     return Intl.message("Password has been set successfully",
-      desc: 'Setting a Wallet Password was successful', name: 'setPasswordSuccess');
+        desc: 'Setting a Wallet Password was successful',
+        name: 'setPasswordSuccess');
   }
 
   String get disablePasswordSuccess {
     return Intl.message("Password has been disabled",
-      desc: 'Disabling a Wallet Password was successful', name: 'disablePasswordSuccess');
+        desc: 'Disabling a Wallet Password was successful',
+        name: 'disablePasswordSuccess');
   }
 
   /// -- END SECURITY SETTINGS SUBMENU
@@ -818,28 +840,30 @@ class AppLocalization {
   /// -- EXAMPLE HOME SCREEN CARDS
 
   String get exampleCardIntro {
-    return Intl.message("Welcome to Natrium. Once you receive NANO, transactions will show up like this:",
-      desc: 'example_card_intro', name: 'exampleCardIntro');
+    return Intl.message(
+        "Welcome to Natrium. Once you receive NANO, transactions will show up like this:",
+        desc: 'example_card_intro',
+        name: 'exampleCardIntro');
   }
 
   String get exampleCardLittle {
     return Intl.message("A little",
-      desc: 'example_card_little', name: 'exampleCardLittle');
+        desc: 'example_card_little', name: 'exampleCardLittle');
   }
 
   String get exampleCardLot {
     return Intl.message("A lot of",
-      desc: 'example_card_lot', name: 'exampleCardLot');
+        desc: 'example_card_lot', name: 'exampleCardLot');
   }
 
   String get exampleCardTo {
     return Intl.message("to someone",
-      desc: 'example_card_to', name: 'exampleCardTo');
+        desc: 'example_card_to', name: 'exampleCardTo');
   }
 
   String get exampleCardFrom {
     return Intl.message("from someone",
-      desc: 'example_card_from', name: 'exampleCardFrom');
+        desc: 'example_card_from', name: 'exampleCardFrom');
   }
 
   /// -- END EXAMPLE HOME SCREEN CARDS
@@ -848,277 +872,325 @@ class AppLocalization {
 
   String get defaultAccountName {
     return Intl.message("Main Account",
-      desc: "Default account name", name: 'defaultAccountName');
+        desc: "Default account name", name: 'defaultAccountName');
   }
 
   String get defaultNewAccountName {
     return Intl.message("Account %1",
-      desc: "Default new account name - e.g. Account 1", name: 'defaultNewAccountName');
+        desc: "Default new account name - e.g. Account 1",
+        name: 'defaultNewAccountName');
   }
 
   String get newAccountIntro {
-    return Intl.message("This is your new account. Once you receive NANO, transactions will show up like this:",
-      desc: 'Alternate account intro card', name: 'newAccountIntro');
+    return Intl.message(
+        "This is your new account. Once you receive NANO, transactions will show up like this:",
+        desc: 'Alternate account intro card',
+        name: 'newAccountIntro');
   }
 
   String get account {
-    return Intl.message("Account",
-      desc: "Account text", name: 'account');
+    return Intl.message("Account", desc: "Account text", name: 'account');
   }
 
   String get accounts {
-    return Intl.message("Accounts",
-      desc: "Accounts header", name: 'accounts');
+    return Intl.message("Accounts", desc: "Accounts header", name: 'accounts');
   }
 
   String get addAccount {
     return Intl.message("Add Account",
-      desc: "Default new account name - e.g. Account 1", name: 'addAccount');
+        desc: "Default new account name - e.g. Account 1", name: 'addAccount');
   }
 
   String get hideAccountHeader {
     return Intl.message("Hide Account?",
-      desc: "Confirmation dialog header", name: 'hideAccountHeader');
+        desc: "Confirmation dialog header", name: 'hideAccountHeader');
   }
 
   String get removeAccountText {
-    return Intl.message("Are you sure you want to hide this account? You can re-add it later by tapping the \"%1\" button.",
-      desc: "Remove account dialog body", name: 'removeAccountText');
+    return Intl.message(
+        "Are you sure you want to hide this account? You can re-add it later by tapping the \"%1\" button.",
+        desc: "Remove account dialog body",
+        name: 'removeAccountText');
   }
 
   /// -- END MULTI-ACCOUNT
 
   String get tapToReveal {
     return Intl.message("Tap to reveal",
-      desc: "Tap to reveal hidden content", name: 'tapToReveal');
+        desc: "Tap to reveal hidden content", name: 'tapToReveal');
   }
 
   String get tapToHide {
     return Intl.message("Tap to hide",
-      desc: "Tap to hide content", name: 'tapToHide');
+        desc: "Tap to hide content", name: 'tapToHide');
   }
 
   String get copied {
     return Intl.message("Copied",
-      desc: "Copied (to clipboard)", name: 'copied');
+        desc: "Copied (to clipboard)", name: 'copied');
   }
 
   String get copy {
-    return Intl.message("Copy",
-      desc: "Copy (to clipboard)", name: 'copy');
+    return Intl.message("Copy", desc: "Copy (to clipboard)", name: 'copy');
   }
 
   String get seedDescription {
-    return Intl.message("A seed bears the same information as a secret phrase, but in a machine-readable way. As long as you have one of them backed up, you'll have access to your funds.",
-      desc: "Describing what a seed is", name: 'seedDescription');
+    return Intl.message(
+        "A seed bears the same information as a secret phrase, but in a machine-readable way. As long as you have one of them backed up, you'll have access to your funds.",
+        desc: "Describing what a seed is",
+        name: 'seedDescription');
   }
 
   String get importSecretPhrase {
     return Intl.message("Import Secret Phrase",
-      desc: "Header for restoring using mnemonic", name: 'importSecretPhrase');
+        desc: "Header for restoring using mnemonic",
+        name: 'importSecretPhrase');
   }
 
   String get importSecretPhraseHint {
-      return Intl.message("Please enter your 24-word secret phrase below. Each word should be separated by a space.",
-        desc: 'helper message for importing mnemnic', name: 'importSecretPhraseHint');
+    return Intl.message(
+        "Please enter your 24-word secret phrase below. Each word should be separated by a space.",
+        desc: 'helper message for importing mnemnic',
+        name: 'importSecretPhraseHint');
   }
 
   String get qrMnemonicError {
     return Intl.message("QR does not contain a valid secret phrase",
-      desc: 'When QR does not contain a valid mnemonic phrase', name: 'qrMnemonicError');
+        desc: 'When QR does not contain a valid mnemonic phrase',
+        name: 'qrMnemonicError');
   }
 
   String get mnemonicInvalidWord {
     return Intl.message("%1 is not a valid word",
-      desc: 'A word that is not part of bip39', name: 'mnemonicInvalidWord');
+        desc: 'A word that is not part of bip39', name: 'mnemonicInvalidWord');
   }
 
   String get mnemonicSizeError {
     return Intl.message("Secret phrase may only contain 24 words",
-      desc: 'err', name: 'mnemonicSizeError');    
+        desc: 'err', name: 'mnemonicSizeError');
   }
 
   String get secretPhrase {
     return Intl.message("Secret Phrase",
-      desc: 'Secret (mnemonic) phrase', name: 'secretPhrase');
+        desc: 'Secret (mnemonic) phrase', name: 'secretPhrase');
   }
 
   String get backupConfirmButton {
     return Intl.message("I've Backed It Up",
-      desc: 'Has backed up seed confirmation button', name: 'backupConfirmButton');    
+        desc: 'Has backed up seed confirmation button',
+        name: 'backupConfirmButton');
   }
 
   String get secretInfoHeader {
     return Intl.message("Safety First!",
-      desc: 'secret info header', name: 'secretInfoHeader');
+        desc: 'secret info header', name: 'secretInfoHeader');
   }
 
   String get secretInfo {
-    return Intl.message("In the next screen, you will see your secret phrase. It is a password to access your funds. It is crucial that you back it up and never share it with anyone.",
-      desc: 'Description for seed', name: 'secretInfo');    
+    return Intl.message(
+        "In the next screen, you will see your secret phrase. It is a password to access your funds. It is crucial that you back it up and never share it with anyone.",
+        desc: 'Description for seed',
+        name: 'secretInfo');
   }
 
   String get secretWarning {
-    return Intl.message("If you lose your device or uninstall the application, you'll need your secret phrase or seed to recover your funds!",
-      desc: 'Secret warning', name: 'secretWarning');
+    return Intl.message(
+        "If you lose your device or uninstall the application, you'll need your secret phrase or seed to recover your funds!",
+        desc: 'Secret warning',
+        name: 'secretWarning');
   }
 
   String get gotItButton {
     return Intl.message("Got It!",
-      desc: 'Got It! Acknowledgement button', name: 'gotItButton');
+        desc: 'Got It! Acknowledgement button', name: 'gotItButton');
   }
 
   String get ackBackedUp {
-    return Intl.message("Are you sure that you've backed up your secret phrase or seed?",
-      desc: 'Ack backed up', name: 'ackBackedUp');
+    return Intl.message(
+        "Are you sure that you've backed up your secret phrase or seed?",
+        desc: 'Ack backed up',
+        name: 'ackBackedUp');
   }
 
   String get secretPhraseCopy {
     return Intl.message("Copy Secret Phrase",
-      desc: 'Copy secret phrase to clipboard', name: 'secretPhraseCopy');
+        desc: 'Copy secret phrase to clipboard', name: 'secretPhraseCopy');
   }
 
   String get secretPhraseCopied {
     return Intl.message("Secret Phrase Copied",
-      desc: 'Copied secret phrase to clipboard', name: 'secretPhraseCopied');
+        desc: 'Copied secret phrase to clipboard', name: 'secretPhraseCopied');
   }
 
   String get import {
-    return Intl.message("Import",
-      desc: "Generic import", name: 'import');
+    return Intl.message("Import", desc: "Generic import", name: 'import');
   }
 
   String get importSeedInstead {
     return Intl.message("Import Seed Instead",
-      desc: "importSeedInstead", name: 'importSeedInstead');
+        desc: "importSeedInstead", name: 'importSeedInstead');
   }
 
   String get switchToSeed {
     return Intl.message("Switch to Seed",
-      desc: "switchToSeed", name: 'switchToSeed');
+        desc: "switchToSeed", name: 'switchToSeed');
   }
 
   String get backupSecretPhrase {
     return Intl.message("Backup Secret Phrase",
-      desc: 'backup seed', name: 'backupSecretPhrase');
+        desc: 'backup seed', name: 'backupSecretPhrase');
   }
 
   /// -- SEED PROCESS
 
   /// -- END SEED PROCESS
-  
+
   /// HINTS
   String get createPasswordHint {
     return Intl.message("Create a password",
-      desc: 'A text field hint that tells the user to create a password', name: 'createPasswordHint');
+        desc: 'A text field hint that tells the user to create a password',
+        name: 'createPasswordHint');
   }
 
   String get confirmPasswordHint {
     return Intl.message("Confirm the password",
-      desc: 'A text field hint that tells the user to confirm the password', name: 'confirmPasswordHint');
+        desc: 'A text field hint that tells the user to confirm the password',
+        name: 'confirmPasswordHint');
   }
 
   String get enterPasswordHint {
     return Intl.message("Enter your password",
-      desc: 'A text field hint that tells the users to enter their password', name: 'enterPasswordHint');
+        desc: 'A text field hint that tells the users to enter their password',
+        name: 'enterPasswordHint');
   }
 
   String get passwordsDontMatch {
-    return Intl.message("Passwords do not match", desc: 'An error indicating a password has been confirmed incorrectly', name: 'passwordsDontMatch');
+    return Intl.message("Passwords do not match",
+        desc: 'An error indicating a password has been confirmed incorrectly',
+        name: 'passwordsDontMatch');
   }
 
   String get passwordBlank {
-    return Intl.message("Password cannot be empty", desc: 'An error indicating a password has been entered incorrectly', name: 'passwordBlank');
+    return Intl.message("Password cannot be empty",
+        desc: 'An error indicating a password has been entered incorrectly',
+        name: 'passwordBlank');
   }
 
   String get invalidPassword {
-    return Intl.message("Invalid Password", desc: 'An error indicating a password has been entered incorrectly', name: 'invalidPassword');
+    return Intl.message("Invalid Password",
+        desc: 'An error indicating a password has been entered incorrectly',
+        name: 'invalidPassword');
   }
+
   /// HINTS END
-  
 
   /// PARAGRAPS
   String get passwordWillBeRequiredToOpenParagraph {
     return Intl.message("This password will be required to open Natrium.",
-      desc: 'A paragraph that tells the users that the created password will be required to open Natrium.', name: 'passwordWillBeRequiredToOpenParagraph');
+        desc:
+            'A paragraph that tells the users that the created password will be required to open Natrium.',
+        name: 'passwordWillBeRequiredToOpenParagraph');
   }
 
   String get passwordNoLongerRequiredToOpenParagraph {
     return Intl.message("You will not need a password to open Natrium anymore.",
-      desc: 'An info paragraph that tells the user a password will no longer be needed to open Natrium', name: 'passwordNoLongerRequiredToOpenParagraph');
+        desc:
+            'An info paragraph that tells the user a password will no longer be needed to open Natrium',
+        name: 'passwordNoLongerRequiredToOpenParagraph');
   }
 
   String get createPasswordFirstParagraph {
-    return Intl.message("You can create a password to add additional security to your wallet.",
-      desc: 'A paragraph that tells the users that they can create a password for additional security.', name: 'createPasswordFirstParagraph');
+    return Intl.message(
+        "You can create a password to add additional security to your wallet.",
+        desc:
+            'A paragraph that tells the users that they can create a password for additional security.',
+        name: 'createPasswordFirstParagraph');
   }
 
   String get createPasswordSecondParagraph {
-    return Intl.message("Password is optional, and your wallet will be protected with your PIN or biometrics regardless.",
-      desc: 'A paragraph that tells the users that the password creation is optional and the wallet will be still protected with biometrics or PIN regardless.', name: 'createPasswordSecondParagraph');
+    return Intl.message(
+        "Password is optional, and your wallet will be protected with your PIN or biometrics regardless.",
+        desc:
+            'A paragraph that tells the users that the password creation is optional and the wallet will be still protected with biometrics or PIN regardless.',
+        name: 'createPasswordSecondParagraph');
   }
+
   /// PARAGRAPS END
-  
+
   /// HEADERS
   String get createAPasswordHeader {
     return Intl.message("Create a password.",
-      desc: 'A paragraph that tells the users to create a password.', name: 'createAPasswordHeader');
+        desc: 'A paragraph that tells the users to create a password.',
+        name: 'createAPasswordHeader');
   }
 
   String get createPasswordSheetHeader {
     return Intl.message("Create",
-      desc: 'Prompt user to create a new password', name: 'createPasswordSheetHeader');
+        desc: 'Prompt user to create a new password',
+        name: 'createPasswordSheetHeader');
   }
 
   String get disablePasswordSheetHeader {
     return Intl.message("Disable",
-      desc: 'Prompt user to disable their password', name: 'disablePasswordSheetHeader');
+        desc: 'Prompt user to disable their password',
+        name: 'disablePasswordSheetHeader');
   }
 
   String get requireAPasswordToOpenHeader {
     return Intl.message("Require a password to open Natrium?",
-      desc: 'A paragraph that asks the users if they would like a password to be required to open Natrium.', name: 'requireAPasswordToOpenHeader');
+        desc:
+            'A paragraph that asks the users if they would like a password to be required to open Natrium.',
+        name: 'requireAPasswordToOpenHeader');
   }
+
   /// HEADERS END
-  
+
   /// BUTTONS
   String get noSkipButton {
     return Intl.message("No, Skip",
-      desc: 'A button that declines and skips the mentioned process.', name: 'noSkipButton');
+        desc: 'A button that declines and skips the mentioned process.',
+        name: 'noSkipButton');
   }
 
   String get yesButton {
     return Intl.message("Yes",
-      desc: 'A button that accepts the mentioned process.', name: 'yesButton');
+        desc: 'A button that accepts the mentioned process.',
+        name: 'yesButton');
   }
 
   String get nextButton {
     return Intl.message("Next",
-      desc: 'A button that goes to the next screen.', name: 'nextButton');
+        desc: 'A button that goes to the next screen.', name: 'nextButton');
   }
 
   String get goBackButton {
     return Intl.message("Go Back",
-      desc: 'A button that goes to the previous screen.', name: 'goBackButton');
+        desc: 'A button that goes to the previous screen.',
+        name: 'goBackButton');
   }
+
   String get supportButton {
     return Intl.message("Support",
-        desc: 'A button to open up the live support window', name: 'supportButton');
+        desc: 'A button to open up the live support window',
+        name: 'supportButton');
   }
+
   String get liveSupportButton {
     return Intl.message("Support",
-        desc: 'A button to open up the live support window', name: 'liveSupportButton');
+        desc: 'A button to open up the live support window',
+        name: 'liveSupportButton');
   }
+
   /// BUTTONS END
 
   /// Live chat
   String get connectingHeader {
-    return Intl.message(
-        "Connecting",
+    return Intl.message("Connecting",
         desc:
             'A header to let the user now that Natrium is currently connecting to (or loading) live chat.',
         name: 'connectingHeader');
   }
+
   /// -- NON-TRANSLATABLE ITEMS
   String getBlockExplorerUrl(String hash) {
     return 'https://nanocrawler.cc/explorer/block/$hash';
@@ -1161,4 +1233,4 @@ class AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalization> {
   bool shouldReload(LocalizationsDelegate<AppLocalization> old) {
     return true;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/network/account_service.dart b/lib/network/account_service.dart
index 15ba4f3d..455c7489 100644
--- a/lib/network/account_service.dart
+++ b/lib/network/account_service.dart
@@ -2,7 +2,9 @@ import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 
+import 'package:connectivity/connectivity.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
 import 'package:natrium_wallet_flutter/util/sharedprefsutil.dart';
 import 'package:logger/logger.dart';
 import 'package:natrium_wallet_flutter/model/wallet.dart';
@@ -64,6 +66,10 @@ class AccountService {
   // Lock instnace for synchronization
   Lock _lock;
 
+  // Current network connection
+  final Connectivity _connectivity = Connectivity();
+  StreamSubscription<ConnectivityResult> _connectivitySubscription;
+
   // Constructor
   AccountService() {
     _requestQueue = Queue();
@@ -72,6 +78,8 @@ class AccountService {
     suspended = false;
     _lock = Lock();
     initCommunication(unsuspend: true);
+    _connectivitySubscription = _connectivity.onConnectivityChanged
+        .listen((result) => _updateConnectionStatus(result));
   }
 
   // Re-connect handling
@@ -98,40 +106,51 @@ class AccountService {
     });
   }
 
-  // Connect to server
-  Future<void> initCommunication({bool unsuspend = false}) async {
-    if (_isConnected || _isConnecting) {
-      return;
-    } else if (suspended && !unsuspend) {
-      return;
-    } else if (!unsuspend) {
-      reconnectToService();
-      return;
-    }
-    _isConnecting = true;
+  Future<void> initConnectivity() async {
+    ConnectivityResult result;
     try {
-      var packageInfo = await PackageInfo.fromPlatform();
-
-      _isConnecting = true;
-      suspended = false;
-      _channel = new IOWebSocketChannel
-                      .connect(_SERVER_ADDRESS,
-                               headers: {
-                                'X-Client-Version': packageInfo.buildNumber
-                               });
-      log.d("Connected to service");
-      _isConnecting = false;
-      _isConnected = true;
-      EventTaxiImpl.singleton().fire(ConnStatusEvent(status: ConnectionStatus.CONNECTED));
-      _channel.stream.listen(_onMessageReceived, onDone: connectionClosed, onError: connectionClosedError);
-    } catch(e){
-      log.e("Error from service ${e.toString()}", e);
+      result = await _connectivity.checkConnectivity();
+    } on PlatformException catch (e) {
+      log.e("Error from connectivity ${e.toString()}", e);
+    }
+    return _updateConnectionStatus(result);
+  }
+
+  //Handler when connection status changed
+  Future<void> _updateConnectionStatus(ConnectivityResult result) async {
+    if (result != ConnectivityResult.none) {
       _isConnected = false;
       _isConnecting = false;
-      EventTaxiImpl.singleton().fire(ConnStatusEvent(status: ConnectionStatus.DISCONNECTED));
+      try {
+        var packageInfo = await PackageInfo.fromPlatform();
+        _isConnecting = true;
+        suspended = false;
+        _channel = new IOWebSocketChannel.connect(_SERVER_ADDRESS,
+            headers: {'X-Client-Version': packageInfo.buildNumber});
+        log.d("Connected to service");
+        _isConnecting = false;
+        _isConnected = true;
+        EventTaxiImpl.singleton()
+            .fire(ConnStatusEvent(status: ConnectionStatus.CONNECTED));
+        _channel.stream.listen(_onMessageReceived,
+            onDone: connectionClosed, onError: connectionClosedError);
+      } catch (e) {
+        log.e("Error from service ${e.toString()}", e);
+        _isConnected = false;
+        _isConnecting = false;
+        EventTaxiImpl.singleton()
+            .fire(ConnStatusEvent(status: ConnectionStatus.DISCONNECTED));
+      }
+    } else {
+      _isConnected = false;
     }
   }
 
+  // Connect to server
+  Future<void> initCommunication({bool unsuspend = false}) async {
+    await initConnectivity();
+  }
+
   // Connection closed (normally)
   void connectionClosed() {
     _isConnected = false;
@@ -139,7 +158,8 @@ class AccountService {
     clearQueue();
     log.d("disconnected from service");
     // Send disconnected message
-    EventTaxiImpl.singleton().fire(ConnStatusEvent(status: ConnectionStatus.DISCONNECTED));
+    EventTaxiImpl.singleton()
+        .fire(ConnStatusEvent(status: ConnectionStatus.DISCONNECTED));
   }
 
   // Connection closed (with error)
@@ -149,11 +169,12 @@ class AccountService {
     clearQueue();
     log.w("disconnected from service with error ${e.toString()}");
     // Send disconnected message
-    EventTaxiImpl.singleton().fire(ConnStatusEvent(status: ConnectionStatus.DISCONNECTED));
+    EventTaxiImpl.singleton()
+        .fire(ConnStatusEvent(status: ConnectionStatus.DISCONNECTED));
   }
 
   // Close connection
-  void reset({bool suspend = false}){
+  void reset({bool suspend = false}) {
     suspended = suspend;
     if (_channel != null && _channel.sink != null) {
       _channel.sink.close();
@@ -196,17 +217,23 @@ class AccountService {
       //log.d("Received $message");
       Map msg = await compute(decodeJson, message);
       // Determine response type
-      if (msg.containsKey("uuid") || (msg.containsKey("frontier") && msg.containsKey("representative_block")) ||
+      if (msg.containsKey("uuid") ||
+          (msg.containsKey("frontier") &&
+              msg.containsKey("representative_block")) ||
           msg.containsKey("error") && msg.containsKey("currency")) {
         // Subscribe response
         SubscribeResponse resp = await compute(subscribeResponseFromJson, msg);
         // Post to callbacks
         EventTaxiImpl.singleton().fire(SubscribeEvent(response: resp));
-      } else if (msg.containsKey("currency") && msg.containsKey("price") && msg.containsKey("btc")) {
+      } else if (msg.containsKey("currency") &&
+          msg.containsKey("price") &&
+          msg.containsKey("btc")) {
         // Price info sent from server
         PriceResponse resp = PriceResponse.fromJson(msg);
         EventTaxiImpl.singleton().fire(PriceEvent(response: resp));
-      } else if (msg.containsKey("block") && msg.containsKey("hash") && msg.containsKey("account")) {
+      } else if (msg.containsKey("block") &&
+          msg.containsKey("hash") &&
+          msg.containsKey("account")) {
         CallbackResponse resp = await compute(callbackResponseFromJson, msg);
         EventTaxiImpl.singleton().fire(CallbackEvent(response: resp));
       } else if (msg.containsKey("error")) {
@@ -244,13 +271,13 @@ class AccountService {
             return;
           }
           requestItem.isProcessing = true;
-          String requestJson = await compute(encodeRequestItem, requestItem.request);
+          String requestJson =
+              await compute(encodeRequestItem, requestItem.request);
           //log.d("Sending: $requestJson");
           await _send(requestJson);
-        } else if (requestItem != null && (DateTime
-            .now()
-            .difference(requestItem.expireDt)
-            .inSeconds > RequestItem.EXPIRE_TIME_S)) {
+        } else if (requestItem != null &&
+            (DateTime.now().difference(requestItem.expireDt).inSeconds >
+                RequestItem.EXPIRE_TIME_S)) {
           pop();
           processQueue();
         }
@@ -295,15 +322,17 @@ class AccountService {
     if (_requestQueue != null && _requestQueue.length > 0) {
       List<RequestItem> toRemove = new List();
       _requestQueue.forEach((requestItem) {
-        if ((requestItem.request is SubscribeRequest || requestItem.request is AccountHistoryRequest || requestItem.request is PendingRequest)
-              && !requestItem.isProcessing) {
+        if ((requestItem.request is SubscribeRequest ||
+                requestItem.request is AccountHistoryRequest ||
+                requestItem.request is PendingRequest) &&
+            !requestItem.isProcessing) {
           toRemove.add(requestItem);
         }
       });
       toRemove.forEach((requestItem) {
         _requestQueue.remove(requestItem);
       });
-    }    
+    }
   }
 
   RequestItem pop() {
@@ -313,7 +342,7 @@ class AccountService {
   RequestItem peek() {
     return _requestQueue.length > 0 ? _requestQueue.first : null;
   }
-  
+
   /// Clear entire queue, except for AccountsBalancesRequest
   void clearQueue() {
     List<RequestItem> reQueue = List();
@@ -335,13 +364,9 @@ class AccountService {
   // HTTP API
 
   Future<dynamic> makeHttpRequest(BaseRequest request) async {
-    http.Response response = await http.post(
-      _SERVER_ADDRESS_HTTP,
-      headers:  {
-        'Content-type': 'application/json'
-      },
-      body: json.encode(request.toJson())
-    );
+    http.Response response = await http.post(_SERVER_ADDRESS_HTTP,
+        headers: {'Content-type': 'application/json'},
+        body: json.encode(request.toJson()));
     if (response.statusCode != 200) {
       return null;
     }
@@ -353,9 +378,7 @@ class AccountService {
   }
 
   Future<AccountInfoResponse> getAccountInfo(String account) async {
-    AccountInfoRequest request = AccountInfoRequest(
-      account: account
-    );
+    AccountInfoRequest request = AccountInfoRequest(account: account);
     dynamic response = await makeHttpRequest(request);
     if (response is ErrorResponse) {
       if (response.error == "Account not found") {
@@ -363,37 +386,33 @@ class AccountService {
       }
       throw Exception("Received error ${response.error}");
     }
-    AccountInfoResponse infoResponse = AccountInfoResponse.fromJson(response); 
+    AccountInfoResponse infoResponse = AccountInfoResponse.fromJson(response);
     return infoResponse;
   }
 
-  Future<PendingResponse> getPending(String account, int count, {String threshold, bool includeActive = false}) async {
+  Future<PendingResponse> getPending(String account, int count,
+      {String threshold, bool includeActive = false}) async {
     threshold = threshold ?? BigInt.from(10).pow(24).toString();
     PendingRequest request = PendingRequest(
-      account: account,
-      count: count,
-      threshold: threshold,
-      includeActive: includeActive
-    );
+        account: account,
+        count: count,
+        threshold: threshold,
+        includeActive: includeActive);
     dynamic response = await makeHttpRequest(request);
     if (response is ErrorResponse) {
       throw Exception("Received error ${response.error}");
     }
     PendingResponse pr;
     if (response["blocks"] == "") {
-      pr = PendingResponse(
-        blocks: {}
-      );
+      pr = PendingResponse(blocks: {});
     } else {
-      pr = PendingResponse.fromJson(response); 
+      pr = PendingResponse.fromJson(response);
     }
     return pr;
   }
 
   Future<BlockInfoItem> requestBlockInfo(String hash) async {
-    BlockInfoRequest request = BlockInfoRequest(
-      hash: hash
-    );
+    BlockInfoRequest request = BlockInfoRequest(hash: hash);
     dynamic response = await makeHttpRequest(request);
     if (response is ErrorResponse) {
       throw Exception("Received error ${response.error}");
@@ -402,25 +421,24 @@ class AccountService {
     return item;
   }
 
-  Future<AccountHistoryResponse> requestAccountHistory(String account, { int count = 1}) async {
-    AccountHistoryRequest request = AccountHistoryRequest(
-      account: account,
-      count: count
-    );
+  Future<AccountHistoryResponse> requestAccountHistory(String account,
+      {int count = 1}) async {
+    AccountHistoryRequest request =
+        AccountHistoryRequest(account: account, count: count);
     dynamic response = await makeHttpRequest(request);
     if (response is ErrorResponse) {
       throw Exception("Received error ${response.error}");
     }
     if (response["history"] == "") {
       response["history"] = [];
-    }    
+    }
     return AccountHistoryResponse.fromJson(response);
   }
 
-  Future<AccountsBalancesResponse> requestAccountsBalances(List<String> accounts) async {
-    AccountsBalancesRequest request = AccountsBalancesRequest(
-      accounts: accounts
-    );
+  Future<AccountsBalancesResponse> requestAccountsBalances(
+      List<String> accounts) async {
+    AccountsBalancesRequest request =
+        AccountsBalancesRequest(accounts: accounts);
     dynamic response = await makeHttpRequest(request);
     if (response is ErrorResponse) {
       throw Exception("Received error ${response.error}");
@@ -437,19 +455,20 @@ class AccountService {
     return item;
   }
 
-  Future<ProcessResponse> requestReceive(String representative, String previous, String balance, String link, String account, String privKey) async {
+  Future<ProcessResponse> requestReceive(String representative, String previous,
+      String balance, String link, String account, String privKey) async {
     StateBlock receiveBlock = StateBlock(
-      subtype:BlockTypes.RECEIVE,
-      previous: previous,
-      representative: representative,
-      balance:balance,
-      link:link,
-      account: account,
-      privKey: privKey
-    );
+        subtype: BlockTypes.RECEIVE,
+        previous: previous,
+        representative: representative,
+        balance: balance,
+        link: link,
+        account: account,
+        privKey: privKey);
 
     BlockInfoItem previousInfo = await requestBlockInfo(previous);
-    StateBlock previousBlock = StateBlock.fromJson(json.decode(previousInfo.contents));
+    StateBlock previousBlock =
+        StateBlock.fromJson(json.decode(previousInfo.contents));
 
     // Update data on our next pending request
     receiveBlock.representative = previousBlock.representative;
@@ -458,26 +477,26 @@ class AccountService {
 
     // Process
     ProcessRequest processRequest = ProcessRequest(
-      block: json.encode(receiveBlock.toJson()),
-      subType: BlockTypes.RECEIVE
-    );
+        block: json.encode(receiveBlock.toJson()), subType: BlockTypes.RECEIVE);
 
-    return await requestProcess(processRequest);   
+    return await requestProcess(processRequest);
   }
 
-  Future<ProcessResponse> requestSend(String representative, String previous, String sendAmount, String link, String account, String privKey, {bool max = false}) async {
+  Future<ProcessResponse> requestSend(String representative, String previous,
+      String sendAmount, String link, String account, String privKey,
+      {bool max = false}) async {
     StateBlock sendBlock = StateBlock(
-      subtype:BlockTypes.SEND,
-      previous: previous,
-      representative: representative,
-      balance: max ? "0" : sendAmount,
-      link:link,
-      account: account,
-      privKey: privKey
-    );
+        subtype: BlockTypes.SEND,
+        previous: previous,
+        representative: representative,
+        balance: max ? "0" : sendAmount,
+        link: link,
+        account: account,
+        privKey: privKey);
 
     BlockInfoItem previousInfo = await requestBlockInfo(previous);
-    StateBlock previousBlock = StateBlock.fromJson(json.decode(previousInfo.contents));
+    StateBlock previousBlock =
+        StateBlock.fromJson(json.decode(previousInfo.contents));
 
     // Update data on our next pending request
     sendBlock.representative = previousBlock.representative;
@@ -486,50 +505,50 @@ class AccountService {
 
     // Process
     ProcessRequest processRequest = ProcessRequest(
-      block: json.encode(sendBlock.toJson()),
-      subType: BlockTypes.SEND
-    );
+        block: json.encode(sendBlock.toJson()), subType: BlockTypes.SEND);
 
-    return await requestProcess(processRequest);   
+    return await requestProcess(processRequest);
   }
 
-  Future<ProcessResponse> requestOpen(String balance, String link, String account, String privKey, {String representative}) async {
-    representative = representative ?? await sl.get<SharedPrefsUtil>().getRepresentative();
+  Future<ProcessResponse> requestOpen(
+      String balance, String link, String account, String privKey,
+      {String representative}) async {
+    representative =
+        representative ?? await sl.get<SharedPrefsUtil>().getRepresentative();
     StateBlock openBlock = StateBlock(
-      subtype:BlockTypes.OPEN,
-      previous: "0",
-      representative: representative,
-      balance:balance,
-      link:link,
-      account: account,
-      privKey: privKey
-    );
+        subtype: BlockTypes.OPEN,
+        previous: "0",
+        representative: representative,
+        balance: balance,
+        link: link,
+        account: account,
+        privKey: privKey);
 
     // Sign
     await openBlock.sign(privKey);
 
     // Process
     ProcessRequest processRequest = ProcessRequest(
-      block: json.encode(openBlock.toJson()),
-      subType: BlockTypes.OPEN
-    );
+        block: json.encode(openBlock.toJson()), subType: BlockTypes.OPEN);
 
-    return await requestProcess(processRequest);   
+    return await requestProcess(processRequest);
   }
 
-  Future<ProcessResponse> requestChange(String account, String representative, String previous, String balance, String privKey) async {
+  Future<ProcessResponse> requestChange(String account, String representative,
+      String previous, String balance, String privKey) async {
     StateBlock chgBlock = StateBlock(
-      subtype:BlockTypes.CHANGE,
-      previous: previous,
-      representative: representative,
-      balance: balance,
-      link:"0000000000000000000000000000000000000000000000000000000000000000",
-      account: account,
-      privKey: privKey
-    );
+        subtype: BlockTypes.CHANGE,
+        previous: previous,
+        representative: representative,
+        balance: balance,
+        link:
+            "0000000000000000000000000000000000000000000000000000000000000000",
+        account: account,
+        privKey: privKey);
 
     BlockInfoItem previousInfo = await requestBlockInfo(previous);
-    StateBlock previousBlock = StateBlock.fromJson(json.decode(previousInfo.contents));
+    StateBlock previousBlock =
+        StateBlock.fromJson(json.decode(previousInfo.contents));
 
     // Update data on our next pending request
     chgBlock.setBalance(previousBlock.balance);
@@ -537,11 +556,8 @@ class AccountService {
 
     // Process
     ProcessRequest processRequest = ProcessRequest(
-      block: json.encode(chgBlock.toJson()),
-      subType: BlockTypes.CHANGE
-    );
+        block: json.encode(chgBlock.toJson()), subType: BlockTypes.CHANGE);
 
-    return await requestProcess(processRequest);   
+    return await requestProcess(processRequest);
   }
 }
-
diff --git a/lib/ui/home_page.dart b/lib/ui/home_page.dart
index d0138521..69b4a547 100755
--- a/lib/ui/home_page.dart
+++ b/lib/ui/home_page.dart
@@ -46,6 +46,8 @@ import 'package:natrium_wallet_flutter/util/caseconverter.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:natrium_wallet_flutter/bus/events.dart';
 
+import 'package:connectivity/connectivity.dart';
+
 class AppHomePage extends StatefulWidget {
   PriceConversion priceConversion;
 
@@ -103,6 +105,11 @@ class _AppHomePageState extends State<AppHomePage>
   double _fanimationPosition;
   bool releaseAnimation = false;
 
+  //Connectivity network subscriber
+  final Connectivity _connectivity = Connectivity();
+  StreamSubscription<ConnectivityResult> _connectivityNetworkSubscriber;
+  String _connectivityErrorMsj = '';
+
   void initialize(FlutterActorArtboard actor) {
     _fanimationPosition = 0.0;
     _sendSlideAnimation = actor.getAnimation("pull");
@@ -233,6 +240,40 @@ class _AppHomePageState extends State<AppHomePage>
         EventTaxiImpl.singleton().fire(FcmUpdateEvent(token: token));
       }
     });
+
+    initConnectivity();
+    _connectivityNetworkSubscriber =
+        _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
+  }
+
+  Future<void> initConnectivity() async {
+    ConnectivityResult result;
+    try {
+      result = await _connectivity.checkConnectivity();
+    } on PlatformException catch (e) {
+      log.e("Failed to recover connectivity status ${e.toString()}");
+    }
+    if (!mounted) {
+      return Future.value(null);
+    }
+    return _updateConnectionStatus(result);
+  }
+
+  void _updateConnectionStatus(ConnectivityResult result) async {
+    if (result == ConnectivityResult.none) {
+      if (mounted) {
+        setState(() {
+          _connectivityErrorMsj =
+              AppLocalization.of(context).noNetworkConnection;
+        });
+      }
+    } else if (result != null) {
+      if (mounted) {
+        setState(() {
+          _connectivityErrorMsj = '';
+        });
+      }
+    }
   }
 
   void _animationStatusListener(AnimationStatus status) {
@@ -361,6 +402,7 @@ class _AppHomePageState extends State<AppHomePage>
     _destroyBus();
     WidgetsBinding.instance.removeObserver(this);
     _placeholderCardAnimationController.dispose();
+    _connectivityNetworkSubscriber.cancel();
     super.dispose();
   }
 
@@ -685,6 +727,29 @@ class _AppHomePageState extends State<AppHomePage>
     });
   }
 
+  Widget paintConnectivityStatus() {
+    return Visibility(
+      visible: _connectivityErrorMsj != null && _connectivityErrorMsj != '',
+      maintainSize: false,
+      child: Container(
+        margin: EdgeInsetsDirectional.fromSTEB(30.0, 20.0, 26.0, 0.0),
+        child: Row(
+          children: <Widget>[
+            Text(
+              CaseChange.toUpperCase(_connectivityErrorMsj, context),
+              textAlign: TextAlign.start,
+              style: TextStyle(
+                fontSize: 14.0,
+                fontWeight: FontWeight.w100,
+                color: StateContainer.of(context).curTheme.text,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     // Create QR ahead of time because it improves performance this way
@@ -720,6 +785,8 @@ class _AppHomePageState extends State<AppHomePage>
                       _buildMainCard(context, _scaffoldKey),
                       //Main Card End
 
+                      //Conectivity status Text
+                      paintConnectivityStatus(),
                       //Transactions Text
                       Container(
                         margin: EdgeInsetsDirectional.fromSTEB(
@@ -833,7 +900,8 @@ class _AppHomePageState extends State<AppHomePage>
                             if (receive == null) {
                               return;
                             }
-                            Sheets.showAppHeightEightSheet(context: context, widget: receive);
+                            Sheets.showAppHeightEightSheet(
+                                context: context, widget: receive);
                           },
                           highlightColor: receive != null
                               ? StateContainer.of(context).curTheme.background40
diff --git a/pubspec.yaml b/pubspec.yaml
index f660eabb..6fd3c6d5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -138,6 +138,9 @@ dependencies:
       url: https://github.com/bbedward/manta-dart.git
       ref: master
 
+  # Connectivity subscription
+  connectivity: ^0.4.8+6
+
 dev_dependencies:
   flutter_test:
     sdk: flutter