GLEECBTC · smk762 · Dec 1, 2025 · Oct 29, 2025 · Oct 31, 2025 · Oct 31, 2025
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -63,7 +63,7 @@
   "transactionComplete": "Transaction complete!",
   "transactionDenied": "Denied",
   "coinDisableSpan1": "You can't disable {} while it has a swap in progress",
-  "confirmSending": "Confirm withdrawl",
+  "confirmSending": "Confirm withdrawal",
   "confirmSend": "Confirm send",
   "confirm": "Confirm",
   "confirmed": "Confirmed",
@@ -148,7 +148,7 @@
   "settingsMenuSecurity": "Security",
   "settingsMenuAbout": "About",
   "seedPhraseSettingControlsViewSeed": "View seed phrase",
-  "seedPhraseSettingControlsDownloadSeed": "Download seed phrase file",
+  "seedPhraseSettingControlsDownloadSeed": "Download as file",
   "debugSettingsResetActivatedCoins": "Reset activated coins",
   "debugSettingsDownloadButton": "Download logs",
   "or": "Or",
@@ -320,6 +320,7 @@
   "feedbackFormMatrix": "Matrix",
   "feedbackFormTelegram": "Telegram",
   "feedbackFormSelectContactMethod": "Select contact method",
+  "feedbackSelectTypeValidation": "Please select a feedback type",
   "feedbackFormDiscordHint": "Discord username (e.g., username123)",
   "feedbackFormMatrixHint": "Matrix ID (e.g., @user:matrix.org)",
   "feedbackFormTelegramHint": "Telegram username (e.g., @username)",
@@ -381,6 +382,17 @@
   "trezorSelectSubTitle": "Select a hardware wallet you'd like to use with Komodo Wallet",
   "trezorBrowserUnsupported": "Trezor is not supported on this browser.\nPlease use Chrome for Trezor functionality.",
   "trezorTransactionInProgressMessage": "Please confirm transaction on your Trezor device",
+  "trezorInitializingMessage": "Initializing Trezor device...",
+  "trezorWaitingForDeviceMessage": "Waiting for Trezor device connection...",
+  "trezorAwaitingConfirmationMessage": "Please follow instructions on your Trezor device",
+  "trezorPinRequiredMessage": "Please enter your Trezor PIN",
+  "trezorPassphraseRequiredMessage": "Please enter your Trezor passphrase",
+  "trezorAuthFailedMessage": "Trezor authentication failed",
+  "trezorAuthCancelledMessage": "Trezor authentication was cancelled",
+  "trezorInitializationFailed": "Trezor initialization failed",
+  "trezorNoTaskIdFound": "No task ID found",
+  "trezorProvidePinFailed": "Failed to provide PIN",
+  "trezorProvidePassphraseFailed": "Failed to provide passphrase",
   "mixedCaseError": "If you are using non mixed case address, please try to convert to mixed case one.",
   "addressConvertedToMixedCase": "Address automatically converted to mixed-case for checksum validation.",
   "invalidAddressChecksum": "Invalid address checksum",
@@ -515,6 +527,7 @@
   "unableToActiveCoin": "Unable to activate {}",
   "coinIsNotActive": "{} is not active",
   "feedback": "Feedback",
+  "feedbackDefaultType": "User Feedback",
   "feedbackViewTitle": "Send us your feedback",
   "feedbackPageDescription": "Help us improve by sharing your suggestions, reporting bugs, or giving general feedback.",
   "feedbackThankyou": "Thank you for your feedback!",
@@ -525,6 +538,9 @@
   "totalFees": "Total fees",
   "selectProtocol": "Select protocol",
   "showSwapData": "Show swap data",
+  "exportSwapData": "Export swap data",
+  "orderUuid": "Order UUID: {}",
+  "swapUuid": "Swap UUID: {}",
   "importSwaps": "Import Swaps",
   "changeTheme": "Change theme",
   "available": "Available",

