From 4cc736ef208a83d1c20310f45dcf0cea017c9cf9 Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Wed, 20 Aug 2025 17:32:41 +0800
Subject: [PATCH 01/12] feat: russian withdrawal message

---
 .../real/__tests__/real.spec.tsx              | 26 +++++++++-
 .../cashier-container/real/real.scss          | 10 ++++
 .../cashier-container/real/real.tsx           | 48 ++++++++++++++-----
 .../__tests__/withdrawal-crypto-form.spec.tsx | 17 +++++++
 .../withdrawal-crypto-form.scss               |  9 ++++
 .../withdrawal-crypto-form.tsx                | 28 +++++++++--
 6 files changed, 121 insertions(+), 17 deletions(-)

diff --git a/packages/cashier/src/components/cashier-container/real/__tests__/real.spec.tsx b/packages/cashier/src/components/cashier-container/real/__tests__/real.spec.tsx
index 54a581ea884f..249a26a5f50e 100644
--- a/packages/cashier/src/components/cashier-container/real/__tests__/real.spec.tsx
+++ b/packages/cashier/src/components/cashier-container/real/__tests__/real.spec.tsx
@@ -73,7 +73,7 @@ describe('<Real />', () => {
         expect(screen.queryByTestId('dt_doughflow_section')).toBeInTheDocument();
     });
 
