From c6d6f36d8ff8fb827e190805a1b864fcca7bca5b Mon Sep 17 00:00:00 2001
From: axtezy <axtezy@gmail.com>
Date: Fri, 13 Sep 2024 15:14:29 +0200
Subject: [PATCH] Fix api from address

---
 package.json                                              | 2 +-
 .../providers/common/cross-chain-trade.ts                 | 8 +++++++-
 .../common/emv-cross-chain-trade/evm-cross-chain-trade.ts | 1 +
 .../evm-on-chain-trade/evm-on-chain-trade.ts              | 1 +
 .../providers/common/on-chain-trade/on-chain-trade.ts     | 8 +++++++-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index e92f380393f..b4a1ee43b02 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rubic-sdk",
-    "version": "5.36.6",
+    "version": "5.36.7",
     "description": "Simplify dApp creation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
diff --git a/src/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.ts b/src/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.ts
index f3069dee3aa..3a9c4680cba 100644
--- a/src/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.ts
+++ b/src/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.ts
@@ -91,7 +91,7 @@ export abstract class CrossChainTrade<T = unknown> {
     }
 
     protected get walletAddress(): string {
-        return this.web3Private.address;
+        return this._apiFromAddress ?? this.web3Private.address;
     }
 
     protected abstract get methodName(): string;
@@ -139,6 +139,12 @@ export abstract class CrossChainTrade<T = unknown> {
         }
     }
 
+    private _apiFromAddress: string | null = null;
+
+    public set apiFromAddress(value: string | null) {
+        this._apiFromAddress = value;
+    }
+
     protected constructor(
         protected readonly providerAddress: string,
         protected readonly routePath: RubicStep[]
diff --git a/src/features/cross-chain/calculation-manager/providers/common/emv-cross-chain-trade/evm-cross-chain-trade.ts b/src/features/cross-chain/calculation-manager/providers/common/emv-cross-chain-trade/evm-cross-chain-trade.ts
index 0624c374bf8..e47447b7933 100644
--- a/src/features/cross-chain/calculation-manager/providers/common/emv-cross-chain-trade/evm-cross-chain-trade.ts
+++ b/src/features/cross-chain/calculation-manager/providers/common/emv-cross-chain-trade/evm-cross-chain-trade.ts
@@ -164,6 +164,7 @@ export abstract class EvmCrossChainTrade extends CrossChainTrade<EvmEncodeConfig
         fromAddress: string,
         options: SwapTransactionOptions = {}
     ): Promise<EvmTransactionOptions | never> {
+        this.apiFromAddress = fromAddress;
         if (!options?.testMode) {
             await this.checkTradeErrors();
         }
diff --git a/src/features/on-chain/calculation-manager/providers/common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade.ts b/src/features/on-chain/calculation-manager/providers/common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade.ts
index a5127450f27..faa64badf89 100644
--- a/src/features/on-chain/calculation-manager/providers/common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade.ts
+++ b/src/features/on-chain/calculation-manager/providers/common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade.ts
@@ -279,6 +279,7 @@ export abstract class EvmOnChainTrade extends OnChainTrade {
         fromAddress: string,
         options: SwapTransactionOptions = {}
     ): Promise<EvmTransactionOptions | never> {
+        this.apiFromAddress = fromAddress;
         if (!options?.testMode) {
             await this.checkWalletState(options?.testMode);
         }
diff --git a/src/features/on-chain/calculation-manager/providers/common/on-chain-trade/on-chain-trade.ts b/src/features/on-chain/calculation-manager/providers/common/on-chain-trade/on-chain-trade.ts
index fc2f1694ce6..9a7ec2cc908 100644
--- a/src/features/on-chain/calculation-manager/providers/common/on-chain-trade/on-chain-trade.ts
+++ b/src/features/on-chain/calculation-manager/providers/common/on-chain-trade/on-chain-trade.ts
@@ -44,6 +44,12 @@ export abstract class OnChainTrade {
 
     public abstract readonly feeInfo: FeeInfo;
 
+    private _apiFromAddress: string | null = null;
+
+    public set apiFromAddress(value: string | null) {
+        this._apiFromAddress = value;
+    }
+
     /**
      * Type of instant trade provider.
      */
@@ -66,7 +72,7 @@ export abstract class OnChainTrade {
     }
 
     protected get walletAddress(): string {
-        return this.web3Private.address;
+        return this._apiFromAddress ?? this.web3Private.address;
     }
 
     protected get httpClient(): HttpClient {