diff --git a/suite-native/analytics/src/jest.setup.ts b/suite-native/analytics/src/jest.setup.ts
new file mode 100644
index 0000000000..be081faaa4
--- /dev/null
+++ b/suite-native/analytics/src/jest.setup.ts
@@ -0,0 +1 @@
+//jest.mock('./analytics');
diff --git a/suite-native/app/e2e/pageObjects/tradingBuyActions.ts b/suite-native/app/e2e/pageObjects/tradingBuyActions.ts
index b209b9ca04..918fd715fd 100644
--- a/suite-native/app/e2e/pageObjects/tradingBuyActions.ts
+++ b/suite-native/app/e2e/pageObjects/tradingBuyActions.ts
@@ -38,7 +38,7 @@ class TradingBuyActions {
     }
 
     async scrollScreenToBottom() {
-        await element(by.id('@screen/Trading')).swipe('up', 'fast', 0.8);
+        await element(by.id('@screen/Trading')).swipe('up');
     }
 
     async waitForQuotesToLoad() {
@@ -112,8 +112,9 @@ class TradingBuyActions {
     async setFiatAmount(amount: string) {
         await this.getFiatAmountElement().tap();
         await this.getFiatAmountElement().replaceText(amount);
-        await this.getAmountEditingDoneButton().tap();
         await this.waitForQuotesToLoad();
+        await this.scrollScreenToBottom();
+        await this.getAmountEditingDoneButton().tap({ x: 20, y: 1 });
     }
 
     async expectReceiveAccountBalance(expectedValue: string) {
diff --git a/suite-native/module-trading/src/components/general/AccountList/__tests__/AccountListItem.comp.test.tsx b/suite-native/module-trading/src/components/general/AccountList/__tests__/AccountListItem.comp.test.tsx
index 68c539858e..4ee5cd0e6e 100644
--- a/suite-native/module-trading/src/components/general/AccountList/__tests__/AccountListItem.comp.test.tsx
+++ b/suite-native/module-trading/src/components/general/AccountList/__tests__/AccountListItem.comp.test.tsx
@@ -13,6 +13,18 @@ jest.mock('@suite-common/wallet-core', () => {
     };
 });
 
+jest.mock('@suite-common/trading', () => {
+    const actualImplementation = jest.requireActual('@suite-common/trading');
+
+    return {
+        ...actualImplementation,
+        tradingThunks: {
+            ...actualImplementation.tradingThunks,
+            watchTradeThunk: () => ({ type: 'mocked-action' }),
+        },
+    };
+});
+
 describe('AccountListItem', () => {
     const onPressMock = jest.fn();
 
diff --git a/suite-native/module-trading/src/screens/__tests__/TradingHistoryScreen.comp.test.tsx b/suite-native/module-trading/src/screens/__tests__/TradingHistoryScreen.comp.test.tsx
index 5f0a2ddf28..84890998bd 100644
--- a/suite-native/module-trading/src/screens/__tests__/TradingHistoryScreen.comp.test.tsx
+++ b/suite-native/module-trading/src/screens/__tests__/TradingHistoryScreen.comp.test.tsx
@@ -36,6 +36,18 @@ jest.mock('../../hooks/general/useBottomSheetControls', () => ({
     }),
 }));
 
+jest.mock('@suite-common/trading', () => {
+    const actualImplementation = jest.requireActual('@suite-common/trading');
+
+    return {
+        ...actualImplementation,
+        tradingThunks: {
+            ...actualImplementation.tradingThunks,
+            watchTradeThunk: () => ({ type: 'mocked-action' }),
+        },
+    };
+});
+
 const buyTrade = getBuyTrade({ status: 'SUBMITTED' });
 const exchangeTrade = getExchangeTrade({ status: 'CONVERTING' });
 
diff --git a/suite-native/module-trading/src/screens/__tests__/TradingWebViewScreen.comp.test.tsx b/suite-native/module-trading/src/screens/__tests__/TradingWebViewScreen.comp.test.tsx
index b378bb8a90..e2817c8d67 100644
--- a/suite-native/module-trading/src/screens/__tests__/TradingWebViewScreen.comp.test.tsx
+++ b/suite-native/module-trading/src/screens/__tests__/TradingWebViewScreen.comp.test.tsx
@@ -12,6 +12,18 @@ jest.mock('@react-navigation/native', () => ({
     useRoute: () => ({ name: 'TradingWebViewScreen', params: { ...mockRouteParams } }),
 }));
 
+jest.mock('@suite-common/trading', () => {
+    const actualImplementation = jest.requireActual('@suite-common/trading');
+
+    return {
+        ...actualImplementation,
+        tradingThunks: {
+            ...actualImplementation.tradingThunks,
+            watchTradeThunk: () => ({ type: 'mocked-action' }),
+        },
+    };
+});
+
 describe('TradingWebViewScreen', () => {
     it('should render header', async () => {
         mockRouteParams = {