From 3def96792a60e05f7bb1398b72909eac9cab38a9 Mon Sep 17 00:00:00 2001
From: Satoshi Qazi Muhammed <info@pezkuwichain.io>
Date: Tue, 14 Jul 2026 07:29:35 -0700
Subject: [PATCH] Fix Bridge multisig compile errors surfaced by CI

- module(Modules.X) needs substrate_sdk_android's module() extension
  imported explicitly, not just the Module type.
- accountIdIn is a MetaAccount member, not a top-level import.
- submitExtrinsicAndAwaitExecution(...).requireOk() resolves to the
  Result<T>-preserving overload, so wrapping it in runCatching produced
  Result<Result<T>>; unwrap with getOrThrow() first so the T-returning
  overload applies.
---
 .../domain/bridge/multisig/BridgeMultisigCalls.kt              | 1 +
 .../domain/bridge/multisig/BridgeMultisigInteractor.kt         | 3 +--
 .../domain/bridge/multisig/BridgeMultisigRuntimeApi.kt         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigCalls.kt b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigCalls.kt
index 4f134374..300c75c8 100644
--- a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigCalls.kt
+++ b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigCalls.kt
@@ -10,6 +10,7 @@ import io.novafoundation.nova.runtime.util.constructAccountLookupInstance
 import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot
 import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall
 import io.novasama.substrate_sdk_android.runtime.metadata.call
+import io.novasama.substrate_sdk_android.runtime.metadata.module
 import java.math.BigInteger
 
 /**
diff --git a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigInteractor.kt b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigInteractor.kt
index cb6a77b5..9ef7c743 100644
--- a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigInteractor.kt
+++ b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigInteractor.kt
@@ -11,7 +11,6 @@ import io.novafoundation.nova.feature_account_api.data.extrinsic.ExtrinsicServic
 import io.novafoundation.nova.feature_account_api.data.extrinsic.execution.ExtrinsicExecutionResult
 import io.novafoundation.nova.feature_account_api.data.extrinsic.execution.requireOk
 import io.novafoundation.nova.feature_account_api.domain.interfaces.SelectedAccountUseCase
-import io.novafoundation.nova.feature_account_api.domain.model.accountIdIn
 import io.novafoundation.nova.feature_account_api.domain.multisig.intoCallHash
 import io.novafoundation.nova.runtime.di.REMOTE_STORAGE_SOURCE
 import io.novafoundation.nova.runtime.ext.ChainGeneses
@@ -116,7 +115,7 @@ class RealBridgeMultisigInteractor @Inject constructor(
             )
 
             call(multisigCall)
-        }.requireOk()
+        }.getOrThrow().requireOk()
     }
 
     private suspend fun queryRemainingAllowance(chain: Chain): BigInteger {
diff --git a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigRuntimeApi.kt b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigRuntimeApi.kt
index ccdf0162..ebc5456b 100644
--- a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigRuntimeApi.kt
+++ b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/bridge/multisig/BridgeMultisigRuntimeApi.kt
@@ -17,6 +17,7 @@ import io.novafoundation.nova.runtime.storage.source.query.api.converters.scaleE
 import io.novafoundation.nova.runtime.storage.source.query.api.storage2
 import io.novafoundation.nova.runtime.storage.source.query.api.storage3
 import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata
+import io.novasama.substrate_sdk_android.runtime.metadata.module
 import io.novasama.substrate_sdk_android.runtime.metadata.module.Module
 import java.math.BigInteger