Merge branch 'dev' into zhtlc-resync-no-cancel

lib/l10n/messages_all.dart

@@ -75,8 +75,10 @@ MessageLookupByLibrary _findExact(String localeName) {
 /// User programs should call this before using [localeName] for messages.
 Future<bool> initializeMessages(String localeName) async {
   final availableLocale = Intl.verifiedLocale(
-      localeName, (locale) => _deferredLibraries[locale] != null,
-      onFailure: (_) => null);
+    localeName,
+    (locale) => _deferredLibraries[locale] != null,
+    onFailure: (_) => null,
+  );
   if (availableLocale == null) {
     return Future.value(false);
   }

lib/localizations.dart

@@ -1266,6 +1266,13 @@ class AppLocalizations {
         name: 'weFailedToActivate',
         args: [coinAbbr],
       );
+
+  String failedToCancelActivation(String coinAbbr) => Intl.message(
+        'Failed to cancel activation of $coinAbbr',
+        name: 'failedToCancelActivation',
+        args: [coinAbbr],
+      );
+
   String isUnavailable(String coinAbbr) => Intl.message(
         '$coinAbbr is unavailable :(',
         name: 'isUnavailable',
@@ -1320,6 +1327,11 @@ class AppLocalizations {
       Intl.message('Min sell amount is', name: 'multiMinSellAmt');
   String get multiInvalidAmt =>
       Intl.message('Invalid amount', name: 'multiInvalidAmt');
+  String invalidCoinAddress(String coin) => Intl.message(
+        'Invalid $coin address',
+        args: [coin],
+        name: 'invalidCoinAddress',
+      );
   String multiActivateGas(String coin) =>
       Intl.message('Activate $coin and top-up balance first',
           name: 'multiActivateGas', args: <Object>[coin]);
@@ -1887,11 +1899,79 @@ class AppLocalizations {
 
   // Rebranding
   String get rebrandingAnnouncement => Intl.message(
-      "It's a new era! We have officially changed our name from 'AtomicDEX' to 'Komodo Wallet'",
+      "It's a new era! We have officially rebranded from 'AtomicDEX' to 'Komodo Wallet'",
       name: 'rebrandingAnnouncement');
 
   String get officialPressRelease =>
       Intl.message('Official press release', name: 'officialPressRelease');
+
+// --- Asyncronous coin activations (requires syncing)
+  String shouldScanPastTransaction(String coin) => Intl.message(
+        'Scan for past $coin transactions?',
+        name: 'shouldScanPastTransaction',
+        args: [coin],
+      );
+
+  String get activationCancelled =>
+      Intl.message('Coin activation cancelled', name: 'activationCancelled');
+
+  String coinActivationSuccessfull(String coin) => Intl.message(
+        'Successfully activated $coin',
+        name: 'coinActivationSuccessfull',
+        args: [coin],
+      );
+
+  String coinActivationCancelled(String coin) => Intl.message(
+        '$coin activation cancelled',
+        name: 'coinActivationCancelled',
+        args: [coin],
+      );
+
+  String get pleaseAcceptAllCoinActivationRequests => Intl.message(
+        'Please accept all special coin activation requests or deselect the coins.',
+        name: 'pleaseAcceptAllCoinActivationRequests',
+      );
+
+  String get cancelActivation =>
+      Intl.message('Cancel Activation', name: 'cancelActivation');
+  String get cancelActivationQuestion => Intl.message(
+        'Are you sure you want to cancel activation?',
+        name: 'cancelActivationQuestion',
+      );
+  String get cofirmCancelActivation => Intl.message(
+        'Are you sure you want to cancel activation?',
+        name: 'cofirmCancelActivation',
+      );
+
+  String syncTransactionsQuestion(String name) => Intl.message(
+        'Which $name transactions would you like to sync?',
+        name: 'syncTransactionsQuestion',
+        args: [name],
+      );
+  String get syncNewTransactions =>
+      Intl.message('Sync new transactions', name: 'syncNewTransactions');
+  String get syncFromDate =>
+      Intl.message('Sync from specified date', name: 'syncFromDate');
+  String get syncFromSaplingActivation => Intl.message(
+        'Sync from sapling activation',
+        name: 'syncFromSaplingActivation',
+      );
+  String get selectDate => Intl.message('Select a Date', name: 'selectDate');
+  String get startDate => Intl.message('Start Date', name: 'startDate');
+  String get futureTransactions => Intl.message(
+        'We will sync future transactions made after activation associated with your public key. This is the quickest option and takes up the least amount of storage.',
+        name: 'futureTransactions',
+      );
+  String get allPastTransactions => Intl.message(
+        'Your wallet will show any past transactions. This will take significant storage and time as all blocks will be downloaded and scanned.',
+        name: 'allPastTransactions',
+      );
+  String get pastTransactionsFromDate => Intl.message(
+        'Your wallet will show your past transactions made after the specified date.',
+        name: 'pastTransactionsFromDate',
+      );
+  // ---
+
 }
 
 class AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/packages/z_coin_activation/bloc/z_coin_activation_api.dart

@@ -241,7 +241,6 @@ class ZCoinActivationApi {
 
       if (shouldEmitStatus) {
         lastEmittedStatus = taskStatus;
-        // yield taskStatus;
         yield taskStatus;
       }
 

lib/packages/z_coin_activation/bloc/z_coin_activation_bloc.dart

@@ -10,8 +10,8 @@ import 'package:komodo_dex/packages/z_coin_activation/bloc/z_coin_activation_sta
 import 'package:komodo_dex/packages/z_coin_activation/bloc/z_coin_notifications.dart';
 import 'package:komodo_dex/packages/z_coin_activation/models/z_coin_activation_prefs.dart';
 import 'package:komodo_dex/packages/z_coin_activation/models/z_coin_status.dart';
+import 'package:komodo_dex/utils/log.dart';
 
-// TODO: Localize messages
 class ZCoinActivationBloc
     extends Bloc<ZCoinActivationEvent, ZCoinActivationState>
     with ActivationEta {
@@ -67,7 +67,7 @@ class ZCoinActivationBloc
         onData: (coinStatus) {
           if (coinStatus.isFailed) {
             return ZCoinActivationFailure(
-              'Failed to activate ZHTLC coins, please try again later',
+              ZCoinActivationFailureReason.failedAfterStart,
             );
           }
 
@@ -102,7 +102,7 @@ class ZCoinActivationBloc
             );
           }
           if (coinStatus.isActivated) {
-            return ZCoinActivationSuccess('Completed ZHTLC activation');
+            return ZCoinActivationSuccess();
           }
           return ZCoinActivationInProgess(
             progress: shouldShowNewProgress ? overallProgress : lastProgress,
@@ -112,8 +112,13 @@ class ZCoinActivationBloc
           );
         },
         onError: (e, s) {
-          debugPrint('Failed to activate coins: $e');
-          return ZCoinActivationFailure('Failed to activate coins');
+          Log(
+            'ZCoinActivationBloc:_handleActivationRequested',
+            'Failed to activate coins: $e',
+          );
+          return ZCoinActivationFailure(
+            ZCoinActivationFailureReason.failedAfterStart,
+          );
         },
       );
 
@@ -124,12 +129,14 @@ class ZCoinActivationBloc
         // And this emit might remove another important notification
         // emit(ZCoinActivationSuccess('ZHTLC coins activation process ended'));
       } else {
-        emit(ZCoinActivationFailure('Failed to activate coins'));
+        emit(
+          ZCoinActivationFailure(ZCoinActivationFailureReason.failedAfterStart),
+        );
       }
     } catch (e) {
       debugPrint('Failed to start activation: $e');
       emit(
-        ZCoinActivationFailure('Failed to start activation'),
+        ZCoinActivationFailure(ZCoinActivationFailureReason.startFailed),
       );
     } finally {
       await _clearNotification();
@@ -146,7 +153,7 @@ class ZCoinActivationBloc
     } catch (e) {
       debugPrint('Failed to set requested coins: $e');
       emit(
-        ZCoinActivationFailure('Failed to set requested coins'),
+        ZCoinActivationFailure(ZCoinActivationFailureReason.startFailed),
       );
     }
   }
