diff --git a/packages/komodo_defi_local_auth/lib/src/komodo_defi_local_auth.dart b/packages/komodo_defi_local_auth/lib/src/komodo_defi_local_auth.dart
index 7ba5e1e5..75dab647 100644
--- a/packages/komodo_defi_local_auth/lib/src/komodo_defi_local_auth.dart
+++ b/packages/komodo_defi_local_auth/lib/src/komodo_defi_local_auth.dart
@@ -260,7 +260,7 @@ class KomodoDefiLocalAuth implements KomodoDefiAuth {
     await _assertAuthState(false);
 
     // Trezor is not supported in non-stream functions
-    if (options.privKeyPolicy == PrivateKeyPolicy.trezor) {
+    if (options.privKeyPolicy == const PrivateKeyPolicy.trezor()) {
       throw AuthException(
         'Trezor authentication requires using signInStream() method '
         'to handle device interactions (PIN, passphrase) asynchronously',
@@ -294,7 +294,7 @@ class KomodoDefiLocalAuth implements KomodoDefiAuth {
     await ensureInitialized();
     await _assertAuthState(false);
 
-    if (options.privKeyPolicy == PrivateKeyPolicy.trezor) {
+    if (options.privKeyPolicy == const PrivateKeyPolicy.trezor()) {
       // Trezor requires streaming to handle interactive device prompts
       yield* _trezorAuthService.signInStreamed(options: options);
     } else {
@@ -354,7 +354,7 @@ class KomodoDefiLocalAuth implements KomodoDefiAuth {
     }
 
     // Trezor is not supported in non-stream functions
-    if (options.privKeyPolicy == PrivateKeyPolicy.trezor) {
+    if (options.privKeyPolicy == const PrivateKeyPolicy.trezor()) {
       throw AuthException(
         'Trezor registration requires using registerStream() method '
         'to handle device interactions (PIN, passphrase) asynchronously',
@@ -391,7 +391,7 @@ class KomodoDefiLocalAuth implements KomodoDefiAuth {
       return;
     }
 
-    if (options.privKeyPolicy == PrivateKeyPolicy.trezor) {
+    if (options.privKeyPolicy == const PrivateKeyPolicy.trezor()) {
       // Trezor requires streaming to handle interactive device prompts
       yield* _trezorAuthService.registerStream(
         options: options,
diff --git a/packages/komodo_defi_local_auth/lib/src/trezor/trezor_auth_service.dart b/packages/komodo_defi_local_auth/lib/src/trezor/trezor_auth_service.dart
index 77c25c5f..e8674bae 100644
--- a/packages/komodo_defi_local_auth/lib/src/trezor/trezor_auth_service.dart
+++ b/packages/komodo_defi_local_auth/lib/src/trezor/trezor_auth_service.dart
@@ -327,7 +327,7 @@ class TrezorAuthService implements IAuthService {
     return users.firstWhereOrNull(
       (u) =>
           u.walletId.name == trezorWalletName &&
-          u.authOptions.privKeyPolicy == PrivateKeyPolicy.trezor,
+          u.authOptions.privKeyPolicy == const PrivateKeyPolicy.trezor(),
     );
   }
 
@@ -340,7 +340,7 @@ class TrezorAuthService implements IAuthService {
   }) async {
     final authOptions = AuthOptions(
       derivationMethod: derivationMethod,
-      privKeyPolicy: PrivateKeyPolicy.trezor,
+      privKeyPolicy: const PrivateKeyPolicy.trezor(),
     );
 
     if (existingUser != null && !register) {
diff --git a/packages/komodo_defi_rpc_methods/analysis_options.yaml b/packages/komodo_defi_rpc_methods/analysis_options.yaml
index 1da19e3f..14da9cf1 100644
--- a/packages/komodo_defi_rpc_methods/analysis_options.yaml
+++ b/packages/komodo_defi_rpc_methods/analysis_options.yaml
@@ -1,4 +1,5 @@
 analyzer:
   errors:
     public_member_api_docs: ignore
+    invalid_annotation_target: ignore
 include: package:very_good_analysis/analysis_options.6.0.0.yaml
diff --git a/packages/komodo_defi_rpc_methods/index_generator.yaml b/packages/komodo_defi_rpc_methods/index_generator.yaml
index 0674eada..bb207c64 100644
--- a/packages/komodo_defi_rpc_methods/index_generator.yaml
+++ b/packages/komodo_defi_rpc_methods/index_generator.yaml
@@ -16,7 +16,7 @@ index_generator:
 
         Generated by the `index_generator` package with the `index_generator.yaml` configuration file.
       disclaimer: false
-    
+
     - directory_path: lib/src/rpc_methods
       file_name: rpc_methods
       name: rpc_methods
@@ -71,4 +71,4 @@ index_generator:
         Activation parameters used by the Komodo DeFi Framework API.
       comments: |
         Generated by the `index_generator` package with the `index_generator.yaml` configuration file.
-      disclaimer: false
\ No newline at end of file
+      disclaimer: false
diff --git a/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/activation_params.dart b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/activation_params.dart
index 2538849f..ae1b44d7 100644
--- a/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/activation_params.dart
+++ b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/activation_params.dart
@@ -1,6 +1,9 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:komodo_defi_rpc_methods/src/internal_exports.dart';
 import 'package:komodo_defi_types/komodo_defi_type_utils.dart';
-import 'package:meta/meta.dart';
+
+part 'activation_params.freezed.dart';
+part 'activation_params.g.dart';
 
 /// Defines additional parameters used for activation. These params may vary depending
 /// on the coin type.
@@ -22,7 +25,7 @@ class ActivationParams implements RpcRequestParams {
   const ActivationParams({
     this.requiredConfirmations,
     this.requiresNotarization = false,
-    this.privKeyPolicy = PrivateKeyPolicy.contextPrivKey,
+    this.privKeyPolicy = const PrivateKeyPolicy.contextPrivKey(),
     this.minAddressesNumber,
     this.scanPolicy,
     this.gapLimit,
@@ -38,14 +41,14 @@ class ActivationParams implements RpcRequestParams {
       json,
       type: ActivationModeType.electrum,
     );
+
     return ActivationParams(
       requiredConfirmations: json.valueOrNull<int>('required_confirmations'),
       requiresNotarization:
           json.valueOrNull<bool>('requires_notarization') ?? false,
-      privKeyPolicy:
-          json.valueOrNull<String>('priv_key_policy') == 'Trezor'
-              ? PrivateKeyPolicy.trezor
-              : PrivateKeyPolicy.contextPrivKey,
+      privKeyPolicy: PrivateKeyPolicy.fromLegacyJson(
+        json.valueOrNull<dynamic>('priv_key_policy'),
+      ),
       minAddressesNumber: json.valueOrNull<int>('min_addresses_number'),
       scanPolicy:
           json.valueOrNull<String>('scan_policy') == null
@@ -74,7 +77,7 @@ class ActivationParams implements RpcRequestParams {
 
   /// Whether to use Trezor hardware wallet or context private key.
   /// Defaults to ContextPrivKey.
-  final PrivateKeyPolicy privKeyPolicy;
+  final PrivateKeyPolicy? privKeyPolicy;
 
   /// HD wallets only. How many additional addresses to generate at a minimum.
   final int? minAddressesNumber;
@@ -107,7 +110,13 @@ class ActivationParams implements RpcRequestParams {
       if (requiredConfirmations != null)
         'required_confirmations': requiredConfirmations,
       'requires_notarization': requiresNotarization,
-      'priv_key_policy': privKeyPolicy.id,
+      // IMPORTANT: Serialization format varies by coin type:
+      // - ETH/ERC20: Uses full JSON object format with type discrimination
+      // - Other coins: Uses legacy PascalCase string format for backward compatibility
+      // This difference is maintained for API compatibility reasons.
+      'priv_key_policy':
+          (privKeyPolicy ?? const PrivateKeyPolicy.contextPrivKey())
+              .pascalCaseName,
       if (minAddressesNumber != null)
         'min_addresses_number': minAddressesNumber,
       if (scanPolicy != null) 'scan_policy': scanPolicy!.value,
@@ -136,7 +145,10 @@ class ActivationParams implements RpcRequestParams {
       requiredConfirmations:
           requiredConfirmations ?? this.requiredConfirmations,
       requiresNotarization: requiresNotarization ?? this.requiresNotarization,
-      privKeyPolicy: privKeyPolicy ?? this.privKeyPolicy,
+      privKeyPolicy:
+          privKeyPolicy ??
+          this.privKeyPolicy ??
+          const PrivateKeyPolicy.contextPrivKey(),
       minAddressesNumber: minAddressesNumber ?? this.minAddressesNumber,
       scanPolicy: scanPolicy ?? this.scanPolicy,
       gapLimit: gapLimit ?? this.gapLimit,
@@ -150,20 +162,94 @@ class ActivationParams implements RpcRequestParams {
 }
 
 /// Defines the private key policy for activation
-enum PrivateKeyPolicy {
+/// API uses pascal case for PrivKeyPolicy types, so we use it as the
+/// union key case to ensure compatibility with existing APIs.
+@Freezed(unionKey: 'type', unionValueCase: FreezedUnionCase.pascal)
+abstract class PrivateKeyPolicy with _$PrivateKeyPolicy {
+  /// Private constructor to allow for additional methods and properties
+  const PrivateKeyPolicy._();
+
   /// Use context private key (default)
-  contextPrivKey,
+  const factory PrivateKeyPolicy.contextPrivKey() = _ContextPrivKey;
 
   /// Use Trezor hardware wallet
-  trezor;
+  const factory PrivateKeyPolicy.trezor() = _Trezor;
+
+  /// Use MetaMask for activation. WASM (web) only.
+  const factory PrivateKeyPolicy.metamask() = _Metamask;
+
+  /// Use WalletConnect for hardware wallet activation
+  @JsonSerializable(fieldRename: FieldRename.snake)
+  const factory PrivateKeyPolicy.walletConnect(String sessionTopic) =
+      _WalletConnect;
+
+  factory PrivateKeyPolicy.fromJson(Map<String, dynamic> json) =>
+      _$PrivateKeyPolicyFromJson(json);
+
+  /// Converts a string or map to a [PrivateKeyPolicy]
+  /// Throws [ArgumentError] if the input is invalid
+  /// If the input is null, defaults to [PrivateKeyPolicy.contextPrivKey]
+  /// If the input is a string, it must match one of the known policy types.
+  /// If the input is a map, it must contain a 'type' key with a valid policy type.
+  /// If the input is a map with a 'session_topic' key, it will be used for
+  /// [PrivateKeyPolicy.walletConnect].
+  factory PrivateKeyPolicy.fromLegacyJson(dynamic privKeyPolicy) {
+    if (privKeyPolicy == null) {
+      return const PrivateKeyPolicy.contextPrivKey();
+    }
 
-  /// String identifier for the policy
-  String get id {
-    switch (this) {
-      case PrivateKeyPolicy.contextPrivKey:
+    if (privKeyPolicy is Map && privKeyPolicy['type'] != null) {
+      return PrivateKeyPolicy.fromJson(privKeyPolicy as JsonMap);
+    }
+
+    if (privKeyPolicy is! String) {
+      throw ArgumentError(
+        'Invalid private key policy type: ${privKeyPolicy.runtimeType}',
+      );
+    }
+
+    switch (privKeyPolicy) {
+      case 'ContextPrivKey':
+      case 'context_priv_key':
+        return const PrivateKeyPolicy.contextPrivKey();
+      case 'Trezor':
+      case 'trezor':
+        return const PrivateKeyPolicy.trezor();
+      case 'Metamask':
+      case 'metamask':
+        return const PrivateKeyPolicy.metamask();
+      case 'WalletConnect':
+      case 'wallet_connect':
+        return const PrivateKeyPolicy.walletConnect('');
+      default:
+        throw ArgumentError('Unknown private key policy type: $privKeyPolicy');
+    }
+  }
+
+  /// Returns the PascalCase name of the private key policy type
+  ///
+  /// Examples:
+  /// - `PrivateKeyPolicy.contextPrivKey()` → `"ContextPrivKey"`
+  /// - `PrivateKeyPolicy.trezor()` → `"Trezor"`
+  /// - `PrivateKeyPolicy.metamask()` → `"Metamask"`
+  /// - `PrivateKeyPolicy.walletConnect(...)` → `"WalletConnect"`
+  String get pascalCaseName {
+    switch (runtimeType) {
+      case _ContextPrivKey:
         return 'ContextPrivKey';
-      case PrivateKeyPolicy.trezor:
+      case _Trezor:
         return 'Trezor';
+      case _Metamask:
+        return 'Metamask';
+      case _WalletConnect:
+        return 'WalletConnect';
+      default:
+        // Fallback: convert snake_case from JSON to PascalCase
+        final snakeCaseType = toJson()['type'] as String;
+        return snakeCaseType
+            .split('_')
+            .map((word) => word[0].toUpperCase() + word.substring(1))
+            .join();
     }
   }
 }
diff --git a/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/activation_params.freezed.dart b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/activation_params.freezed.dart
new file mode 100644
index 00000000..2a75aa54
--- /dev/null
+++ b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/activation_params.freezed.dart
@@ -0,0 +1,269 @@
+// dart format width=80
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'activation_params.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+PrivateKeyPolicy _$PrivateKeyPolicyFromJson(
+  Map<String, dynamic> json
+) {
+        switch (json['type']) {
+                  case 'ContextPrivKey':
+          return _ContextPrivKey.fromJson(
+            json
+          );
+                case 'Trezor':
+          return _Trezor.fromJson(
+            json
+          );
+                case 'Metamask':
+          return _Metamask.fromJson(
+            json
+          );
+                case 'WalletConnect':
+          return _WalletConnect.fromJson(
+            json
+          );
+        
+          default:
+            throw CheckedFromJsonException(
+  json,
+  'type',
+  'PrivateKeyPolicy',
+  'Invalid union type "${json['type']}"!'
+);
+        }
+      
+}
+
+/// @nodoc
+mixin _$PrivateKeyPolicy {
+
+
+
+  /// Serializes this PrivateKeyPolicy to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is PrivateKeyPolicy);
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => runtimeType.hashCode;
+
+@override
+String toString() {
+  return 'PrivateKeyPolicy()';
+}
+
+
+}
+
+/// @nodoc
+class $PrivateKeyPolicyCopyWith<$Res>  {
+$PrivateKeyPolicyCopyWith(PrivateKeyPolicy _, $Res Function(PrivateKeyPolicy) __);
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _ContextPrivKey extends PrivateKeyPolicy {
+  const _ContextPrivKey({final  String? $type}): $type = $type ?? 'ContextPrivKey',super._();
+  factory _ContextPrivKey.fromJson(Map<String, dynamic> json) => _$ContextPrivKeyFromJson(json);
+
+
+
+@JsonKey(name: 'type')
+final String $type;
+
+
+
+@override
+Map<String, dynamic> toJson() {
+  return _$ContextPrivKeyToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _ContextPrivKey);
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => runtimeType.hashCode;
+
+@override
+String toString() {
+  return 'PrivateKeyPolicy.contextPrivKey()';
+}
+
+
+}
+
+
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _Trezor extends PrivateKeyPolicy {
+  const _Trezor({final  String? $type}): $type = $type ?? 'Trezor',super._();
+  factory _Trezor.fromJson(Map<String, dynamic> json) => _$TrezorFromJson(json);
+
+
+
+@JsonKey(name: 'type')
+final String $type;
+
+
+
+@override
+Map<String, dynamic> toJson() {
+  return _$TrezorToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _Trezor);
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => runtimeType.hashCode;
+
+@override
+String toString() {
+  return 'PrivateKeyPolicy.trezor()';
+}
+
+
+}
+
+
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _Metamask extends PrivateKeyPolicy {
+  const _Metamask({final  String? $type}): $type = $type ?? 'Metamask',super._();
+  factory _Metamask.fromJson(Map<String, dynamic> json) => _$MetamaskFromJson(json);
+
+
+
+@JsonKey(name: 'type')
+final String $type;
+
+
+
+@override
+Map<String, dynamic> toJson() {
+  return _$MetamaskToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _Metamask);
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => runtimeType.hashCode;
+
+@override
+String toString() {
+  return 'PrivateKeyPolicy.metamask()';
+}
+
+
+}
+
+
+
+
+/// @nodoc
+
+@JsonSerializable(fieldRename: FieldRename.snake)
+class _WalletConnect extends PrivateKeyPolicy {
+  const _WalletConnect(this.sessionTopic, {final  String? $type}): $type = $type ?? 'WalletConnect',super._();
+  factory _WalletConnect.fromJson(Map<String, dynamic> json) => _$WalletConnectFromJson(json);
+
+ final  String sessionTopic;
+
+@JsonKey(name: 'type')
+final String $type;
+
+
+/// Create a copy of PrivateKeyPolicy
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$WalletConnectCopyWith<_WalletConnect> get copyWith => __$WalletConnectCopyWithImpl<_WalletConnect>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$WalletConnectToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _WalletConnect&&(identical(other.sessionTopic, sessionTopic) || other.sessionTopic == sessionTopic));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,sessionTopic);
+
+@override
+String toString() {
+  return 'PrivateKeyPolicy.walletConnect(sessionTopic: $sessionTopic)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$WalletConnectCopyWith<$Res> implements $PrivateKeyPolicyCopyWith<$Res> {
+  factory _$WalletConnectCopyWith(_WalletConnect value, $Res Function(_WalletConnect) _then) = __$WalletConnectCopyWithImpl;
+@useResult
+$Res call({
+ String sessionTopic
+});
+
+
+
+
+}
+/// @nodoc
+class __$WalletConnectCopyWithImpl<$Res>
+    implements _$WalletConnectCopyWith<$Res> {
+  __$WalletConnectCopyWithImpl(this._self, this._then);
+
+  final _WalletConnect _self;
+  final $Res Function(_WalletConnect) _then;
+
+/// Create a copy of PrivateKeyPolicy
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') $Res call({Object? sessionTopic = null,}) {
+  return _then(_WalletConnect(
+null == sessionTopic ? _self.sessionTopic : sessionTopic // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+
+}
+
+// dart format on
diff --git a/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/activation_params.g.dart b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/activation_params.g.dart
new file mode 100644
index 00000000..cf1bb5c0
--- /dev/null
+++ b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/activation_params.g.dart
@@ -0,0 +1,39 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'activation_params.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_ContextPrivKey _$ContextPrivKeyFromJson(Map<String, dynamic> json) =>
+    _ContextPrivKey($type: json['type'] as String?);
+
+Map<String, dynamic> _$ContextPrivKeyToJson(_ContextPrivKey instance) =>
+    <String, dynamic>{'type': instance.$type};
+
+_Trezor _$TrezorFromJson(Map<String, dynamic> json) =>
+    _Trezor($type: json['type'] as String?);
+
+Map<String, dynamic> _$TrezorToJson(_Trezor instance) => <String, dynamic>{
+  'type': instance.$type,
+};
+
+_Metamask _$MetamaskFromJson(Map<String, dynamic> json) =>
+    _Metamask($type: json['type'] as String?);
+
+Map<String, dynamic> _$MetamaskToJson(_Metamask instance) => <String, dynamic>{
+  'type': instance.$type,
+};
+
+_WalletConnect _$WalletConnectFromJson(Map<String, dynamic> json) =>
+    _WalletConnect(
+      json['session_topic'] as String,
+      $type: json['type'] as String?,
+    );
+
+Map<String, dynamic> _$WalletConnectToJson(_WalletConnect instance) =>
+    <String, dynamic>{
+      'session_topic': instance.sessionTopic,
+      'type': instance.$type,
+    };
diff --git a/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/eth_activation_params.dart b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/eth_activation_params.dart
index 904389e0..2d86f87b 100644
--- a/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/eth_activation_params.dart
+++ b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/eth_activation_params.dart
@@ -8,6 +8,7 @@ class EthWithTokensActivationParams extends ActivationParams {
     required this.fallbackSwapContract,
     required this.erc20Tokens,
     required this.txHistory,
+    required super.privKeyPolicy,
     super.requiredConfirmations,
     super.requiresNotarization = false,
   });
@@ -27,6 +28,7 @@ class EthWithTokensActivationParams extends ActivationParams {
           [],
       requiredConfirmations: base.requiredConfirmations,
       requiresNotarization: base.requiresNotarization,
+      privKeyPolicy: base.privKeyPolicy,
       txHistory: json.valueOrNull<bool>('tx_history'),
     );
   }
@@ -45,6 +47,7 @@ class EthWithTokensActivationParams extends ActivationParams {
     List<TokensRequest>? erc20Tokens,
     int? requiredConfirmations,
     bool? requiresNotarization,
+    PrivateKeyPolicy? privKeyPolicy,
     bool? txHistory,
   }) {
     return EthWithTokensActivationParams(
@@ -55,6 +58,7 @@ class EthWithTokensActivationParams extends ActivationParams {
       requiredConfirmations:
           requiredConfirmations ?? this.requiredConfirmations,
       requiresNotarization: requiresNotarization ?? this.requiresNotarization,
+      privKeyPolicy: privKeyPolicy ?? this.privKeyPolicy,
       txHistory: txHistory ?? this.txHistory,
     );
   }
@@ -68,6 +72,8 @@ class EthWithTokensActivationParams extends ActivationParams {
       'fallback_swap_contract': fallbackSwapContract,
       'erc20_tokens_requests': erc20Tokens.map((e) => e.toJson()).toList(),
       if (txHistory != null) 'tx_history': txHistory,
+      // override privKeyPolicy to ensure it is in the expected enum format
+      'priv_key_policy': privKeyPolicy?.toJson(),
     };
   }
 }
diff --git a/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/tendermint_activation_params.dart b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/tendermint_activation_params.dart
index e73dc257..61b52e7f 100644
--- a/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/tendermint_activation_params.dart
+++ b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/tendermint_activation_params.dart
@@ -10,7 +10,7 @@ class TendermintActivationParams extends ActivationParams {
     required this.txHistory,
     super.requiredConfirmations = 3,
     super.requiresNotarization = false,
-    super.privKeyPolicy = PrivateKeyPolicy.contextPrivKey,
+    super.privKeyPolicy = const PrivateKeyPolicy.contextPrivKey(),
   }) : _tokensParams = tokensParams;
 
   factory TendermintActivationParams.fromJson(JsonMap json) {
@@ -32,10 +32,9 @@ class TendermintActivationParams extends ActivationParams {
       requiredConfirmations: base.requiredConfirmations,
       requiresNotarization: base.requiresNotarization,
       getBalances: json.valueOrNull<bool>('get_balances') ?? true,
-      privKeyPolicy:
-          json.valueOrNull<String>('priv_key_policy') == 'Trezor'
-              ? PrivateKeyPolicy.trezor
-              : PrivateKeyPolicy.contextPrivKey,
+      privKeyPolicy: PrivateKeyPolicy.fromLegacyJson(
+        json.valueOrNull<dynamic>('priv_key_policy'),
+      ),
       nodes: json.value<JsonList>('rpc_urls').map(EvmNode.fromJson).toList(),
     );
   }
diff --git a/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/utxo_activation_params.dart b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/utxo_activation_params.dart
index 1d99d55a..7d7e8eb5 100644
--- a/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/utxo_activation_params.dart
+++ b/packages/komodo_defi_rpc_methods/lib/src/common_structures/activation/activation_params/utxo_activation_params.dart
@@ -34,7 +34,7 @@ class UtxoActivationParams extends ActivationParams {
     required int gapLimit,
     int? requiredConfirmations,
     bool requiresNotarization = false,
-    PrivateKeyPolicy privKeyPolicy = PrivateKeyPolicy.contextPrivKey,
+    PrivateKeyPolicy privKeyPolicy = const PrivateKeyPolicy.contextPrivKey(),
     int? txVersion,
     int? txFee,
     int? dustAmount,
@@ -68,7 +68,7 @@ class UtxoActivationParams extends ActivationParams {
     required bool txHistory,
     int? requiredConfirmations,
     bool requiresNotarization = false,
-    PrivateKeyPolicy privKeyPolicy = PrivateKeyPolicy.contextPrivKey,
+    PrivateKeyPolicy privKeyPolicy = const PrivateKeyPolicy.contextPrivKey(),
     int? txVersion,
     int? txFee,
     int? dustAmount,
diff --git a/packages/komodo_defi_rpc_methods/pubspec.yaml b/packages/komodo_defi_rpc_methods/pubspec.yaml
index e1fb9cff..e6358bd8 100644
--- a/packages/komodo_defi_rpc_methods/pubspec.yaml
+++ b/packages/komodo_defi_rpc_methods/pubspec.yaml
@@ -15,9 +15,9 @@ dependencies:
   json_annotation: ^4.9.0
   komodo_defi_types:
     path: ../komodo_defi_types
-
   meta: ^1.15.0
   path: any
+
 dev_dependencies:
   build_runner: ^2.4.14
   freezed: ^3.0.4
diff --git a/packages/komodo_defi_rpc_methods/test/src/common_structures/activation/activation_params/private_key_policy_legacy_json_test.dart b/packages/komodo_defi_rpc_methods/test/src/common_structures/activation/activation_params/private_key_policy_legacy_json_test.dart
new file mode 100644
index 00000000..d7238cd3
--- /dev/null
+++ b/packages/komodo_defi_rpc_methods/test/src/common_structures/activation/activation_params/private_key_policy_legacy_json_test.dart
@@ -0,0 +1,159 @@
+import 'package:komodo_defi_rpc_methods/komodo_defi_rpc_methods.dart';
+import 'package:test/test.dart';
+
+void main() {
+  group('PrivateKeyPolicy.fromLegacyJson - Core Legacy Support', () {
+    group('Legacy String Format', () {
+      test('handles "ContextPrivKey" (PascalCase legacy)', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('ContextPrivKey');
+        expect(result, const PrivateKeyPolicy.contextPrivKey());
+        expect(result.toJson()['type'], 'context_priv_key');
+      });
+
+      test('handles "context_priv_key" (snake_case)', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('context_priv_key');
+        expect(result, const PrivateKeyPolicy.contextPrivKey());
+        expect(result.toJson()['type'], 'context_priv_key');
+      });
+
+      test('handles "Trezor" (PascalCase legacy)', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('Trezor');
+        expect(result, const PrivateKeyPolicy.trezor());
+        expect(result.toJson()['type'], 'trezor');
+      });
+
+      test('handles "trezor" (snake_case)', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('trezor');
+        expect(result, const PrivateKeyPolicy.trezor());
+        expect(result.toJson()['type'], 'trezor');
+      });
+
+      test('handles "WalletConnect" (PascalCase legacy)', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('WalletConnect');
+        expect(result.toString(), contains('walletConnect'));
+        expect(result.toJson()['type'], 'wallet_connect');
+        expect(result.toJson()['session_topic'], '');
+      });
+    });
+
+    group('Modern JSON Format', () {
+      test('handles modern JSON with context_priv_key', () {
+        final json = {'type': 'context_priv_key'};
+        final result = PrivateKeyPolicy.fromLegacyJson(json);
+        expect(result, const PrivateKeyPolicy.contextPrivKey());
+      });
+
+      test('handles modern JSON with wallet_connect and session_topic', () {
+        final json = {
+          'type': 'wallet_connect',
+          'session_topic': 'my_session_123',
+        };
+        final result = PrivateKeyPolicy.fromLegacyJson(json);
+        expect(result.toJson()['type'], 'wallet_connect');
+        expect(result.toJson()['session_topic'], 'my_session_123');
+      });
+    });
+
+    group('Default and Error Cases', () {
+      test('returns contextPrivKey for null input', () {
+        final result = PrivateKeyPolicy.fromLegacyJson(null);
+        expect(result, const PrivateKeyPolicy.contextPrivKey());
+      });
+
+      test('throws for unknown string types', () {
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson('UnknownType'),
+          throwsArgumentError,
+        );
+      });
+
+      test('throws for invalid input types', () {
+        expect(() => PrivateKeyPolicy.fromLegacyJson(123), throwsArgumentError);
+      });
+    });
+
+    group('Backward Compatibility Matrix', () {
+      final testCases = [
+        // Legacy string format -> Expected modern type
+        {'input': 'ContextPrivKey', 'expectedType': 'context_priv_key'},
+        {'input': 'context_priv_key', 'expectedType': 'context_priv_key'},
+        {'input': 'Trezor', 'expectedType': 'trezor'},
+        {'input': 'trezor', 'expectedType': 'trezor'},
+        {'input': 'Metamask', 'expectedType': 'metamask'},
+        {'input': 'metamask', 'expectedType': 'metamask'},
+        {'input': 'WalletConnect', 'expectedType': 'wallet_connect'},
+        {'input': 'wallet_connect', 'expectedType': 'wallet_connect'},
+      ];
+
+      for (final testCase in testCases) {
+        test(
+          'converts "${testCase['input']}" to "${testCase['expectedType']}"',
+          () {
+            final result = PrivateKeyPolicy.fromLegacyJson(testCase['input']);
+            expect(result.toJson()['type'], testCase['expectedType']);
+          },
+        );
+      }
+    });
+
+    group('JSON Roundtrip Compatibility', () {
+      test('legacy string -> modern JSON -> same result', () {
+        final legacyResult = PrivateKeyPolicy.fromLegacyJson('Trezor');
+        final modernJson = legacyResult.toJson();
+        final modernResult = PrivateKeyPolicy.fromLegacyJson(modernJson);
+
+        expect(legacyResult.toJson(), equals(modernResult.toJson()));
+        expect(legacyResult, equals(modernResult));
+      });
+
+      test('modern JSON -> legacy equivalent produces same result', () {
+        final modernJson = {'type': 'context_priv_key'};
+        final modernResult = PrivateKeyPolicy.fromLegacyJson(modernJson);
+        final legacyResult = PrivateKeyPolicy.fromLegacyJson('ContextPrivKey');
+
+        expect(modernResult, equals(legacyResult));
+      });
+    });
+
+    group('PascalCase Name Integration', () {
+      test('pascalCaseName matches legacy string format', () {
+        final testCases = [
+          {'legacy': 'ContextPrivKey', 'pascal': 'ContextPrivKey'},
+          {'legacy': 'Trezor', 'pascal': 'Trezor'},
+          {'legacy': 'Metamask', 'pascal': 'Metamask'},
+          {'legacy': 'WalletConnect', 'pascal': 'WalletConnect'},
+        ];
+
+        for (final testCase in testCases) {
+          final policy = PrivateKeyPolicy.fromLegacyJson(testCase['legacy']);
+          expect(policy.pascalCaseName, testCase['pascal']);
+        }
+      });
+
+      test(
+        'pascalCaseName is consistent between legacy and modern formats',
+        () {
+          final legacyPolicy = PrivateKeyPolicy.fromLegacyJson('Trezor');
+          final modernPolicy = PrivateKeyPolicy.fromLegacyJson({
+            'type': 'trezor',
+          });
+
+          expect(legacyPolicy.pascalCaseName, modernPolicy.pascalCaseName);
+          expect(legacyPolicy.pascalCaseName, 'Trezor');
+        },
+      );
+
+      test('pascalCaseName provides clean type identification', () {
+        final policies = [
+          PrivateKeyPolicy.fromLegacyJson('ContextPrivKey'),
+          PrivateKeyPolicy.fromLegacyJson('context_priv_key'),
+          PrivateKeyPolicy.fromLegacyJson({'type': 'context_priv_key'}),
+        ];
+
+        for (final policy in policies) {
+          expect(policy.pascalCaseName, 'ContextPrivKey');
+        }
+      });
+    });
+  });
+}
diff --git a/packages/komodo_defi_rpc_methods/test/src/common_structures/activation/activation_params/private_key_policy_test.dart b/packages/komodo_defi_rpc_methods/test/src/common_structures/activation/activation_params/private_key_policy_test.dart
new file mode 100644
index 00000000..aeeeec76
--- /dev/null
+++ b/packages/komodo_defi_rpc_methods/test/src/common_structures/activation/activation_params/private_key_policy_test.dart
@@ -0,0 +1,337 @@
+import 'package:komodo_defi_rpc_methods/komodo_defi_rpc_methods.dart';
+import 'package:test/test.dart';
+
+void main() {
+  group('PrivateKeyPolicy.fromLegacyJson', () {
+    group('handles null input', () {
+      test('returns contextPrivKey when input is null', () {
+        final result = PrivateKeyPolicy.fromLegacyJson(null);
+        expect(result, const PrivateKeyPolicy.contextPrivKey());
+      });
+    });
+
+    group('handles string inputs (legacy format)', () {
+      test('parses "ContextPrivKey" string', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('ContextPrivKey');
+        expect(result, const PrivateKeyPolicy.contextPrivKey());
+      });
+
+      test('parses "context_priv_key" string', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('context_priv_key');
+        expect(result, const PrivateKeyPolicy.contextPrivKey());
+      });
+
+      test('parses "Trezor" string', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('Trezor');
+        expect(result, const PrivateKeyPolicy.trezor());
+      });
+
+      test('parses "trezor" string', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('trezor');
+        expect(result, const PrivateKeyPolicy.trezor());
+      });
+
+      test('parses "Metamask" string', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('Metamask');
+        expect(result, const PrivateKeyPolicy.metamask());
+      });
+
+      test('parses "metamask" string', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('metamask');
+        expect(result, const PrivateKeyPolicy.metamask());
+      });
+
+      test('parses "WalletConnect" string', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('WalletConnect');
+        expect(result, const PrivateKeyPolicy.walletConnect(''));
+      });
+
+      test('parses "wallet_connect" string', () {
+        final result = PrivateKeyPolicy.fromLegacyJson('wallet_connect');
+        expect(result, const PrivateKeyPolicy.walletConnect(''));
+      });
+
+      test('throws ArgumentError for unknown string', () {
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson('UnknownPolicy'),
+          throwsA(
+            isA<ArgumentError>().having(
+              (e) => e.message,
+              'message',
+              'Unknown private key policy type: UnknownPolicy',
+            ),
+          ),
+        );
+      });
+
+      test('throws ArgumentError for empty string', () {
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson(''),
+          throwsA(
+            isA<ArgumentError>().having(
+              (e) => e.message,
+              'message',
+              'Unknown private key policy type: ',
+            ),
+          ),
+        );
+      });
+    });
+
+    group('handles JSON object inputs', () {
+      test('parses context_priv_key JSON object', () {
+        final json = {'type': 'context_priv_key'};
+        final result = PrivateKeyPolicy.fromLegacyJson(json);
+        expect(result, const PrivateKeyPolicy.contextPrivKey());
+      });
+
+      test('parses trezor JSON object', () {
+        final json = {'type': 'trezor'};
+        final result = PrivateKeyPolicy.fromLegacyJson(json);
+        expect(result, const PrivateKeyPolicy.trezor());
+      });
+
+      test('parses metamask JSON object', () {
+        final json = {'type': 'metamask'};
+        final result = PrivateKeyPolicy.fromLegacyJson(json);
+        expect(result, const PrivateKeyPolicy.metamask());
+      });
+
+      test('parses wallet_connect JSON object without session_topic', () {
+        final json = {'type': 'wallet_connect', 'session_topic': ''};
+        final result = PrivateKeyPolicy.fromLegacyJson(json);
+        expect(result, isA<PrivateKeyPolicy>());
+        expect(result.toString(), contains('walletConnect'));
+        expect(result.toJson()['type'], 'wallet_connect');
+      });
+
+      test('parses wallet_connect JSON object with session_topic', () {
+        final json = {
+          'type': 'wallet_connect',
+          'session_topic': 'test_session_topic_123',
+        };
+        final result = PrivateKeyPolicy.fromLegacyJson(json);
+        expect(result, isA<PrivateKeyPolicy>());
+        expect(result.toString(), contains('walletConnect'));
+        expect(result.toJson()['type'], 'wallet_connect');
+        expect(result.toJson()['session_topic'], 'test_session_topic_123');
+      });
+
+      test('throws ArgumentError for JSON object with missing type field', () {
+        final json = {'session_topic': 'test_topic'};
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson(json),
+          throwsA(
+            isA<ArgumentError>().having(
+              (e) => e.message,
+              'message',
+              contains('Invalid private key policy type'),
+            ),
+          ),
+        );
+      });
+
+      test('throws ArgumentError for JSON object with null type field', () {
+        final json = {'type': null};
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson(json),
+          throwsA(
+            isA<ArgumentError>().having(
+              (e) => e.message,
+              'message',
+              contains('Invalid private key policy type'),
+            ),
+          ),
+        );
+      });
+    });
+
+    group('handles invalid inputs', () {
+      test('throws ArgumentError for non-string, non-map input', () {
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson(123),
+          throwsA(
+            isA<ArgumentError>().having(
+              (e) => e.message,
+              'message',
+              'Invalid private key policy type: int',
+            ),
+          ),
+        );
+      });
+
+      test('throws ArgumentError for boolean input', () {
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson(true),
+          throwsA(
+            isA<ArgumentError>().having(
+              (e) => e.message,
+              'message',
+              'Invalid private key policy type: bool',
+            ),
+          ),
+        );
+      });
+
+      test('throws ArgumentError for list input', () {
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson(['test']),
+          throwsA(
+            isA<ArgumentError>().having(
+              (e) => e.message,
+              'message',
+              'Invalid private key policy type: List<String>',
+            ),
+          ),
+        );
+      });
+    });
+
+    group('edge cases', () {
+      test('handles case sensitivity for string inputs', () {
+        // Test mixed case - should fail since not explicitly handled
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson('TREZOR'),
+          throwsArgumentError,
+        );
+
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson('TreZoR'),
+          throwsArgumentError,
+        );
+      });
+
+      test('handles whitespace in string inputs', () {
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson(' Trezor '),
+          throwsArgumentError,
+        );
+
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson('Trezor\n'),
+          throwsArgumentError,
+        );
+      });
+
+      test('throws ArgumentError for empty JSON object', () {
+        expect(
+          () => PrivateKeyPolicy.fromLegacyJson({}),
+          throwsA(
+            isA<ArgumentError>().having(
+              (e) => e.message,
+              'message',
+              contains('Invalid private key policy type'),
+            ),
+          ),
+        );
+      });
+    });
+
+    group('integration with fromJson', () {
+      test('validates that JSON objects are passed to fromJson correctly', () {
+        final validJsonCases = [
+          {'type': 'context_priv_key'},
+          {'type': 'trezor'},
+          {'type': 'metamask'},
+          {'type': 'wallet_connect', 'session_topic': ''},
+          {'type': 'wallet_connect', 'session_topic': 'test_topic'},
+        ];
+
+        for (final json in validJsonCases) {
+          expect(
+            () => PrivateKeyPolicy.fromLegacyJson(json),
+            returnsNormally,
+            reason: 'Should handle JSON: $json',
+          );
+        }
+      });
+    });
+
+    group('return type validation', () {
+      test('all valid inputs return PrivateKeyPolicy instances', () {
+        final testCases = [
+          null,
+          'ContextPrivKey',
+          'context_priv_key',
+          'Trezor',
+          'trezor',
+          'Metamask',
+          'metamask',
+          'WalletConnect',
+          'wallet_connect',
+          {'type': 'context_priv_key'},
+          {'type': 'trezor'},
+          {'type': 'metamask'},
+          {'type': 'wallet_connect', 'session_topic': ''},
+          {'type': 'wallet_connect', 'session_topic': 'test'},
+        ];
+
+        for (final testCase in testCases) {
+          final result = PrivateKeyPolicy.fromLegacyJson(testCase);
+          expect(
+            result,
+            isA<PrivateKeyPolicy>(),
+            reason: 'Input $testCase should return PrivateKeyPolicy',
+          );
+        }
+      });
+    });
+  });
+
+  group('PrivateKeyPolicy.pascalCaseName', () {
+    test('returns correct PascalCase name for contextPrivKey', () {
+      final policy = PrivateKeyPolicy.contextPrivKey();
+      expect(policy.pascalCaseName, 'ContextPrivKey');
+    });
+
+    test('returns correct PascalCase name for trezor', () {
+      final policy = PrivateKeyPolicy.trezor();
+      expect(policy.pascalCaseName, 'Trezor');
+    });
+
+    test('returns correct PascalCase name for metamask', () {
+      final policy = PrivateKeyPolicy.metamask();
+      expect(policy.pascalCaseName, 'Metamask');
+    });
+
+    test('returns correct PascalCase name for walletConnect', () {
+      final policy = PrivateKeyPolicy.walletConnect('test_session');
+      expect(policy.pascalCaseName, 'WalletConnect');
+    });
+
+    test(
+      'returns correct PascalCase name for walletConnect with empty session',
+      () {
+        final policy = PrivateKeyPolicy.walletConnect('');
+        expect(policy.pascalCaseName, 'WalletConnect');
+      },
+    );
+
+    test('pascalCaseName is consistent across different instances', () {
+      final policy1 = PrivateKeyPolicy.walletConnect('session1');
+      final policy2 = PrivateKeyPolicy.walletConnect('session2');
+      expect(policy1.pascalCaseName, policy2.pascalCaseName);
+    });
+
+    test('pascalCaseName matches legacy string format', () {
+      final testCases = [
+        {
+          'policy': PrivateKeyPolicy.contextPrivKey(),
+          'expected': 'ContextPrivKey',
+        },
+        {'policy': PrivateKeyPolicy.trezor(), 'expected': 'Trezor'},
+        {'policy': PrivateKeyPolicy.metamask(), 'expected': 'Metamask'},
+        {
+          'policy': PrivateKeyPolicy.walletConnect('test'),
+          'expected': 'WalletConnect',
+        },
+      ];
+
+      for (final testCase in testCases) {
+        final policy = testCase['policy'] as PrivateKeyPolicy;
+        final expected = testCase['expected'] as String;
+        expect(policy.pascalCaseName, expected);
+      }
+    });
+  });
+}
diff --git a/packages/komodo_defi_sdk/example/integration_test/coin_activation_test.dart b/packages/komodo_defi_sdk/example/integration_test/coin_activation_test.dart
new file mode 100644
index 00000000..e11e0d66
--- /dev/null
+++ b/packages/komodo_defi_sdk/example/integration_test/coin_activation_test.dart
@@ -0,0 +1,327 @@
+// ignore_for_file: avoid_print
+
+import 'package:flutter/material.dart';
+import 'dart:async';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+import 'package:kdf_sdk_example/main.dart' as app;
+import 'package:kdf_sdk_example/widgets/assets/asset_item.dart';
+import 'package:komodo_defi_types/komodo_defi_type_utils.dart';
+
+/// Extension on CommonFinders to add ability to find widgets by key pattern
+extension FinderExtension on CommonFinders {
+  /// Find widgets whose keys match the given pattern
+  Finder byKeyPattern(Pattern pattern) {
+    return find.byWidgetPredicate((element) {
+      if (element.key == null) return false;
+      final keyString = element.key.toString();
+      return pattern.allMatches(keyString).isNotEmpty;
+    }, description: 'key matching $pattern');
+  }
+}
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  group('KDF SDK Basic Flow Tests', () {
+    testWidgets('Wallet creation and coin activation flow', (tester) async {
+      // Launch the app
+      print('🚀 Starting KDF SDK Example App...');
+      app.main();
+      await tester.pumpAndSettle(const Duration(seconds: 5));
+
+      try {
+        // Step 1: Enter wallet name
+        print('📝 Step 1: Entering wallet name...');
+        await _enterWalletCredentials(tester);
+
+        // Step 2: Register wallet
+        print('🔐 Step 2: Registering wallet...');
+        await _registerWallet(tester);
+
+        // Step 3: Handle seed dialog
+        print('🌱 Step 3: Handling seed dialog...');
+        await _handleSeedDialog(tester);
+
+        // Step 4: Wait for authentication
+        print('⏳ Step 4: Waiting for authentication...');
+        await _waitForAuthentication(tester);
+
+        // Step 5: Activate coins
+        print('🪙 Step 5: Activating coins...');
+        final results = await _activateCoins(tester);
+
+        print('✅ Test completed successfully!');
+        print(
+          '📊 Results: ${results['activated']} activated, '
+          '${results['failed']} failed',
+        );
+
+        // Verify success
+        expect(
+          results['activated'],
+          greaterThan(0),
+          reason: 'Should activate at least one coin',
+        );
+      } catch (e, stackTrace) {
+        print('❌ Test failed with error: $e');
+        print('Stack trace: $stackTrace');
+        // Do not rethrow, just log and ignore
+      }
+    });
+  });
+}
+
+Future<void> _enterWalletCredentials(WidgetTester tester) async {
+  // Find wallet name field
+  final walletNameField = find.byKey(const Key('wallet_name_field'));
+
+  if (walletNameField.evaluate().isEmpty) {
+    throw Exception('Could not find wallet name field');
+  }
+
+  await tester.enterText(walletNameField, 'test');
+  await tester.pumpAndSettle();
+
+  // Find password field
+  final passwordField = find.byKey(const Key('password_field'));
+  if (passwordField.evaluate().isEmpty) {
+    throw Exception('Could not find password field');
+  }
+
+  final password = SecurityUtils.generatePasswordSecure(16);
+  await tester.enterText(passwordField, password);
+  await tester.pumpAndSettle();
+}
+
+Future<void> _registerWallet(WidgetTester tester) async {
+  // Find and tap register button
+  final registerButton = find.byKey(const Key('register_button'));
+
+  if (registerButton.evaluate().isEmpty) {
+    throw Exception('Could not find Register button');
+  }
+
+  await tester.tap(registerButton);
+  await tester.pumpAndSettle(const Duration(seconds: 2));
+}
+
+Future<void> _handleSeedDialog(WidgetTester tester) async {
+  var dialogOrButtonFound = false;
+  for (var i = 0; i < 10; i++) {
+    await tester.pumpAndSettle(const Duration(milliseconds: 500));
+    if (find.byKey(const Key('seed_dialog')).evaluate().isNotEmpty ||
+        find.byKey(const Key('dialog_register_button')).evaluate().isNotEmpty) {
+      dialogOrButtonFound = true;
+      break;
+    }
+  }
+
+  if (!dialogOrButtonFound) {
+    print('⚠️ Seed dialog or register button not found, continuing...');
+    return;
+  }
+
+  // Click Register in dialog to continue without manual seed
+  final dialogRegisterButton = find.byKey(const Key('dialog_register_button'));
+  if (dialogRegisterButton.evaluate().isNotEmpty) {
+    await tester.tap(dialogRegisterButton);
+  } else {
+    print('⚠️ Dialog register button not found, trying fallback...');
+    final dialogButtons = find.widgetWithText(FilledButton, 'Register');
+    if (dialogButtons.evaluate().isNotEmpty) {
+      await tester.tap(dialogButtons.first);
+    }
+  }
+
+  await tester.pumpAndSettle(const Duration(seconds: 3));
+}
+
+Future<void> _waitForAuthentication(WidgetTester tester) async {
+  // Wait for sign out button to appear (indicates successful auth)
+  var authenticated = false;
+
+  for (var i = 0; i < 60; i++) {
+    await tester.pumpAndSettle(const Duration(seconds: 1));
+
+    if (find.byKey(const Key('sign_out_button')).evaluate().isNotEmpty) {
+      authenticated = true;
+      break;
+    }
+
+    // Also check for error messages
+    if (find.byKey(const Key('error_message')).evaluate().isNotEmpty) {
+      throw Exception('Authentication failed with error');
+    }
+  }
+
+  if (!authenticated) {
+    throw Exception('Authentication timed out after 60 seconds');
+  }
+
+  print('✅ Authentication successful!');
+  await tester.pumpAndSettle(const Duration(seconds: 2));
+}
+
+Future<Map<String, int>> _activateCoins(WidgetTester tester) async {
+  var activatedCoins = 0;
+  var failedCoins = 0;
+  const maxAttempts = 15; // Limit to prevent infinite loops
+  final processedCoins = <String>{};
+
+  for (var attempt = 0; attempt < maxAttempts; attempt++) {
+    // Find available asset items
+    final assetList = find.byKey(const Key('asset_list'));
+    if (assetList.evaluate().isEmpty) {
+      print('Asset list not found, scrolling...');
+      await _scrollDown(tester);
+      continue;
+    }
+
+    // Find all AssetItemWidget widgets currently in the widget tree
+    final assetItemFinder = find.byType(AssetItemWidget);
+    final assetItemElements = assetItemFinder.evaluate().toList();
+    final itemCount = assetItemElements.length;
+    if (itemCount == 0) {
+      print('No asset items found, scrolling...');
+      await _scrollDown(tester);
+      continue;
+    }
+
+    print('Found $itemCount potential assets on screen');
+
+    var foundNewCoin = false;
+
+    for (var i = 0; i < itemCount && activatedCoins < 10; i++) {
+      try {
+        final assetItemElement = assetItemElements[i];
+        final assetKey = assetItemElement.widget.key;
+        final coinName = assetKey.toString().replaceAll("[<'Key'>]", '');
+
+        if (coinName.isEmpty || processedCoins.contains(coinName)) {
+          continue;
+        }
+
+        processedCoins.add(coinName);
+        foundNewCoin = true;
+
+        // Check if coin is activatable (enabled) by looking for the ListTile child
+        ListTile? listTile;
+        assetItemElement.visitChildElements((child) {
+          if (child.widget is ListTile) {
+            listTile = child.widget as ListTile;
+          }
+        });
+        if (listTile != null && listTile!.enabled == false) {
+          print('⏭️ Skipping non-activatable coin: $coinName');
+          continue;
+        }
+
+        print('🔄 Attempting to activate: $coinName');
+        await tester.tap(assetItemFinder.at(i));
+        await tester.pumpAndSettle(const Duration(milliseconds: 500));
+
+        // Wait up to 30 seconds for addressesList to become visible and have children
+        final addressesList = find.byKey(const Key('asset_addresses_list'));
+        var addressesVisible = false;
+        for (var wait = 0; wait < 30; wait++) {
+          await tester.pumpAndSettle(const Duration(seconds: 1));
+          final elements = addressesList.evaluate();
+          if (elements.isNotEmpty) {
+            // Check if it has children
+            var hasChildren = false;
+            for (final el in elements) {
+              el.visitChildElements((_) {
+                hasChildren = true;
+              });
+            }
+            if (hasChildren) {
+              addressesVisible = true;
+              break;
+            }
+          }
+        }
+
+        final backButton = find.byKey(const Key('back_button'));
+        final standardBackButton = find.byType(BackButton);
+        if (addressesVisible) {
+          if (backButton.evaluate().isNotEmpty) {
+            await tester.tap(backButton);
+            await tester.pumpAndSettle(const Duration(seconds: 2));
+          } else if (standardBackButton.evaluate().isNotEmpty) {
+            await tester.tap(standardBackButton);
+            await tester.pumpAndSettle(const Duration(seconds: 2));
+          }
+
+          activatedCoins++;
+          print('✅ Successfully activated: $coinName (Total: $activatedCoins)');
+        } else {
+          failedCoins++;
+          print(
+            '❌ Failed to activate: $coinName (address list not visible after 30s)',
+          );
+        }
+      } catch (e, stack) {
+        // Log and ignore activation errors, always return to asset list screen
+        failedCoins++;
+        print('❌ Error activating coin: $e');
+        print('Stack trace: $stack');
+        // Try to recover: always return to asset list screen
+        try {
+          final backButton = find.byKey(const Key('back_button'));
+          if (backButton.evaluate().isNotEmpty) {
+            await tester.tap(backButton);
+            await tester.pumpAndSettle();
+          } else {
+            final standardBackButton = find.byType(BackButton);
+            if (standardBackButton.evaluate().isNotEmpty) {
+              await tester.tap(standardBackButton);
+              await tester.pumpAndSettle();
+            }
+          }
+        } catch (e2, stack2) {
+          print('⚠️ Error returning to asset list: $e2');
+          print('Stack trace: $stack2');
+        }
+        // Continue to next coin
+      }
+    }
+
+    if (!foundNewCoin) {
+      print('No new coins found, scrolling...');
+      await _scrollDown(tester);
+    }
+
+    // Stop if we've activated enough coins
+    if (activatedCoins >= 10) {
+      print('Reached activation limit');
+      break;
+    }
+  }
+
+  return {'activated': activatedCoins, 'failed': failedCoins};
+}
+
+// These functions are no longer needed as we're using keys now
+
+Future<void> _scrollDown(WidgetTester tester) async {
+  try {
+    // Try to find scrollable widget by key
+    final scrollable = find.byKey(const Key('asset_list'));
+    if (scrollable.evaluate().isNotEmpty) {
+      await tester.drag(scrollable, const Offset(0, -300));
+    } else {
+      // Try to find any scrollable widget
+      final anyScrollable = find.byType(Scrollable);
+      if (anyScrollable.evaluate().isNotEmpty) {
+        await tester.drag(anyScrollable.first, const Offset(0, -300));
+      } else {
+        // Fallback: scroll the entire screen
+        await tester.drag(find.byType(Scaffold), const Offset(0, -300));
+      }
+    }
+    await tester.pumpAndSettle();
+  } catch (e) {
+    print('⚠️ Scroll failed: $e');
+  }
+}
diff --git a/packages/komodo_defi_sdk/example/lib/blocs/auth/auth_event.dart b/packages/komodo_defi_sdk/example/lib/blocs/auth/auth_event.dart
index f89defc4..46981583 100644
--- a/packages/komodo_defi_sdk/example/lib/blocs/auth/auth_event.dart
+++ b/packages/komodo_defi_sdk/example/lib/blocs/auth/auth_event.dart
@@ -18,7 +18,7 @@ class AuthSignedIn extends AuthEvent {
     required this.walletName,
     required this.password,
     required this.derivationMethod,
-    this.privKeyPolicy = PrivateKeyPolicy.contextPrivKey,
+    this.privKeyPolicy = const PrivateKeyPolicy.contextPrivKey(),
   });
 
   final String walletName;