diff --git a/lib/app_config/app_config.dart b/lib/app_config/app_config.dart
@@ -104,6 +104,20 @@ Map<String, int> priorityCoinsAbbrMap = {
   // All other coins get default priority (0)
 };
 
+/// Priority ticker symbols for unauthenticated users' asset list.
+/// These coins will appear first in the order specified here, before other coins.
+/// Order matters: coins are displayed in the order they appear in this list.
+const List<String> unauthenticatedUserPriorityTickers = [
+  'BTC',
+  'KMD',
+  'ETH',
+  'BNB',
+  'LTC',
+  'DASH',
+  'ZEC',
+  'DOGE',
+];
+
 /// List of coins that are excluded from the list of coins displayed on the
 /// coin lists (e.g. wallet page, coin selection dropdowns, etc.)
 /// TODO: remove this list once zhltc and NFTs are fully supported in the SDK

diff --git a/lib/bloc/auth_bloc/auth_bloc.dart b/lib/bloc/auth_bloc/auth_bloc.dart
@@ -14,6 +14,8 @@ import 'package:web_dex/blocs/wallets_repository.dart';
 import 'package:web_dex/model/authorize_mode.dart';
 import 'package:web_dex/model/kdf_auth_metadata_extension.dart';
 import 'package:web_dex/model/wallet.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:web_dex/generated/codegen_loader.g.dart';
 
 part 'auth_bloc_event.dart';
 part 'auth_bloc_state.dart';