@@ -169,7 +176,7 @@ class ZCoinActivationBloc
       ZCoinActivationState newState;
       if (isAllCoinsEnabled) {
         newState = isActivationInProgress
-            ? ZCoinActivationSuccess('Activation in progress...')
+            ? ZCoinActivationSuccess()
             : ZCoinActivationKnownState(isAllCoinsEnabled);
       } else if (isActivationInProgress) {
         newState = state as ZCoinActivationInProgess;
@@ -187,7 +194,7 @@ class ZCoinActivationBloc
     } catch (e) {
       debugPrint('Failed to get activation status: $e');
       emit(
-        ZCoinActivationFailure('Failed to get activation status'),
+        ZCoinActivationFailure(ZCoinActivationFailureReason.failedAfterStart),
       );
     }
   }
@@ -198,11 +205,11 @@ class ZCoinActivationBloc
   ) async {
     try {
       await _repository.cancelAllZCoinActivations();
-      emit(ZCoinActivationFailure('Cancelling ZHTLC activation...'));
+      emit(ZCoinActivationFailure(ZCoinActivationFailureReason.cancelled));
     } catch (e) {
       debugPrint('Failed to cancel ZHTLC activation: $e');
       emit(
-        ZCoinActivationFailure('Failed to cancel ZHTLC activation'),
+        ZCoinActivationFailure(ZCoinActivationFailureReason.failedToCancel),
       );
     }
   }

lib/packages/z_coin_activation/bloc/z_coin_activation_state.dart

@@ -34,15 +34,21 @@ class ZCoinActivationInProgess extends ZCoinActivationState {
 }
 
 class ZCoinActivationSuccess extends ZCoinActivationState {
-  ZCoinActivationSuccess(this.message);
-
-  final String message;
+  ZCoinActivationSuccess();
 }
 
 class ZCoinActivationFailure extends ZCoinActivationState {
-  const ZCoinActivationFailure(this.message);
+  const ZCoinActivationFailure(this.reason);
 
-  final String message;
+  final ZCoinActivationFailureReason reason;
+}
+
+enum ZCoinActivationFailureReason {
+  startFailed,
+  cancelled,
+  failedToCancel,
+  failedAfterStart,
+  failedOther,
 }
 
 class ZCoinActivationStatusLoading extends ZCoinActivationState {}