GLEECBTC · ca333 · Nov 7, 2025 · Oct 27, 2025 · Oct 27, 2025 · Oct 28, 2025
diff --git a/.github/actions/validate-build/action.yml b/.github/actions/validate-build/action.yml
@@ -9,18 +9,21 @@ runs:
       run: |
         SDK_KDF_ASSETS_DIR=build/web/assets/packages/komodo_defi_framework
 
-        # Check that the web build folder contains a wasm file in the format build/web/kdf/*.wasm
-        if [ ! -f build/web/kdf/kdf/bin/*.wasm ]; then
+        # Check that the web build folder contains a wasm file in the format build/web/kdf/kdf/bin/*.wasm
+        shopt -s nullglob
+        wasm_files=(build/web/kdf/kdf/bin/*.wasm)
+        if [ ${#wasm_files[@]} -eq 0 ]; then
           echo "Error: Web build failed. No wasm file found in build/web/kdf/kdf/bin"
           # List files for debugging
-          echo "Listing files in build/web recursively"
-          ls -R build/web
+          echo "Listing files in build/web/kdf recursively"
+          ls -R build/web/kdf 2>/dev/null || echo "build/web/kdf directory does not exist"
 
-          echo "Listing files in web recursively"
-          ls -R web
+          echo "Listing files in web/kdf recursively"
+          ls -R web/kdf 2>/dev/null || echo "web/kdf directory does not exist"
 
           exit 1
         fi
+        echo "Found wasm files: ${wasm_files[@]}"
 
         # Check that the index.html is present and that it is equal to the source index.html
         if ! cmp -s web/index.html build/web/index.html; then

diff --git a/.github/workflows/desktop-builds.yml b/.github/workflows/desktop-builds.yml
@@ -48,7 +48,7 @@ jobs:
         with:
           p12-file-base64: ${{ secrets.MACOS_P12_BASE64 }}
           p12-password: ${{ secrets.MACOS_P12_PASSWORD }}
-          bundle-id: "com.komodo.komodowallet"
+          bundle-id: "com.komodo.wallet"
           profile-type: "MAC_APP_DEVELOPMENT"
           issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
           api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
@@ -73,6 +73,10 @@ jobs:
       - name: Fetch packages, generate assets, and build for ${{ matrix.platform }}
         env:
           GITHUB_API_PUBLIC_READONLY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Disable code signing for macOS PR builds
+          CODE_SIGNING_ALLOWED: ${{ matrix.platform == 'macos' && github.event_name == 'pull_request' && 'NO' || '' }}
+          CODE_SIGNING_REQUIRED: ${{ matrix.platform == 'macos' && github.event_name == 'pull_request' && 'NO' || '' }}
+          EXPANDED_CODE_SIGN_IDENTITY: ${{ matrix.platform == 'macos' && github.event_name == 'pull_request' && '-' || '' }}
         uses: ./.github/actions/generate-assets
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -83,4 +83,7 @@ venv/
 /macos/build
 AGENTS_1.md
 # .dmg Release
-dist/
+dist/
+
+# KDF generated binaries
+web/kdf/kdf/bin/
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -507,6 +507,8 @@
   "orderBookNoAsks": "No asks found",
   "orderBookNoBids": "No bids found",
   "orderBookEmpty": "Orderbook is empty",
+  "dexNoSwapOffers": "No swap offers available for the selected asset.",
+  "bridgeNoCrossNetworkRoutes": "No cross-network routes found for this asset.",
   "freshAddress": "Fresh address",
   "userActionRequired": "User action required",
   "unknown": "Unknown",
@@ -748,6 +750,7 @@
   "trend7d": "7d trend",
   "tradingDisabledTooltip": "Trading features are currently disabled",
   "tradingDisabled": "Trading unavailable in your location",
+  "nftDisabledTooltip": "NFT functionality is currently disabled. Improvements are on the way!",
   "includeBlockedAssets": "Include blocked assets",
   "unbanPubkeysResults": "Unban Pubkeys Results",
   "unbannedPubkeys": {
@@ -766,6 +769,7 @@
   "noBannedPubkeys": "No banned pubkeys found",
   "unbanPubkeysFailed": "Failed to unban pubkeys",
   "privateKeyRetrievalFailed": "Failed to retrieve private keys. Please try again.",
+  "privateKeysEmptyError": "No private keys found. Assets may need to be activated. Please try again later.",
   "fetchingPrivateKeysTitle": "Fetching Private Keys...",
   "fetchingPrivateKeysMessage": "Please wait while we securely fetch your private keys...",
   "pubkeyType": "Type",

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -11,6 +11,7 @@
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		49484A33FCF0585DB40EBAD9 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C74478EE63B90E2A48A7AB3C /* GoogleService-Info.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		F1D1A3B2C3D4E5F6A7B8C9D1 /* FdMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1D1A3B2C3D4E5F6A7B8C9D0 /* FdMonitor.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -45,6 +46,7 @@
 		6DB340A008F6FECB3B82619D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		F1D1A3B2C3D4E5F6A7B8C9D0 /* FdMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FdMonitor.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		91B045D447C7C6266906543C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
@@ -122,6 +124,7 @@
 				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
+				F1D1A3B2C3D4E5F6A7B8C9D0 /* FdMonitor.swift */,
 				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
 			);
 			path = Runner;
