= ({
)}
- {errorMessage && isInvalid && (
+ {errorMessage && (
)}
>
diff --git a/packages/wallets/src/components/Base/WalletTextField/__tests__/WalletTextField.spec.tsx b/packages/wallets/src/components/Base/WalletTextField/__tests__/WalletTextField.spec.tsx
index c5b4f2685f18..9c726cfd57cd 100644
--- a/packages/wallets/src/components/Base/WalletTextField/__tests__/WalletTextField.spec.tsx
+++ b/packages/wallets/src/components/Base/WalletTextField/__tests__/WalletTextField.spec.tsx
@@ -91,4 +91,19 @@ describe('WalletTextField', () => {
expect(helperMessageProps.message).toBe('Invalid input');
expect(helperMessageProps.messageVariant).toBe('error');
});
+
+ it('should render with a warning message correctly', () => {
+ render();
+
+ expect(HelperMessage).toHaveBeenCalled();
+ const helperMessageProps = (HelperMessage as jest.Mock).mock.calls[
+ (HelperMessage as jest.Mock).mock.calls.length - 1
+ ][0];
+
+ expect(helperMessageProps.inputValue).toBe('');
+ expect(helperMessageProps.isError).toBe(false);
+ expect(helperMessageProps.maxLength).toBe(undefined);
+ expect(helperMessageProps.message).toBe('This is very common password');
+ expect(helperMessageProps.messageVariant).toBe('warning');
+ });
});
diff --git a/packages/wallets/src/features/cashier/modules/Transfer/components/TransferFormAccountSelection/TransferFormAccountSelection.scss b/packages/wallets/src/features/cashier/modules/Transfer/components/TransferFormAccountSelection/TransferFormAccountSelection.scss
index 1db2a8fc890f..802f8885097a 100644
--- a/packages/wallets/src/features/cashier/modules/Transfer/components/TransferFormAccountSelection/TransferFormAccountSelection.scss
+++ b/packages/wallets/src/features/cashier/modules/Transfer/components/TransferFormAccountSelection/TransferFormAccountSelection.scss
@@ -30,7 +30,6 @@
overflow-y: auto;
@include mobile {
- margin-top: 6rem;
padding: 0 1.6rem 1.6rem;
gap: 1.6rem;
overflow-y: unset;
@@ -88,7 +87,8 @@
border-bottom: 2px solid var(--system-light-7-secondary-background, #f2f3f4);
@include mobile {
- position: fixed;
+ position: sticky;
+ top: -2.4rem;
left: 0;
right: 0;
border: none;
diff --git a/packages/wallets/src/features/cashier/modules/Transfer/hooks/useTransferMessages/useTransferMessages.ts b/packages/wallets/src/features/cashier/modules/Transfer/hooks/useTransferMessages/useTransferMessages.ts
index 877ba8d0020f..91a269de3cda 100644
--- a/packages/wallets/src/features/cashier/modules/Transfer/hooks/useTransferMessages/useTransferMessages.ts
+++ b/packages/wallets/src/features/cashier/modules/Transfer/hooks/useTransferMessages/useTransferMessages.ts
@@ -57,11 +57,13 @@ const useTransferMessages = ({
messageFns.push(insufficientBalanceMessageFn);
+ if (!isAccountVerified && isTransferBetweenWallets) {
+ messageFns.push(lifetimeAccountLimitsBetweenWalletsMessageFn);
+ }
if (isAccountVerified || (!isAccountVerified && !isTransferBetweenWallets)) {
messageFns.push(cumulativeAccountLimitsMessageFn);
}
- if (!isAccountVerified && isTransferBetweenWallets) {
- messageFns.push(lifetimeAccountLimitsBetweenWalletsMessageFn);
+ if (isTransferBetweenWallets) {
messageFns.push(transferFeesBetweenWalletsMessageFn);
}
diff --git a/packages/wallets/src/features/cashier/modules/Transfer/hooks/useTransferMessages/utils/cumulativeAccountLimitsMessageFn.ts b/packages/wallets/src/features/cashier/modules/Transfer/hooks/useTransferMessages/utils/cumulativeAccountLimitsMessageFn.ts
index 17f0170474ae..833ea8ac38dc 100644
--- a/packages/wallets/src/features/cashier/modules/Transfer/hooks/useTransferMessages/utils/cumulativeAccountLimitsMessageFn.ts
+++ b/packages/wallets/src/features/cashier/modules/Transfer/hooks/useTransferMessages/utils/cumulativeAccountLimitsMessageFn.ts
@@ -19,7 +19,7 @@ const cumulativeAccountLimitsMessageFn = ({
const isDemoTransfer = activeWallet?.is_virtual;
const keyAccountType =
- [sourceAccount, targetAccount].find(acc => acc.account_category !== 'wallet')?.account_type ?? 'wallets';
+ [sourceAccount, targetAccount].find(acc => acc.account_category !== 'wallet')?.account_type ?? 'internal';
const platformKey = keyAccountType === 'standard' ? 'dtrade' : keyAccountType;