-    it('should trigger setIsDeposit callback when the user clicks on Cashier breadcrumb', () => {
+    it('should trigger setIsDeposit callback when the user clicks on Cashier breadcrumb', async () => {
         render(
             <StoreProvider store={mock_root_store}>
                 <Real />
@@ -83,8 +83,30 @@ describe('<Real />', () => {
         const el_breadcrumb_cashier = screen.queryByText(/cashier/i);
 
         if (el_breadcrumb_cashier) {
-            userEvent.click(el_breadcrumb_cashier);
+            await userEvent.click(el_breadcrumb_cashier);
             expect(mocked_cashier_store.general_store?.setIsDeposit).toHaveBeenCalledWith(false);
         }
     });
+
+    it('should render inline message with StaticUrl when country code is RU', () => {
+        const mock_store = mockStore({
+            client: {
+                account_settings: {
+                    country_code: 'ru',
+                },
+            },
+        });
+
+        render(
+            <StoreProvider store={mock_store}>
+                <Real />
+            </StoreProvider>
+        );
+
+        expect(screen.getByText(/Withdraw using the same payment method you used to deposit/i)).toBeInTheDocument();
+
+        const link = screen.getByRole('link', { name: /available payment methods/i });
+        expect(link).toBeInTheDocument();
+        expect(link).toHaveAttribute('href', expect.stringContaining('/payment-methods'));
+    });
 });
diff --git a/packages/cashier/src/components/cashier-container/real/real.scss b/packages/cashier/src/components/cashier-container/real/real.scss
index 3bfb8a46406a..d4be81813708 100644
--- a/packages/cashier/src/components/cashier-container/real/real.scss
+++ b/packages/cashier/src/components/cashier-container/real/real.scss
@@ -9,6 +9,10 @@
             inset-inline-end: 0;
             padding: 0 1.6rem;
 
+            &--ru {
+                top: 9rem;
+            }
+
             + .page-container__sidebar--right {
                 position: relative;
                 top: 100%;
@@ -17,6 +21,12 @@
             }
         }
     }
+
+    &__inline-message-link {
+        text-decoration: underline;
+        cursor: pointer;
+    }
+
     &__loader {
         width: 100%;
         height: 80vh;
diff --git a/packages/cashier/src/components/cashier-container/real/real.tsx b/packages/cashier/src/components/cashier-container/real/real.tsx
index e1e91acb67f2..97cd379d1b78 100644
--- a/packages/cashier/src/components/cashier-container/real/real.tsx
+++ b/packages/cashier/src/components/cashier-container/real/real.tsx
@@ -1,11 +1,16 @@
 import React from 'react';
-import { Loading } from '@deriv/components';
-import { useStore, observer } from '@deriv/stores';
+
+import { InlineMessage, Loading, StaticUrl, Text } from '@deriv/components';
+import { observer, useStore } from '@deriv/stores';
+import { Localize } from '@deriv/translations';
+
 import { useCashierStore } from '../../../stores/useCashierStores';
+
 import './real.scss';
 
 const Real = observer(() => {
-    const { ui } = useStore();
+    const { client, ui } = useStore();
+    const { account_settings } = client;
     const { is_dark_mode_on } = ui;
     const { iframe, general_store } = useCashierStore();
     const { clearIframe, iframe_height, iframe_url, checkIframeLoaded, setContainerHeight } = iframe;
@@ -28,14 +33,35 @@ const Real = observer(() => {
         <React.Fragment>
             {should_show_loader && <Loading className='real__loader' />}
             {iframe_url && (
-                <iframe
-                    className='cashier__content real__iframe'
-                    height={iframe_height}
-                    src={`${iframe_url}&DarkMode=${is_dark_mode_on ? 'on' : 'off'}`}
-                    frameBorder='0'
-                    scrolling='auto'
-                    data-testid='dt_doughflow_section'
-                />
+                <>
+                    {account_settings.country_code?.toLowerCase() === 'ru' && !should_show_loader && (
+                        <InlineMessage type='information'>
+                            <Text as='span' size='xxxs'>
+                                <Localize
+                                    i18n_default_text='Withdraw using the same payment method you used to deposit. If that method isn’t supported, check our <0>available payment methods.</0>'
+                                    className='real__inline-message'
+                                    components={[
+                                        <StaticUrl
+                                            key={0}
+                                            className='real__inline-message-link'
+                                            href='/payment-methods'
+                                        />,
+                                    ]}
+                                />
+                            </Text>
+                        </InlineMessage>
+                    )}
+                    <iframe
+                        className={`cashier__content real__iframe ${
+                            account_settings.country_code?.toLowerCase() === 'ru' ? 'real__iframe--ru' : ''
+                        }`}
+                        height={iframe_height}
+                        src={`${iframe_url}&DarkMode=${is_dark_mode_on ? 'on' : 'off'}`}
+                        frameBorder='0'
+                        scrolling='auto'
+                        data-testid='dt_doughflow_section'
+                    />
+                </>
             )}
         </React.Fragment>
     );
diff --git a/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/__tests__/withdrawal-crypto-form.spec.tsx b/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/__tests__/withdrawal-crypto-form.spec.tsx
index 7f40c25501ab..bffcc8fd1d9c 100644
--- a/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/__tests__/withdrawal-crypto-form.spec.tsx
+++ b/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/__tests__/withdrawal-crypto-form.spec.tsx
@@ -39,6 +39,7 @@ describe('<WithdrawalCryptoForm />', () => {
     beforeEach(() => {
         mockRootStore = mockStore({
             client: {
+                account_settings: { country_code: 'aq' },
                 currency: 'BTC',
                 verification_code: { payment_withdraw: 'code' },
             },
@@ -190,4 +191,20 @@ describe('<WithdrawalCryptoForm />', () => {
         });
         await waitFor(() => expect(mockRootStore.modules.cashier.withdraw.requestWithdraw).toHaveBeenCalled());
     });
+
+    it('should render inline message with StaticUrl when country code is RU', () => {
+        mockRootStore.client.account_settings.country_code = 'ru';
+
+        render(
+            <CashierProviders store={mockRootStore}>
+                <WithdrawalCryptoForm />
+            </CashierProviders>
+        );
+
+        expect(screen.getByText(/Withdraw using the same payment method you used to deposit/i)).toBeInTheDocument();
+
+        const link = screen.getByRole('link', { name: /available payment methods/i });
+        expect(link).toBeInTheDocument();
+        expect(link).toHaveAttribute('href', expect.stringContaining('/payment-methods'));
+    });
 });
diff --git a/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.scss b/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.scss
index 83b99a1faf6b..c5293f68fcee 100644
--- a/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.scss
+++ b/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.scss
@@ -75,4 +75,13 @@
         list-style-type: disc;
         margin-left: 1.6rem;
     }
+
+    &__inline-message {
+        width: 100%;
+    }
+
+    &__inline-message-link {
+        text-decoration: underline;
+        cursor: pointer;
+    }
 }
diff --git a/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.tsx b/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.tsx
index 13fb88e8287a..c27c41c2b8e0 100644
--- a/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.tsx
+++ b/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.tsx
@@ -1,10 +1,12 @@
 import React from 'react';
 import { Field, FieldProps, Formik, FormikProps } from 'formik';
-import { Button, InlineMessage, Input, Loading, Text } from '@deriv/components';
+
+import { Button, InlineMessage, Input, Loading, StaticUrl, Text } from '@deriv/components';
 import { useExchangeRate, useGrowthbookIsOn } from '@deriv/hooks';
 import { CryptoConfig, getCurrencyName } from '@deriv/shared';
 import { observer, useStore } from '@deriv/stores';
 import { Localize, localize } from '@deriv/translations';
+
 import CryptoFiatConverter from '../../../components/crypto-fiat-converter';
 import PercentageSelector from '../../../components/percentage-selector';
 import { useCashierStore } from '../../../stores/useCashierStores';
@@ -14,6 +16,7 @@ import WithdrawalCryptoPriority from '../withdrawal-crypto-priority';
 import './withdrawal-crypto-form.scss';
 
 type THeaderProps = {
+    country_code: string;
     currency: string;
 };
 
@@ -26,7 +29,7 @@ const MIN_ADDRESS_LENGTH = 25;
 const MAX_ADDRESS_LENGTH = 64;
 const DEFAULT_FIAT_CURRENCY = 'USD';
 
-const Header = ({ currency }: THeaderProps) => {
+const Header = ({ country_code, currency }: THeaderProps) => {
     const currency_name = getCurrencyName(currency);
     const currency_display_code = CryptoConfig.get()[currency].display_code;
 
@@ -41,8 +44,24 @@ const Header = ({ currency }: THeaderProps) => {
                     }}
                 />
             </Text>
+            {country_code?.toLowerCase() === 'ru' && (
+                <InlineMessage className='withdrawal-crypto-form__inline-message' type='information'>
+                    <Text as='span' size='xxxs'>
+                        <Localize
+                            i18n_default_text='Withdraw using the same payment method you used to deposit. If that method isn’t supported, check our <0>available payment methods.</0>'
+                            components={[
+                                <StaticUrl
+                                    key={0}
+                                    className='withdrawal-crypto-form__inline-message-link'
+                                    href='/payment-methods'
+                                />,
+                            ]}
+                        />
+                    </Text>
+                </InlineMessage>
+            )}
             <InlineMessage>
-                <Text as='ul' className='withdrawal-crypto-form__inline-list' size='xxs'>
+                <Text as='ul' className='withdrawal-crypto-form__inline-list' size='xxxs'>
                     <li>
                         <Localize i18n_default_text='Do not enter an address linked to an initial coin offering (ICO) purchase or crowdsale. If you do, the initial coin offering (ICO) tokens will not be credited into your account.' />
                     </li>
@@ -59,6 +78,7 @@ const WithdrawalCryptoForm = observer(() => {
     const [arrow_icon_direction, setArrowIconDirection] = React.useState<'right' | 'left'>('right');
     const { client } = useStore();
     const {
+        account_settings,
         balance,
         currency,
         current_fiat_currency = 'USD',
@@ -120,7 +140,7 @@ const WithdrawalCryptoForm = observer(() => {
 
     return (
         <div className='withdrawal-crypto-form__wrapper' data-testid='dt_withdrawal_crypto_form'>
-            <Header currency={currency} />
+            <Header country_code={account_settings.country_code || ''} currency={currency} />
             <Formik
                 initialValues={{
                     address: '',

From 836b1dbbdbe02bd5bc5b862304a4101f212095d4 Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Wed, 20 Aug 2025 17:58:08 +0800
Subject: [PATCH 02/12] fix: retrigger coveralls


From b1de2b64aad0539c564e8a05d1da591544769ae7 Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Wed, 20 Aug 2025 18:13:59 +0800
Subject: [PATCH 03/12] fix: retrigger coveralls


From 6685b08438352d51cd0e317679a4b336e6fbaf0f Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Thu, 21 Aug 2025 10:43:25 +0800
Subject: [PATCH 04/12] fix: retrigger coveralls


From 13026370db964d5d0f045ca596ad24e340fc5ebc Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Mon, 25 Aug 2025 14:09:32 +0800
Subject: [PATCH 05/12] feat: update transfer restriction

---
 .../real/__tests__/real.spec.tsx              | 12 +-----
 .../cashier-container/real/real.scss          |  5 +--
 .../cashier-container/real/real.tsx           |  9 ++--
 .../__tests__/account-transfer-form.spec.tsx  | 13 ++++++
 .../account-transfer-form.scss                |  9 +++-
 .../account-transfer-form.tsx                 | 41 +++++++++++++++++--
 .../__tests__/withdrawal-crypto-form.spec.tsx |  4 +-
 .../withdrawal-crypto-form.tsx                | 36 ++++++++--------
 8 files changed, 80 insertions(+), 49 deletions(-)

diff --git a/packages/cashier/src/components/cashier-container/real/__tests__/real.spec.tsx b/packages/cashier/src/components/cashier-container/real/__tests__/real.spec.tsx
index 249a26a5f50e..6d21638efa88 100644
--- a/packages/cashier/src/components/cashier-container/real/__tests__/real.spec.tsx
+++ b/packages/cashier/src/components/cashier-container/real/__tests__/real.spec.tsx
@@ -88,17 +88,9 @@ describe('<Real />', () => {
         }
     });
 
-    it('should render inline message with StaticUrl when country code is RU', () => {
-        const mock_store = mockStore({
-            client: {
-                account_settings: {
-                    country_code: 'ru',
-                },
-            },
-        });
-
+    it('should render inline message with StaticUrl', () => {
         render(
-            <StoreProvider store={mock_store}>
+            <StoreProvider store={mock_root_store}>
                 <Real />
             </StoreProvider>
         );
diff --git a/packages/cashier/src/components/cashier-container/real/real.scss b/packages/cashier/src/components/cashier-container/real/real.scss
index d4be81813708..c921681592a2 100644
--- a/packages/cashier/src/components/cashier-container/real/real.scss
+++ b/packages/cashier/src/components/cashier-container/real/real.scss
@@ -8,10 +8,7 @@
             height: calc(100% - 6rem);
             inset-inline-end: 0;
             padding: 0 1.6rem;
-
-            &--ru {
-                top: 9rem;
-            }
+            top: 9rem;
 
             + .page-container__sidebar--right {
                 position: relative;
diff --git a/packages/cashier/src/components/cashier-container/real/real.tsx b/packages/cashier/src/components/cashier-container/real/real.tsx
index 97cd379d1b78..dd445e63c008 100644
--- a/packages/cashier/src/components/cashier-container/real/real.tsx
+++ b/packages/cashier/src/components/cashier-container/real/real.tsx
@@ -9,8 +9,7 @@ import { useCashierStore } from '../../../stores/useCashierStores';
 import './real.scss';
 
 const Real = observer(() => {
-    const { client, ui } = useStore();
-    const { account_settings } = client;
+    const { ui } = useStore();
     const { is_dark_mode_on } = ui;
     const { iframe, general_store } = useCashierStore();
     const { clearIframe, iframe_height, iframe_url, checkIframeLoaded, setContainerHeight } = iframe;
@@ -34,7 +33,7 @@ const Real = observer(() => {
             {should_show_loader && <Loading className='real__loader' />}
             {iframe_url && (
                 <>
-                    {account_settings.country_code?.toLowerCase() === 'ru' && !should_show_loader && (
+                    {!should_show_loader && (
                         <InlineMessage type='information'>
                             <Text as='span' size='xxxs'>
                                 <Localize
@@ -52,9 +51,7 @@ const Real = observer(() => {
                         </InlineMessage>
                     )}
                     <iframe
-                        className={`cashier__content real__iframe ${
-                            account_settings.country_code?.toLowerCase() === 'ru' ? 'real__iframe--ru' : ''
-                        }`}
+                        className='cashier__content real__iframe'
                         height={iframe_height}
                         src={`${iframe_url}&DarkMode=${is_dark_mode_on ? 'on' : 'off'}`}
                         frameBorder='0'
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx
index f99366f732d2..a8d08fbcc52e 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx
@@ -36,6 +36,7 @@ describe('<AccountTransferForm />', () => {
                         mt5: {},
                     },
                 },
+                account_settings: { country_code: 'aq' },
                 mt5_login_list: [
                     {
                         login: 'value',
@@ -145,6 +146,18 @@ describe('<AccountTransferForm />', () => {
         expect(screen.getByText('Cashier Error')).toBeInTheDocument();
     });
 
+    it('should render inline message and disable transfer button when country code is RU', () => {
+        mockRootStore.client.account_settings.country_code = 'ru';
+        mockRootStore.modules.cashier.account_transfer.selected_to.is_crypto = true;
+
+        renderAccountTransferForm();
+
+        expect(
+            screen.getByText('Transfers from fiat accounts to crypto accounts are not supported.')
+        ).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Transfer' })).toBeDisabled();
+    });
+
     it('should show loader if account_list.length === 0', () => {
         mockRootStore.modules.cashier.account_transfer.accounts_list = [];
 
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
index 481114962999..c761df50d0bf 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
@@ -8,9 +8,14 @@
     }
 
     &__header {
-        padding: 0 0 3.2rem;
+        padding: 0 0 1.6rem;
+    }
+
+    &__inline-message {
+        margin: 0 0 2.4rem;
+
         @include mobile-or-tablet-screen {
-            padding: 0 0 1.6rem;
+            margin: 0 0 1.6rem;
         }
     }
 
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
index f1d2ec8ea802..96818d709b6f 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
@@ -2,7 +2,9 @@ import React from 'react';
 import { Link, useHistory } from 'react-router-dom';
 import classNames from 'classnames';
 import { Field, FieldProps, Form, Formik } from 'formik';
+
 import { Button, Dropdown, InlineMessage, Input, Loading, Money, StatusBadge, Text } from '@deriv/components';
+import { useExchangeRate, useMFAccountStatus } from '@deriv/hooks';
 import {
     CFD_PLATFORMS,
     getCurrencyDisplayCode,
@@ -17,15 +19,16 @@ import {
 } from '@deriv/shared';
 import { observer, useStore } from '@deriv/stores';
 import { Localize, localize } from '@deriv/translations';
-import { useMFAccountStatus, useExchangeRate } from '@deriv/hooks';
 import { useDevice } from '@deriv-com/ui';
+
 import AccountPlatformIcon from '../../../components/account-platform-icon';
 import CryptoFiatConverter from '../../../components/crypto-fiat-converter';
 import ErrorDialog from '../../../components/error-dialog';
 import PercentageSelector from '../../../components/percentage-selector';
 import { useCashierStore } from '../../../stores/useCashierStores';
-import { TAccount, TAccountsList, TError, TReactChangeEvent, TradingPlatformStatusResponse } from '../../../types';
+import { TAccount, TAccountsList, TError, TradingPlatformStatusResponse, TReactChangeEvent } from '../../../types';
 import AccountTransferReceipt from '../account-transfer-receipt/account-transfer-receipt';
+
 import './account-transfer-form.scss';
 
 type TAccountTransferFormProps = {
@@ -154,7 +157,7 @@ const AccountTransferForm = observer(
             traders_hub: { closeAccountTransferModal },
         } = useStore();
         const { isDesktop, isMobile } = useDevice();
-        const { account_limits, authentication_status, getLimits: onMount } = client;
+        const { account_limits, account_settings, authentication_status, getLimits: onMount } = client;
 
         const mf_account_status = useMFAccountStatus();
         const { account_transfer, crypto_fiat_converter, general_store } = useCashierStore();
@@ -444,6 +447,22 @@ const AccountTransferForm = observer(
             selected_from?.status?.includes('poa_failed') &&
             authentication_status?.document_status !== 'verified';
 
+        const is_russia_restricted =
+            account_settings?.country_code?.toLowerCase() === 'ru' &&
+            // specific restriction for fiat CR <=> crypto CR accounts
+            ((selected_from?.is_crypto &&
+                !selected_to?.is_crypto &&
+                !selected_to?.is_ctrader &&
+                !selected_to?.is_derivez &&
+                !selected_to?.is_dxtrade &&
+                !selected_to?.is_mt) ||
+                (!selected_from?.is_crypto &&
+                    !selected_from?.is_ctrader &&
+                    !selected_from?.is_derivez &&
+                    !selected_from?.is_dxtrade &&
+                    !selected_from?.is_mt &&
+                    selected_to?.is_crypto));
+
         const poa_pending_msg = localize(
             'You will be able to transfer funds between MT5 accounts and other accounts once your address is verified.'
         );
@@ -500,6 +519,19 @@ const AccountTransferForm = observer(
                         {localize('Transfer between your accounts in Deriv')}
                     </Text>
                 )}
+                {is_russia_restricted && (
+                    <InlineMessage className='account-transfer-form__inline-message' type='warning'>
+                        <Text as='span' size='xxxs'>
+                            <Localize
+                                i18n_default_text={
+                                    selected_from?.is_crypto
+                                        ? 'Transfers from crypto accounts to fiat accounts are not supported.'
+                                        : 'Transfers from fiat accounts to crypto accounts are not supported.'
+                                }
+                            />
+                        </Text>
+                    </InlineMessage>
+                )}
                 <Formik
                     initialValues={{
                         amount: account_transfer_amount || '',
@@ -757,7 +789,8 @@ const AccountTransferForm = observer(
                                                         shouldShowTransferButton(values.amount) ||
                                                         is_mt5_restricted ||
                                                         is_unavailable_status_present ||
-                                                        is_maintenance_status_present
+                                                        is_maintenance_status_present ||
+                                                        is_russia_restricted
                                                     }
                                                     primary
                                                     large
diff --git a/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/__tests__/withdrawal-crypto-form.spec.tsx b/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/__tests__/withdrawal-crypto-form.spec.tsx
index bffcc8fd1d9c..2966946d74c4 100644
--- a/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/__tests__/withdrawal-crypto-form.spec.tsx
+++ b/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/__tests__/withdrawal-crypto-form.spec.tsx
@@ -192,9 +192,7 @@ describe('<WithdrawalCryptoForm />', () => {
         await waitFor(() => expect(mockRootStore.modules.cashier.withdraw.requestWithdraw).toHaveBeenCalled());
     });
 
-    it('should render inline message with StaticUrl when country code is RU', () => {
-        mockRootStore.client.account_settings.country_code = 'ru';
-
+    it('should render inline message with StaticUrl', () => {
         render(
             <CashierProviders store={mockRootStore}>
                 <WithdrawalCryptoForm />
diff --git a/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.tsx b/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.tsx
index c27c41c2b8e0..efc65831f804 100644
--- a/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.tsx
+++ b/packages/cashier/src/pages/withdrawal/withdrawal-crypto-form/withdrawal-crypto-form.tsx
@@ -16,7 +16,6 @@ import WithdrawalCryptoPriority from '../withdrawal-crypto-priority';
 import './withdrawal-crypto-form.scss';
 
 type THeaderProps = {
-    country_code: string;
     currency: string;
 };
 
@@ -29,7 +28,7 @@ const MIN_ADDRESS_LENGTH = 25;
 const MAX_ADDRESS_LENGTH = 64;
 const DEFAULT_FIAT_CURRENCY = 'USD';
 
-const Header = ({ country_code, currency }: THeaderProps) => {
+const Header = ({ currency }: THeaderProps) => {
     const currency_name = getCurrencyName(currency);
     const currency_display_code = CryptoConfig.get()[currency].display_code;
 
@@ -44,22 +43,20 @@ const Header = ({ country_code, currency }: THeaderProps) => {
                     }}
                 />
             </Text>
-            {country_code?.toLowerCase() === 'ru' && (
-                <InlineMessage className='withdrawal-crypto-form__inline-message' type='information'>
-                    <Text as='span' size='xxxs'>
-                        <Localize
-                            i18n_default_text='Withdraw using the same payment method you used to deposit. If that method isn’t supported, check our <0>available payment methods.</0>'
-                            components={[
-                                <StaticUrl
-                                    key={0}
-                                    className='withdrawal-crypto-form__inline-message-link'
-                                    href='/payment-methods'
-                                />,
-                            ]}
-                        />
-                    </Text>
-                </InlineMessage>
-            )}
+            <InlineMessage className='withdrawal-crypto-form__inline-message' type='information'>
+                <Text as='span' size='xxxs'>
+                    <Localize
+                        i18n_default_text='Withdraw using the same payment method you used to deposit. If that method isn’t supported, check our <0>available payment methods.</0>'
+                        components={[
+                            <StaticUrl
+                                key={0}
+                                className='withdrawal-crypto-form__inline-message-link'
+                                href='/payment-methods'
+                            />,
+                        ]}
+                    />
+                </Text>
+            </InlineMessage>
             <InlineMessage>
                 <Text as='ul' className='withdrawal-crypto-form__inline-list' size='xxxs'>
                     <li>
@@ -78,7 +75,6 @@ const WithdrawalCryptoForm = observer(() => {
     const [arrow_icon_direction, setArrowIconDirection] = React.useState<'right' | 'left'>('right');
     const { client } = useStore();
     const {
-        account_settings,
         balance,
         currency,
         current_fiat_currency = 'USD',
@@ -140,7 +136,7 @@ const WithdrawalCryptoForm = observer(() => {
 
     return (
         <div className='withdrawal-crypto-form__wrapper' data-testid='dt_withdrawal_crypto_form'>
-            <Header country_code={account_settings.country_code || ''} currency={currency} />
+            <Header currency={currency} />
             <Formik
                 initialValues={{
                     address: '',

From e20a693265151b0e5361b829153a3bd4f1477c33 Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Thu, 11 Sep 2025 13:20:01 +0800
Subject: [PATCH 06/12] fix: update transfer message

---
 .../account-transfer-form/account-transfer-form.scss         | 2 ++
 .../account-transfer-form/account-transfer-form.tsx          | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
index c761df50d0bf..ad74958dcfbc 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
@@ -12,10 +12,12 @@
     }
 
     &__inline-message {
+        width: 36rem;
         margin: 0 0 2.4rem;
 
         @include mobile-or-tablet-screen {
             margin: 0 0 1.6rem;
+            width: unset;
         }
     }
 
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
index 96818d709b6f..67e8cfbfeabe 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
@@ -519,6 +519,11 @@ const AccountTransferForm = observer(
                         {localize('Transfer between your accounts in Deriv')}
                     </Text>
                 )}
+                <InlineMessage className='account-transfer-form__inline-message' type='information'>
+                    <Text as='span' size='xxxs'>
+                        <Localize i18n_default_text='Transfers between accounts are only available for trading, not withdrawals. To withdraw funds, use the same method you used to deposit.' />
+                    </Text>
+                </InlineMessage>
                 {is_russia_restricted && (
                     <InlineMessage className='account-transfer-form__inline-message' type='warning'>
                         <Text as='span' size='xxxs'>

From d88196c2689272f48a47596e6e3056e6488e87b8 Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Fri, 19 Sep 2025 16:37:05 +0800
Subject: [PATCH 07/12] fix: qa bugs

---
 .../crypto-fiat-converter/crypto-fiat-converter.tsx  |  4 ++++
 .../percentage-selector/percentage-selector.scss     |  7 +++++++
 .../percentage-selector/percentage-selector.tsx      | 12 ++++++++----
 .../account-transfer-form/account-transfer-form.scss |  5 +++--
 .../account-transfer-form/account-transfer-form.tsx  |  4 +++-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/packages/cashier/src/components/crypto-fiat-converter/crypto-fiat-converter.tsx b/packages/cashier/src/components/crypto-fiat-converter/crypto-fiat-converter.tsx
index 4133409bf189..1d3eb5386742 100644
--- a/packages/cashier/src/components/crypto-fiat-converter/crypto-fiat-converter.tsx
+++ b/packages/cashier/src/components/crypto-fiat-converter/crypto-fiat-converter.tsx
@@ -19,6 +19,7 @@ type TCryptoFiatConverterProps = {
     arrow_icon_direction: 'right' | 'left';
     from_currency: string;
     hint?: React.ReactNode;
+    disabled?: boolean;
     onChangeConverterFromAmount: (
         event: { target: { value: string } },
         from_currency: string,
@@ -51,6 +52,7 @@ const CryptoFiatConverter = observer(
         arrow_icon_direction,
         from_currency,
         hint,
+        disabled,
         onChangeConverterFromAmount,
         onChangeConverterToAmount,
         resetConverter,
@@ -101,6 +103,7 @@ const CryptoFiatConverter = observer(
                             autoComplete='off'
                             required
                             hint={hint}
+                            disabled={disabled}
                             classNameHint='crypto-fiat-converter__hint'
                             data-testid='dt_converter_from_amount_input'
                         />
@@ -141,6 +144,7 @@ const CryptoFiatConverter = observer(
                                 value={converter_to_amount}
                                 autoComplete='off'
                                 hint={localize('Approximate value')}
+                                disabled={disabled}
                                 classNameHint='crypto-fiat-converter__hint'
                                 data-testid='dt_converter_to_amount_input'
                             />
diff --git a/packages/cashier/src/components/percentage-selector/percentage-selector.scss b/packages/cashier/src/components/percentage-selector/percentage-selector.scss
index 00ede85e4be9..6a60c7b9f169 100644
--- a/packages/cashier/src/components/percentage-selector/percentage-selector.scss
+++ b/packages/cashier/src/components/percentage-selector/percentage-selector.scss
@@ -9,6 +9,13 @@
         height: 2.4rem;
         cursor: pointer;
         background-color: var(--general-section-1);
+
+        &--disabled {
+            width: 100%;
+            height: 2.4rem;
+            cursor: not-allowed;
+            background-color: var(--general-section-3);
+        }
     }
 
     &__block-container {
diff --git a/packages/cashier/src/components/percentage-selector/percentage-selector.tsx b/packages/cashier/src/components/percentage-selector/percentage-selector.tsx
index a45e81e7b4c9..9e8394ce865a 100644
--- a/packages/cashier/src/components/percentage-selector/percentage-selector.tsx
+++ b/packages/cashier/src/components/percentage-selector/percentage-selector.tsx
@@ -7,6 +7,7 @@ import { useExchangeRate } from '@deriv/hooks';
 
 type TPercentageSelectorProps = {
     amount: number;
+    disabled?: boolean;
     from_account?: string;
     getCalculatedAmount: (amount: string, converted_amount: number) => void;
     percentage: number;
@@ -20,6 +21,7 @@ type TCalculateAmountInputEvent = { target: { id: number } };
 
 const PercentageSelector = ({
     amount,
+    disabled,
     from_account,
     getCalculatedAmount,
     percentage,
@@ -50,6 +52,8 @@ const PercentageSelector = ({
     }, [from_account, to_account]);
 
     const calculateAmount = (e: TCalculateAmountInputEvent | TReactMouseEvent, percent: number) => {
+        if (disabled) return;
+
         let new_percentage = percent;
         const is_percentage_selected = percent > 0 && percent === Number(selected_percentage);
         if (is_percentage_selected) new_percentage -= 25;
@@ -88,7 +92,7 @@ const PercentageSelector = ({
                     </Text>
                     <div
                         id='1'
-                        className='percentage-selector-block'
+                        className={disabled ? 'percentage-selector-block--disabled' : 'percentage-selector-block'}
                         onClick={e => calculateAmount(e, 25)}
                         data-testid='dt_percentage_selector_block_id_1'
                     />
@@ -99,7 +103,7 @@ const PercentageSelector = ({
                     </Text>
                     <div
                         id='2'
-                        className='percentage-selector-block'
+                        className={disabled ? 'percentage-selector-block--disabled' : 'percentage-selector-block'}
                         onClick={e => calculateAmount(e, 50)}
                         data-testid='dt_percentage_selector_block_id_2'
                     />
@@ -110,7 +114,7 @@ const PercentageSelector = ({
                     </Text>
                     <div
                         id='3'
-                        className='percentage-selector-block'
+                        className={disabled ? 'percentage-selector-block--disabled' : 'percentage-selector-block'}
                         onClick={e => calculateAmount(e, 75)}
                         data-testid='dt_percentage_selector_block_id_3'
                     />
@@ -121,7 +125,7 @@ const PercentageSelector = ({
                     </Text>
                     <div
                         id='4'
-                        className='percentage-selector-block'
+                        className={disabled ? 'percentage-selector-block--disabled' : 'percentage-selector-block'}
                         onClick={e => calculateAmount(e, 100)}
                         data-testid='dt_percentage_selector_block_id_4'
                     />
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
index ad74958dcfbc..528d0f132507 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
@@ -12,8 +12,9 @@
     }
 
     &__inline-message {
-        width: 36rem;
-        margin: 0 0 2.4rem;
+        max-width: 36rem;
+        width: 100%;
+        margin: 0 auto 2.4rem;
 
         @include mobile-or-tablet-screen {
             margin: 0 0 1.6rem;
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
index 67e8cfbfeabe..47250f233aa6 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
@@ -695,7 +695,7 @@ const AccountTransferForm = observer(
                                                                 ''
                                                             )
                                                         }
-                                                        disabled={is_mt5_restricted}
+                                                        disabled={is_mt5_restricted || is_russia_restricted}
                                                     />
                                                 )}
                                             </Field>
@@ -710,6 +710,7 @@ const AccountTransferForm = observer(
                                                         amount={
                                                             selected_from.balance ? Number(selected_from.balance) : 0
                                                         }
+                                                        disabled={is_russia_restricted}
                                                         from_account={selected_from.value}
                                                         getCalculatedAmount={setTransferPercentageSelectorResult}
                                                         percentage={percentage}
@@ -748,6 +749,7 @@ const AccountTransferForm = observer(
                                                             ''
                                                         )
                                                     }
+                                                    disabled={is_russia_restricted}
                                                     onChangeConverterFromAmount={onChangeConverterFromAmount}
                                                     onChangeConverterToAmount={onChangeConverterToAmount}
                                                     resetConverter={resetConverter}

From 14820b03c20b79832279e295aea79a07aa95cc91 Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Fri, 19 Sep 2025 17:43:38 +0800
Subject: [PATCH 08/12] fix: qa bugs

---
 .../account-transfer-form/account-transfer-form.scss        | 4 ++++
 .../account-transfer-form/account-transfer-form.tsx         | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
index 528d0f132507..14b1ae41cc34 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
@@ -20,6 +20,10 @@
             margin: 0 0 1.6rem;
             width: unset;
         }
+
+        &--text {
+            text-align: start;
+        }
     }
 
     &__hint {
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
index 47250f233aa6..cce9a36c0712 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
@@ -521,13 +521,17 @@ const AccountTransferForm = observer(
                 )}
                 <InlineMessage className='account-transfer-form__inline-message' type='information'>
                     <Text as='span' size='xxxs'>
-                        <Localize i18n_default_text='Transfers between accounts are only available for trading, not withdrawals. To withdraw funds, use the same method you used to deposit.' />
+                        <Localize
+                            className='account-transfer-form__inline-message--text'
+                            i18n_default_text='Transfers between accounts are only available for trading, not withdrawals. To withdraw funds, use the same method you used to deposit.'
+                        />
                     </Text>
                 </InlineMessage>
                 {is_russia_restricted && (
                     <InlineMessage className='account-transfer-form__inline-message' type='warning'>
                         <Text as='span' size='xxxs'>
                             <Localize
+                                className='account-transfer-form__inline-message--text'
                                 i18n_default_text={
                                     selected_from?.is_crypto
                                         ? 'Transfers from crypto accounts to fiat accounts are not supported.'

From bc5819dbdead8796793de36ebc4104aed8903e7f Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Thu, 2 Oct 2025 14:50:51 +0800
Subject: [PATCH 09/12] fix: update content

---
 .../__tests__/account-transfer-form.spec.tsx                 | 5 +++++
 .../account-transfer-form/account-transfer-form.tsx          | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx
index a8d08fbcc52e..44879459d2e3 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx
@@ -143,6 +143,11 @@ describe('<AccountTransferForm />', () => {
         renderAccountTransferForm();
 
         expect(screen.getByTestId('dt_account_transfer_form_wrapper')).toBeInTheDocument();
+        expect(
+            screen.getByText(
+                'Transfers within accounts are only available for trading, not withdrawals. To withdraw funds, use the same method you used to deposit.'
+            )
+        ).toBeInTheDocument();
         expect(screen.getByText('Cashier Error')).toBeInTheDocument();
     });
 
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
index cce9a36c0712..97244b4cb23e 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
@@ -523,7 +523,7 @@ const AccountTransferForm = observer(
                     <Text as='span' size='xxxs'>
                         <Localize
                             className='account-transfer-form__inline-message--text'
-                            i18n_default_text='Transfers between accounts are only available for trading, not withdrawals. To withdraw funds, use the same method you used to deposit.'
+                            i18n_default_text='Transfers within accounts are only available for trading, not withdrawals. To withdraw funds, use the same method you used to deposit.'
                         />
                     </Text>
                 </InlineMessage>

From bd0400fdc3a3d4df7df54d1b7038a0a0b138c3dc Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Thu, 2 Oct 2025 14:52:15 +0800
Subject: [PATCH 10/12] fix: update content

---
 .../__tests__/account-transfer-form.spec.tsx                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx
index 44879459d2e3..91ce5030243d 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/__tests__/account-transfer-form.spec.tsx
@@ -158,7 +158,7 @@ describe('<AccountTransferForm />', () => {
         renderAccountTransferForm();
 
         expect(
-            screen.getByText('Transfers from fiat accounts to crypto accounts are not supported.')
+            screen.getByText('Transfers from fiat account to crypto accounts are not supported.')
         ).toBeInTheDocument();
         expect(screen.getByRole('button', { name: 'Transfer' })).toBeDisabled();
     });

From 6a7fc6b0d987768d9bf24b98edd353a6a64344d4 Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Thu, 2 Oct 2025 15:08:16 +0800
Subject: [PATCH 11/12] fix: content update

---
 .../account-transfer-form/account-transfer-form.tsx             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
index 97244b4cb23e..efe025039daf 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
@@ -535,7 +535,7 @@ const AccountTransferForm = observer(
                                 i18n_default_text={
                                     selected_from?.is_crypto
                                         ? 'Transfers from crypto accounts to fiat accounts are not supported.'
-                                        : 'Transfers from fiat accounts to crypto accounts are not supported.'
+                                        : 'Transfers from fiat account to crypto accounts are not supported.'
                                 }
                             />
                         </Text>

From 9c6e13ec45b3ef8425751af24ff51c46a3b7fb49 Mon Sep 17 00:00:00 2001
From: lubega-deriv <lubega@deriv.com>
Date: Thu, 2 Oct 2025 16:38:36 +0800
Subject: [PATCH 12/12] fix: update design

---
 .../crypto-fiat-converter/crypto-fiat-converter.scss      | 8 ++++++++
 .../percentage-selector/percentage-selector.tsx           | 8 ++++----
 .../account-transfer-form/account-transfer-form.scss      | 5 ++++-
 .../account-transfer-form/account-transfer-form.tsx       | 5 ++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/cashier/src/components/crypto-fiat-converter/crypto-fiat-converter.scss b/packages/cashier/src/components/crypto-fiat-converter/crypto-fiat-converter.scss
index a47dc308ff12..7016daeea0c5 100644
--- a/packages/cashier/src/components/crypto-fiat-converter/crypto-fiat-converter.scss
+++ b/packages/cashier/src/components/crypto-fiat-converter/crypto-fiat-converter.scss
@@ -38,6 +38,14 @@
             text-align: start;
         }
 
+        .dc-input__field:disabled {
+            cursor: not-allowed;
+        }
+
+        .dc-input__field:disabled ~ label {
+            color: var(--text-disabled-1, #d6d6d6) !important;
+        }
+
         .dc-field--error {
             line-height: var(--text-lh-m);
             position: static;
diff --git a/packages/cashier/src/components/percentage-selector/percentage-selector.tsx b/packages/cashier/src/components/percentage-selector/percentage-selector.tsx
index 9e8394ce865a..6644f615c4ec 100644
--- a/packages/cashier/src/components/percentage-selector/percentage-selector.tsx
+++ b/packages/cashier/src/components/percentage-selector/percentage-selector.tsx
@@ -87,7 +87,7 @@ const PercentageSelector = ({
         <React.Fragment>
             <div className='percentage-selector' data-testid='dt_percentage_selector_id'>
                 <div className='percentage-selector__block-container'>
-                    <Text color='prominent' size='xs' className='percentage-selector__text'>
+                    <Text color={disabled ? 'disabled-1' : 'prominent'} size='xs' className='percentage-selector__text'>
                         {'25%'}
                     </Text>
                     <div
@@ -98,7 +98,7 @@ const PercentageSelector = ({
                     />
                 </div>
                 <div className='percentage-selector__block-container'>
-                    <Text color='prominent' size='xs' className='percentage-selector__text'>
+                    <Text color={disabled ? 'disabled-1' : 'prominent'} size='xs' className='percentage-selector__text'>
                         {'50%'}
                     </Text>
                     <div
@@ -109,7 +109,7 @@ const PercentageSelector = ({
                     />
                 </div>
                 <div className='percentage-selector__block-container'>
-                    <Text color='prominent' size='xs' className='percentage-selector__text'>
+                    <Text color={disabled ? 'disabled-1' : 'prominent'} size='xs' className='percentage-selector__text'>
                         {'75%'}
                     </Text>
                     <div
@@ -120,7 +120,7 @@ const PercentageSelector = ({
                     />
                 </div>
                 <div className='percentage-selector__block-container'>
-                    <Text color='prominent' size='xs' className='percentage-selector__text'>
+                    <Text color={disabled ? 'disabled-1' : 'prominent'} size='xs' className='percentage-selector__text'>
                         <Localize i18n_default_text='All' />
                     </Text>
                     <div
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
index 14b1ae41cc34..cca939c28821 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
@@ -16,9 +16,12 @@
         width: 100%;
         margin: 0 auto 2.4rem;
 
+        &.transfer-restriction {
+            margin: 0 auto 1.6rem;
+        }
+
         @include mobile-or-tablet-screen {
             margin: 0 0 1.6rem;
-            width: unset;
         }
 
         &--text {
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
index efe025039daf..239a525dd409 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
@@ -519,7 +519,10 @@ const AccountTransferForm = observer(
                         {localize('Transfer between your accounts in Deriv')}
                     </Text>
                 )}
-                <InlineMessage className='account-transfer-form__inline-message' type='information'>
+                <InlineMessage
+                    className='account-transfer-form__inline-message transfer-restriction'
+                    type='information'
+                >
                     <Text as='span' size='xxxs'>
                         <Localize
                             className='account-transfer-form__inline-message--text'