diff --git a/lib/bloc/auth_bloc/trezor_auth_mixin.dart b/lib/bloc/auth_bloc/trezor_auth_mixin.dart
@@ -65,30 +65,30 @@ mixin TrezorAuthMixin on Bloc<AuthBlocEvent, AuthBlocState> {
     switch (authState.status) {
       case AuthenticationStatus.initializing:
         return AuthBlocState.trezorInitializing(
-          message: authState.message ?? 'Initializing Trezor device...',
+          message: authState.message ?? LocaleKeys.trezorInitializingMessage.tr(),
           taskId: authState.taskId,
         );
       case AuthenticationStatus.waitingForDevice:
         return AuthBlocState.trezorInitializing(
           message:
-              authState.message ?? 'Waiting for Trezor device connection...',
+              authState.message ?? LocaleKeys.trezorWaitingForDeviceMessage.tr(),
           taskId: authState.taskId,
         );
       case AuthenticationStatus.waitingForDeviceConfirmation:
         return AuthBlocState.trezorAwaitingConfirmation(
           message:
               authState.message ??
-              'Please follow instructions on your Trezor device',
+              LocaleKeys.trezorAwaitingConfirmationMessage.tr(),
           taskId: authState.taskId,
         );
       case AuthenticationStatus.pinRequired:
         return AuthBlocState.trezorPinRequired(
-          message: authState.message ?? 'Please enter your Trezor PIN',
+          message: authState.message ?? LocaleKeys.trezorPinRequiredMessage.tr(),
           taskId: authState.taskId!,
         );
       case AuthenticationStatus.passphraseRequired:
         return AuthBlocState.trezorPassphraseRequired(
-          message: authState.message ?? 'Please enter your Trezor passphrase',
+          message: authState.message ?? LocaleKeys.trezorPassphraseRequiredMessage.tr(),
           taskId: authState.taskId!,
         );
       case AuthenticationStatus.authenticating:
@@ -98,14 +98,14 @@ mixin TrezorAuthMixin on Bloc<AuthBlocEvent, AuthBlocState> {
       case AuthenticationStatus.error:
         return AuthBlocState.error(
           AuthException(
-            authState.error ?? 'Trezor authentication failed',
+            authState.error ?? LocaleKeys.trezorAuthFailedMessage.tr(),
             type: AuthExceptionType.generalAuthError,
           ),
         );
       case AuthenticationStatus.cancelled:
         return AuthBlocState.error(
           AuthException(
-            'Trezor authentication was cancelled',
+            LocaleKeys.trezorAuthCancelledMessage.tr(),
             type: AuthExceptionType.generalAuthError,
           ),
         );
@@ -123,7 +123,7 @@ mixin TrezorAuthMixin on Bloc<AuthBlocEvent, AuthBlocState> {
     if (authState.user == null) {
       return AuthBlocState.error(
         AuthException(
-          'Trezor initialization failed',
+          LocaleKeys.trezorInitializationFailed.tr(),
           type: AuthExceptionType.generalAuthError,
         ),
       );
@@ -155,7 +155,7 @@ mixin TrezorAuthMixin on Bloc<AuthBlocEvent, AuthBlocState> {
         emit(
           AuthBlocState.error(
             AuthException(
-              'No task ID found',
+              LocaleKeys.trezorNoTaskIdFound.tr(),
               type: AuthExceptionType.generalAuthError,
             ),
           ),
@@ -169,7 +169,7 @@ mixin TrezorAuthMixin on Bloc<AuthBlocEvent, AuthBlocState> {
       emit(
         AuthBlocState.error(
           AuthException(
-            'Failed to provide PIN',
+            LocaleKeys.trezorProvidePinFailed.tr(),
             type: AuthExceptionType.generalAuthError,
           ),
         ),
@@ -187,7 +187,7 @@ mixin TrezorAuthMixin on Bloc<AuthBlocEvent, AuthBlocState> {
         emit(
           AuthBlocState.error(
             AuthException(
-              'No task ID found',
+              LocaleKeys.trezorNoTaskIdFound.tr(),
               type: AuthExceptionType.generalAuthError,
             ),
           ),
@@ -201,7 +201,7 @@ mixin TrezorAuthMixin on Bloc<AuthBlocEvent, AuthBlocState> {
       emit(
         AuthBlocState.error(
           AuthException(
-            'Failed to provide passphrase',
+            LocaleKeys.trezorProvidePassphraseFailed.tr(),
             type: AuthExceptionType.generalAuthError,
           ),
         ),

diff --git a/lib/bloc/coins_bloc/asset_coin_extension.dart b/lib/bloc/coins_bloc/asset_coin_extension.dart
@@ -62,6 +62,9 @@ extension AssetCoinExtension on Asset {
       protocol.config.valueOrNull('protocol', 'protocol_data', 'platform');
 }
 
+/// Legacy mapping between SDK [CoinSubClass] and the app-level [CoinType].
+///
+/// New code should prefer using [CoinSubClass] directly for protocol logic.
 extension CoinTypeExtension on CoinSubClass {
   CoinType toCoinType() {
     switch (this) {
@@ -71,6 +74,8 @@ extension CoinTypeExtension on CoinSubClass {
         return CoinType.ftm20;
       case CoinSubClass.arbitrum:
         return CoinType.arb20;
+      case CoinSubClass.sia:
+        return CoinType.sia;
       case CoinSubClass.slp:
         return CoinType.slp;
       case CoinSubClass.qrc20:
@@ -107,7 +112,12 @@ extension CoinTypeExtension on CoinSubClass {
         return CoinType.krc20;
       case CoinSubClass.zhtlc:
         return CoinType.zhtlc;
-      default:
+      case CoinSubClass.moonbeam:
+      case CoinSubClass.ewt:
+      case CoinSubClass.rskSmartBitcoin:
+      case CoinSubClass.unknown:
+        // These subclasses are not modeled in the legacy [CoinType] enum.
+        // New code should avoid going through CoinType entirely.
         return CoinType.utxo;
     }
   }
@@ -138,6 +148,10 @@ extension CoinTypeExtension on CoinSubClass {
   }
 }
 
+/// Legacy mapping from app-level [CoinType] back to SDK [CoinSubClass].
+///
+/// This is used by older flows that still think in terms of `CoinType`
+/// (e.g. some NFT / custom-token paths). Prefer [CoinSubClass] in new code.
 extension CoinSubClassExtension on CoinType {
   CoinSubClass toCoinSubClass() {
     switch (this) {
@@ -147,6 +161,8 @@ extension CoinSubClassExtension on CoinType {
         return CoinSubClass.ftm20;
       case CoinType.arb20:
         return CoinSubClass.arbitrum;
+      case CoinType.sia:
+        return CoinSubClass.sia;
       case CoinType.slp:
         return CoinSubClass.slp;
       case CoinType.qrc20:

diff --git a/lib/bloc/coins_bloc/coins_bloc.dart b/lib/bloc/coins_bloc/coins_bloc.dart
@@ -156,15 +156,16 @@ class CoinsBloc extends Bloc<CoinsEvent, CoinsState> {
     await emit.forEach(
       coinUpdateStream,
       onData: (Coin coin) {
-        if (!state.walletCoins.containsKey(coin.abbr)) {
+        final key = coin.id.id;
+        if (!state.walletCoins.containsKey(key)) {
           _log.warning(
             'Coin ${coin.abbr} not found in wallet coins, skipping update',
           );
-          _log.warning(
-            'Coin ${coin.abbr} not found in wallet coins, skipping update',
-          );
+          _log.warning(
+            'Coin ${key} not found in wallet coins, skipping update',
+          );
-          _log.warning(
-            'Coin ${coin.abbr} not found in wallet coins, skipping update',
-          );
+          _log.warning(
+            'Coin ${key} not found in wallet coins, skipping update',
+          );
           return state;
         }
         return state.copyWith(
-          walletCoins: {...state.walletCoins, coin.id.id: coin},
-          coins: {...state.coins, coin.id.id: coin},
+          walletCoins: {...state.walletCoins, key: coin},
+          coins: {...state.coins, key: coin},
         );
       },
     );

diff --git a/lib/bloc/coins_bloc/coins_repo.dart b/lib/bloc/coins_bloc/coins_repo.dart
@@ -775,10 +775,16 @@ class CoinsRepo {
             spendable: newSpendable,
           );
 
+          final updatedCoin = coin.copyWith(sendableBalance: newSpendable);
+
+          // Broadcast the updated balance so non-streaming assets still emit
+          // real-time change events through the same path as streaming assets.
+          _broadcastBalanceChange(updatedCoin);
+
           // Yield updated coin with new balance
           // We still set both the deprecated fields and rely on the SDK
           // for future access to maintain backward compatibility
-          yield coin.copyWith(sendableBalance: newSpendable);
+          yield updatedCoin;
         }
       } catch (e, s) {
         _log.warning('Failed to update balance for ${coin.id}', e, s);

diff --git a/lib/bloc/coins_manager/coins_manager_bloc.dart b/lib/bloc/coins_manager/coins_manager_bloc.dart
@@ -14,7 +14,6 @@ import 'package:web_dex/bloc/coins_manager/coins_manager_sort.dart';
 import 'package:web_dex/bloc/settings/settings_repository.dart';
 import 'package:web_dex/blocs/trading_entities_bloc.dart';
 import 'package:web_dex/model/coin.dart';
-import 'package:web_dex/model/coin_type.dart';
 import 'package:web_dex/model/coin_utils.dart';
 import 'package:web_dex/shared/utils/extensions/kdf_user_extensions.dart';
 import 'package:web_dex/router/state/wallet_state.dart';
@@ -184,8 +183,11 @@ class CoinsManagerBloc extends Bloc<CoinsManagerEvent, CoinsManagerState> {
     CoinsManagerCoinTypeSelect event,
     Emitter<CoinsManagerState> emit,
   ) {
-    final List<CoinType> newTypes = state.selectedCoinTypes.contains(event.type)
-        ? state.selectedCoinTypes.where((type) => type != event.type).toList()
+    final List<CoinSubClass> newTypes =
+        state.selectedCoinTypes.contains(event.type)
+            ? state.selectedCoinTypes
+                .where((type) => type != event.type)
+                .toList()
         : [...state.selectedCoinTypes, event.type];
 
     emit(state.copyWith(selectedCoinTypes: newTypes));
@@ -356,7 +358,9 @@ class CoinsManagerBloc extends Bloc<CoinsManagerEvent, CoinsManagerState> {
 
   List<Coin> _filterByType(List<Coin> coins) {
     return coins
-        .where((coin) => state.selectedCoinTypes.contains(coin.type))
+        .where(
+          (coin) => state.selectedCoinTypes.contains(coin.id.subClass),
+        )
         .toList();
   }
 

diff --git a/lib/bloc/coins_manager/coins_manager_event.dart b/lib/bloc/coins_manager/coins_manager_event.dart
@@ -16,7 +16,9 @@ class CoinsManagerCoinsUpdate extends CoinsManagerEvent {
 
 class CoinsManagerCoinTypeSelect extends CoinsManagerEvent {
   const CoinsManagerCoinTypeSelect({required this.type});
-  final CoinType type;
+
+  /// Selected protocol filter, represented by SDK coin subclass.
+  final CoinSubClass type;
 }
 
 class CoinsManagerCoinsSwitch extends CoinsManagerEvent {

diff --git a/lib/bloc/coins_manager/coins_manager_state.dart b/lib/bloc/coins_manager/coins_manager_state.dart
@@ -14,7 +14,11 @@ class CoinsManagerState extends Equatable {
   });
   final CoinsManagerAction action;
   final String searchPhrase;
-  final List<CoinType> selectedCoinTypes;
+  /// Selected protocol filters, represented by SDK coin subclasses.
+  ///
+  /// Using [CoinSubClass] here keeps the UI in sync with SDK protocols
+  /// without requiring manual updates when new coin types are added.
+  final List<CoinSubClass> selectedCoinTypes;
   final List<Coin> coins;
   final List<Coin> selectedCoins;
   final CoinsManagerSortData sortData;
@@ -45,7 +49,7 @@ class CoinsManagerState extends Equatable {
   CoinsManagerState copyWith({
     CoinsManagerAction? action,
     String? searchPhrase,
-    List<CoinType>? selectedCoinTypes,
+    List<CoinSubClass>? selectedCoinTypes,
     List<Coin>? coins,
     List<Coin>? selectedCoins,
     CoinsManagerSortData? sortData,

diff --git a/lib/bloc/transaction_history/transaction_history_bloc.dart b/lib/bloc/transaction_history/transaction_history_bloc.dart
@@ -112,6 +112,9 @@ class TransactionHistoryBloc
                   blockHeight: sanitized.blockHeight,
                   fee: sanitized.fee ?? existing.fee,
                   memo: sanitized.memo ?? existing.memo,
+                  // Update the timestamp to change date from "Now" once tx
+                  // is confirmed on the blockchain
+                  timestamp: sanitized.timestamp,
                 );
               }
 
@@ -192,6 +195,9 @@ class TransactionHistoryBloc
                 blockHeight: sanitized.blockHeight,
                 fee: sanitized.fee ?? existing.fee,
                 memo: sanitized.memo ?? existing.memo,
+                // Update the timestamp to change date from "Now" once tx
+                // is confirmed on the blockchain
+                timestamp: sanitized.timestamp,
               );
             }
 
@@ -242,12 +248,6 @@ class TransactionHistoryBloc
     emit(state.copyWith(loading: false, error: event.error));
   }
 
-  DateTime _sortTime(Transaction tx) {
-    if (tx.timestamp.millisecondsSinceEpoch != 0) return tx.timestamp;
-    final firstSeen = _firstSeenAtById[tx.internalId];
-    return firstSeen ?? DateTime.fromMillisecondsSinceEpoch(0);
-  }
-
   int _compareTransactions(Transaction left, Transaction right) {
     final unconfirmedTimestamp = DateTime.fromMillisecondsSinceEpoch(0);
     if (right.timestamp == unconfirmedTimestamp) {