@@ -303,6 +306,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
+				F1D1A3B2C3D4E5F6A7B8C9D1 /* FdMonitor.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -387,7 +391,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = G3VBBBMD8T;
+				DEVELOPMENT_TEAM = 8HPBYKKKQP;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "$(inherited)";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -530,7 +534,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = G3VBBBMD8T;
+				DEVELOPMENT_TEAM = 8HPBYKKKQP;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "$(inherited)";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -565,7 +569,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = G3VBBBMD8T;
+				DEVELOPMENT_TEAM = 8HPBYKKKQP;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "$(inherited)";
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -31,6 +31,8 @@
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>This app needs camera access to scan QR codes</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app needs access to your photo library to import QR codes</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/lib/app_config/app_config.dart b/lib/app_config/app_config.dart
@@ -44,6 +44,11 @@ const Duration kPerformanceLogInterval = Duration(minutes: 1);
 /// - Balance and price update polling
 const bool kDebugElectrumLogs = true;
 
+/// Temporary failure simulation toggles for testing UI/flows.
+/// Guarded by kDebugMode in calling sites.
+const bool kSimulateBestOrdersFailure = false;
+const double kSimulatedBestOrdersFailureRate = 0.5; // 50%
+
 // This information is here because it is not contextual and is branded.
 // Names of their own are not localized. Also, the application is initialized before
 // the localization package is initialized.

diff --git a/lib/bloc/bridge_form/bridge_bloc.dart b/lib/bloc/bridge_form/bridge_bloc.dart
@@ -238,6 +238,17 @@ class BridgeBloc extends Bloc<BridgeEvent, BridgeState> {
       ),
     );
 
+    // Before login, show 0.00 instead of spinner
+    if (!_isLoggedIn) {
+      emit(
+        state.copyWith(
+          availableBalanceState: () => AvailableBalanceState.unavailable,
+          maxSellAmount: () => null,
+        ),
+      );
+      return;
+    }
+
     _autoActivateCoin(event.coin.abbr);
     _subscribeMaxSellAmount();
 
@@ -392,22 +403,27 @@ class BridgeBloc extends Bloc<BridgeEvent, BridgeState> {
       return;
     }
 
-    if (state.availableBalanceState == AvailableBalanceState.initial ||
-        event.setLoadingStatus) {
+    // If not logged in, show 0.00 (unavailable) and skip spinner
+    if (!_isLoggedIn) {
       emit(
         state.copyWith(
-          availableBalanceState: () => AvailableBalanceState.loading,
+          availableBalanceState: () => AvailableBalanceState.unavailable,
+          maxSellAmount: () => null,
         ),
       );
+      return;
     }
 
-    if (!_isLoggedIn) {
+    if (state.availableBalanceState == AvailableBalanceState.initial ||
+        event.setLoadingStatus) {
       emit(
         state.copyWith(
-          availableBalanceState: () => AvailableBalanceState.unavailable,
+          availableBalanceState: () => AvailableBalanceState.loading,
         ),
       );
-    } else {
+    }
+
+    {
       Rational? maxSellAmount = await _dexRepository.getMaxTakerVolume(
         state.sellCoin!.abbr,
       );

diff --git a/lib/bloc/coins_bloc/coins_bloc.dart b/lib/bloc/coins_bloc/coins_bloc.dart
@@ -523,10 +523,18 @@ class CoinsBloc extends Bloc<CoinsEvent, CoinsState> {
         .map((assetsSet) => assetsSet.single);
 
     // Filter out blocked assets
-    final coinsToActivate = _tradingStatusService.filterAllowedAssets(
+    var coinsToActivate = _tradingStatusService.filterAllowedAssets(
       availableAssets.toList(),
     );
 
+    // During initial login auto-activation, skip ZHTLC assets that would
+    // trigger configuration dialogs (i.e. no saved configuration yet).
+    if (_isInitialActivationInProgress) {
+      coinsToActivate = await _filterAssetsForInitialActivation(
+        coinsToActivate,
+      );
+    }
+
     final enableFutures = coinsToActivate
         .map((asset) => _coinsRepo.activateAssetsSync([asset]))
         .toList();
@@ -536,6 +544,41 @@ class CoinsBloc extends Bloc<CoinsEvent, CoinsState> {
     await Future.wait(enableFutures);
   }
 
+  /// Filters assets for initial auto-activation on login.
+  ///
+  /// - Keeps all non-ZHTLC assets
+  /// - Keeps ZHTLC assets only if a saved configuration already exists
+  Future<List<Asset>> _filterAssetsForInitialActivation(
+    List<Asset> assets,
+  ) async {
+    final filtered = <Asset>[];
+    for (final asset in assets) {
+      if (asset.id.subClass != CoinSubClass.zhtlc) {
+        filtered.add(asset);
+        continue;
+      }
+
+      try {
+        final saved =
+            await _kdfSdk.activationConfigService.getSavedZhtlc(asset.id);
+        if (saved != null) {
+          filtered.add(asset);
+        } else {
+          _log.info(
+            'Skipping auto-activation of ZHTLC asset ${asset.id.id} during login: no saved configuration found',
+          );
+        }
+      } catch (e, s) {
+        _log.shout(
+          'Error checking saved ZHTLC configuration for ${asset.id.id}',
+          e,
+          s,
+        );
+      }
+    }
+    return filtered;
+  }
+
   CoinsState _prePopulateListWithActivatingCoins(Iterable<String> coins) {
     final knownCoins = _coinsRepo.getKnownCoinsMap();
     final activatingCoins = Map<String, Coin>.fromIterable(

diff --git a/lib/bloc/coins_manager/coins_manager_bloc.dart b/lib/bloc/coins_manager/coins_manager_bloc.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' show Bloc, Emitter;
 import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
+import 'package:komodo_defi_types/komodo_defi_types.dart' show CoinSubClass;
 import 'package:komodo_ui_kit/komodo_ui_kit.dart';
 import 'package:logging/logging.dart';
 import 'package:web_dex/analytics/events/portfolio_events.dart';
@@ -374,6 +375,21 @@ class CoinsManagerBloc extends Bloc<CoinsManagerEvent, CoinsManagerState> {
     final selectedCoinIds = result.map((c) => c.id.id).toSet();
 
     for (final walletCoin in walletCoins) {
+      // Do not pre-select ZHTLC coins without saved configuration.
+      // This ensures toggles remain OFF if auto-activation was bypassed.
+      if (walletCoin.id.subClass == CoinSubClass.zhtlc) {
+        try {
+          final saved =
+              await _sdk.activationConfigService.getSavedZhtlc(walletCoin.id);
+          if (saved == null) {
+            continue;
+          }
+        } catch (_) {
+          // On any error, be conservative and keep toggle OFF
+          continue;
+        }
+      }
+
       if (!selectedCoinIds.contains(walletCoin.id.id)) {
         result.add(walletCoin);
       }