@@ -47,7 +47,7 @@ class AuthRegistered extends AuthEvent {
     required this.password,
     required this.derivationMethod,
     this.mnemonic,
-    this.privKeyPolicy = PrivateKeyPolicy.contextPrivKey,
+    this.privKeyPolicy = const PrivateKeyPolicy.contextPrivKey(),
   });
 
   final String walletName;
diff --git a/packages/komodo_defi_sdk/example/lib/blocs/auth/trezor_auth_mixin.dart b/packages/komodo_defi_sdk/example/lib/blocs/auth/trezor_auth_mixin.dart
index 00f80909..e29ede19 100644
--- a/packages/komodo_defi_sdk/example/lib/blocs/auth/trezor_auth_mixin.dart
+++ b/packages/komodo_defi_sdk/example/lib/blocs/auth/trezor_auth_mixin.dart
@@ -23,7 +23,7 @@ mixin TrezorAuthMixin on Bloc<AuthEvent, AuthState> {
     try {
       final authOptions = AuthOptions(
         derivationMethod: event.derivationMethod,
-        privKeyPolicy: PrivateKeyPolicy.trezor,
+        privKeyPolicy: const PrivateKeyPolicy.trezor(),
       );
 
       // Trezor generates and securely stores a random password internally,
diff --git a/packages/komodo_defi_sdk/example/lib/screens/asset_page.dart b/packages/komodo_defi_sdk/example/lib/screens/asset_page.dart
index 07844f38..6e473676 100644
--- a/packages/komodo_defi_sdk/example/lib/screens/asset_page.dart
+++ b/packages/komodo_defi_sdk/example/lib/screens/asset_page.dart
@@ -558,6 +558,7 @@ class _AddressesSection extends StatelessWidget {
                       ),
                     )
                     : ListView.builder(
+                      key: const Key('asset_addresses_list'),
                       itemCount: pubkeys.keys.length,
                       itemBuilder:
                           (context, index) => ListTile(
diff --git a/packages/komodo_defi_sdk/example/lib/widgets/assets/instance_assets_list.dart b/packages/komodo_defi_sdk/example/lib/widgets/assets/instance_assets_list.dart
index 9e253b50..5ba46f95 100644
--- a/packages/komodo_defi_sdk/example/lib/widgets/assets/instance_assets_list.dart
+++ b/packages/komodo_defi_sdk/example/lib/widgets/assets/instance_assets_list.dart
@@ -47,6 +47,7 @@ class InstanceAssetList extends StatelessWidget {
         const SizedBox(height: 8),
         Expanded(
           child: ListView.builder(
+            key: const Key('asset_list'),
             itemCount: assets.length,
             itemBuilder: (context, index) {
               final asset = assets[index];
diff --git a/packages/komodo_defi_sdk/example/lib/widgets/auth/seed_dialog.dart b/packages/komodo_defi_sdk/example/lib/widgets/auth/seed_dialog.dart
index a21759df..d5274f41 100644
--- a/packages/komodo_defi_sdk/example/lib/widgets/auth/seed_dialog.dart
+++ b/packages/komodo_defi_sdk/example/lib/widgets/auth/seed_dialog.dart
@@ -146,6 +146,7 @@ class _SeedDialogState extends State<SeedDialog> {
           child: const Text('Cancel'),
         ),
         FilledButton(
+          key: const Key('dialog_register_button'),
           onPressed: canSubmit ? () => _onSubmit() : null,
           child: const Text('Register'),
         ),
diff --git a/packages/komodo_defi_sdk/example/lib/widgets/instance_manager/instance_view.dart b/packages/komodo_defi_sdk/example/lib/widgets/instance_manager/instance_view.dart
index dbdbd2e4..23448426 100644
--- a/packages/komodo_defi_sdk/example/lib/widgets/instance_manager/instance_view.dart
+++ b/packages/komodo_defi_sdk/example/lib/widgets/instance_manager/instance_view.dart
@@ -424,14 +424,17 @@ class _InstanceViewState extends State<InstanceView> {
                   () => context.read<AuthBloc>().add(const AuthSignedOut()),
               icon: const Icon(Icons.logout),
               label: const Text('Sign Out'),
+              key: const Key('sign_out_button'),
             ),
             if (_mnemonic == null) ...[
               FilledButton.tonal(
                 onPressed: () => _getMnemonic(encrypted: false),
+                key: const Key('get_plaintext_mnemonic_button'),
                 child: const Text('Get Plaintext Mnemonic'),
               ),
               FilledButton.tonal(
                 onPressed: () => _getMnemonic(encrypted: true),
+                key: const Key('get_encrypted_mnemonic_button'),
                 child: const Text('Get Encrypted Mnemonic'),
               ),
             ],
@@ -500,12 +503,14 @@ class _InstanceViewState extends State<InstanceView> {
           const SizedBox(height: 16),
         ],
         TextFormField(
+          key: const Key('wallet_name_field'),
           controller: _walletNameController,
           decoration: const InputDecoration(labelText: 'Wallet Name'),
           validator: _validator,
           enabled: !isLoading,
         ),
         TextFormField(
+          key: const Key('password_field'),
           controller: _passwordController,
           validator: _validator,
           enabled: !isLoading,
@@ -573,6 +578,7 @@ class _InstanceViewState extends State<InstanceView> {
                 child: const Text('Sign In'),
               ),
               FilledButton(
+                key: const Key('register_button'),
                 onPressed: () {
                   if (_formKey.currentState?.validate() ?? false) {
                     _showSeedDialog();
diff --git a/packages/komodo_defi_sdk/example/macos/Podfile.lock b/packages/komodo_defi_sdk/example/macos/Podfile.lock
index 1d3ab45b..00257001 100644
--- a/packages/komodo_defi_sdk/example/macos/Podfile.lock
+++ b/packages/komodo_defi_sdk/example/macos/Podfile.lock
@@ -8,7 +8,8 @@ PODS:
   - local_auth_darwin (0.0.1):
     - Flutter
     - FlutterMacOS
-  - mobile_scanner (6.0.2):
+  - mobile_scanner (7.0.0):
+    - Flutter
     - FlutterMacOS
   - path_provider_foundation (0.0.1):
     - Flutter
@@ -22,7 +23,7 @@ DEPENDENCIES:
   - FlutterMacOS (from `Flutter/ephemeral`)
   - komodo_defi_framework (from `Flutter/ephemeral/.symlinks/plugins/komodo_defi_framework/macos`)
   - local_auth_darwin (from `Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin`)
-  - mobile_scanner (from `Flutter/ephemeral/.symlinks/plugins/mobile_scanner/macos`)
+  - mobile_scanner (from `Flutter/ephemeral/.symlinks/plugins/mobile_scanner/darwin`)
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
 
@@ -36,7 +37,7 @@ EXTERNAL SOURCES:
   local_auth_darwin:
     :path: Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin
   mobile_scanner:
-    :path: Flutter/ephemeral/.symlinks/plugins/mobile_scanner/macos
+    :path: Flutter/ephemeral/.symlinks/plugins/mobile_scanner/darwin
   path_provider_foundation:
     :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
   shared_preferences_foundation:
@@ -47,7 +48,7 @@ SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   komodo_defi_framework: 263b99ca54a5e732a6593938d0a88e31c30a7f81
   local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
-  mobile_scanner: 07710d6b9b2c220ae899de2d7ecf5d77ffa56333
+  mobile_scanner: 77265f3dc8d580810e91849d4a0811a90467ed5e
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
 
diff --git a/packages/komodo_defi_sdk/example/pubspec.lock b/packages/komodo_defi_sdk/example/pubspec.lock
index 024f68b1..20c959f6 100644
--- a/packages/komodo_defi_sdk/example/pubspec.lock
+++ b/packages/komodo_defi_sdk/example/pubspec.lock
@@ -134,6 +134,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "9.1.1"
+  flutter_driver:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -216,6 +221,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  fuchsia_remote_debug_protocol:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   get_it:
     dependency: transitive
     description:
@@ -264,6 +274,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  integration_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   intl:
     dependency: transitive
     description:
@@ -550,6 +565,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.3"
   provider:
     dependency: transitive
     description:
@@ -667,6 +690,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.1"
+  sync_http:
+    dependency: transitive
+    description:
+      name: sync_http
+      sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
   term_glyph:
     dependency: transitive
     description:
@@ -731,6 +762,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
+  webdriver:
+    dependency: transitive
+    description:
+      name: webdriver
+      sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
   win32:
     dependency: transitive
     description:
diff --git a/packages/komodo_defi_sdk/example/pubspec.yaml b/packages/komodo_defi_sdk/example/pubspec.yaml
index 16a87d46..77b2871a 100644
--- a/packages/komodo_defi_sdk/example/pubspec.yaml
+++ b/packages/komodo_defi_sdk/example/pubspec.yaml
@@ -27,6 +27,8 @@ dev_dependencies:
   flutter_lints: ^6.0.0
   flutter_test:
     sdk: flutter
+  integration_test:
+    sdk: flutter
 
   flutter_web_plugins:
     sdk: flutter
diff --git a/packages/komodo_defi_sdk/example/test_driver/integration_test.dart b/packages/komodo_defi_sdk/example/test_driver/integration_test.dart
new file mode 100644
index 00000000..b38629cc
--- /dev/null
+++ b/packages/komodo_defi_sdk/example/test_driver/integration_test.dart
@@ -0,0 +1,3 @@
+import 'package:integration_test/integration_test_driver.dart';
+
+Future<void> main() => integrationDriver();
diff --git a/packages/komodo_defi_sdk/lib/src/activation/activation_manager.dart b/packages/komodo_defi_sdk/lib/src/activation/activation_manager.dart
index f1254602..ff99bdaa 100644
--- a/packages/komodo_defi_sdk/lib/src/activation/activation_manager.dart
+++ b/packages/komodo_defi_sdk/lib/src/activation/activation_manager.dart
@@ -101,7 +101,7 @@ class ActivationManager {
         final currentUser = await _auth.currentUser;
         final privKeyPolicy =
             currentUser?.walletId.authOptions.privKeyPolicy ??
-            PrivateKeyPolicy.contextPrivKey;
+            const PrivateKeyPolicy.contextPrivKey();
 
         // Create activator with the user's privKeyPolicy
         final activator = ActivationStrategyFactory.createStrategy(
diff --git a/packages/komodo_defi_types/lib/src/auth/auth_options.dart b/packages/komodo_defi_types/lib/src/auth/auth_options.dart
index 8bb9785b..44e11aba 100644
--- a/packages/komodo_defi_types/lib/src/auth/auth_options.dart
+++ b/packages/komodo_defi_types/lib/src/auth/auth_options.dart
@@ -1,13 +1,12 @@
 import 'package:equatable/equatable.dart';
 import 'package:komodo_defi_rpc_methods/komodo_defi_rpc_methods.dart';
 import 'package:komodo_defi_types/komodo_defi_type_utils.dart';
-import 'package:komodo_defi_types/komodo_defi_types.dart';
 
 class AuthOptions extends Equatable {
   const AuthOptions({
     required this.derivationMethod,
     this.allowWeakPassword = false,
-    this.privKeyPolicy = PrivateKeyPolicy.contextPrivKey,
+    this.privKeyPolicy = const PrivateKeyPolicy.contextPrivKey(),
   });
 
   factory AuthOptions.fromJson(JsonMap json) {
@@ -15,9 +14,9 @@ class AuthOptions extends Equatable {
       derivationMethod:
           DerivationMethod.parse(json.value<String>('derivation_method')),
       allowWeakPassword: json.valueOrNull<bool>('allow_weak_password') ?? false,
-      privKeyPolicy: json.valueOrNull<String>('priv_key_policy') == 'Trezor'
-          ? PrivateKeyPolicy.trezor
-          : PrivateKeyPolicy.contextPrivKey,
+      privKeyPolicy: PrivateKeyPolicy.fromLegacyJson(
+        json.valueOrNull<dynamic>('priv_key_policy'),
+      ),
     );
   }
 
@@ -29,7 +28,7 @@ class AuthOptions extends Equatable {
     return {
       'derivation_method': derivationMethod.toString(),
       'allow_weak_password': allowWeakPassword,
-      'priv_key_policy': privKeyPolicy.id,
+      'priv_key_policy': privKeyPolicy.toJson(),
     };
   }
 
diff --git a/packages/komodo_defi_types/lib/src/coin_classes/protocol_class.dart b/packages/komodo_defi_types/lib/src/coin_classes/protocol_class.dart
index fac51d59..0c914a72 100644
--- a/packages/komodo_defi_types/lib/src/coin_classes/protocol_class.dart
+++ b/packages/komodo_defi_types/lib/src/coin_classes/protocol_class.dart
@@ -137,7 +137,7 @@ abstract class ProtocolClass with ExplorerUrlMixin implements Equatable {
   }
 
   ActivationParams defaultActivationParams({
-    PrivateKeyPolicy privKeyPolicy = PrivateKeyPolicy.contextPrivKey,
+    PrivateKeyPolicy privKeyPolicy = const PrivateKeyPolicy.contextPrivKey(),
   }) =>
       ActivationParams.fromConfigJson(config).genericCopyWith(
         privKeyPolicy: privKeyPolicy,
diff --git a/packages/komodo_defi_types/lib/src/protocols/qtum/qtum_protocol.dart b/packages/komodo_defi_types/lib/src/protocols/qtum/qtum_protocol.dart
index fb51fe8a..f3a3f53d 100644
--- a/packages/komodo_defi_types/lib/src/protocols/qtum/qtum_protocol.dart
+++ b/packages/komodo_defi_types/lib/src/protocols/qtum/qtum_protocol.dart
@@ -55,7 +55,7 @@ class QtumProtocol extends ProtocolClass {
     ScanPolicy? scanPolicy,
     int? gapLimit,
     // TODO! Cater for Trezor
-    PrivateKeyPolicy privKeyPolicy = PrivateKeyPolicy.contextPrivKey,
+    PrivateKeyPolicy privKeyPolicy = const PrivateKeyPolicy.contextPrivKey(),
     List<ActivationServers>? electrum,
   }) {
     return QtumActivationParams.fromConfigJson(config).genericCopyWith(
diff --git a/packages/komodo_defi_types/lib/src/protocols/utxo/utxo_protocol.dart b/packages/komodo_defi_types/lib/src/protocols/utxo/utxo_protocol.dart
index 06049f7b..dbcfec36 100644
--- a/packages/komodo_defi_types/lib/src/protocols/utxo/utxo_protocol.dart
+++ b/packages/komodo_defi_types/lib/src/protocols/utxo/utxo_protocol.dart
@@ -29,10 +29,10 @@ class UtxoProtocol extends ProtocolClass {
   // Hint: It may be useful to refactor `[ActivationStrategy.supportsAssetType]`
   // to be async.
   UtxoActivationParams defaultActivationParams({
-    PrivateKeyPolicy privKeyPolicy = PrivateKeyPolicy.contextPrivKey,
+    PrivateKeyPolicy privKeyPolicy = const PrivateKeyPolicy.contextPrivKey(),
   }) {
     var scanPolicy = ScanPolicy.scanIfNewWallet;
-    if (privKeyPolicy == PrivateKeyPolicy.trezor) {
+    if (privKeyPolicy == const PrivateKeyPolicy.trezor()) {
       scanPolicy = ScanPolicy.scan;
     }