diff --git a/ui/components/multichain/import-tokens-modal/import-tokens-modal.js b/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
index 3eff85e8f266..a9691b1b8ab2 100644
--- a/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
+++ b/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
@@ -518,17 +518,17 @@ export const ImportTokensModal = ({ onClose }) => {
{t('importTokensCamelCase')}
-
- {showSearchTab ? (
-
- {isConfirming ? (
-
- ) : (
+ {isConfirming ? (
+
+ ) : (
+
+ {showSearchTab ? (
+
{useTokenDetection ? null : (
@@ -577,170 +577,170 @@ export const ImportTokensModal = ({ onClose }) => {
onToggleToken={(token) => handleToggleToken(token)}
/>
- )}
-
- ) : null}
-
- {isConfirming ? (
-
- ) : (
-
-
- {tokenDetectionInactiveOnNonMainnetSupportedNetwork ? (
-
-
-
- {t(
- 'customTokenWarningInTokenDetectionNetworkWithTDOFF',
- [
-
- {t('tokenScamSecurityRisk')}
- ,
- {
- onClose();
- history.push(
- `${SECURITY_ROUTE}#auto-detect-tokens`,
- );
- }}
- >
- {t('inYourSettings')}
- ,
- ],
- )}
-
-
-
- ) : (
-
-
-
- {t(
+
+ ) : null}
+
+ {isConfirming ? (
+
+ ) : (
+
+
+ {tokenDetectionInactiveOnNonMainnetSupportedNetwork ? (
+
+
+
+ {t(
+ 'customTokenWarningInTokenDetectionNetworkWithTDOFF',
+ [
+
+ {t('tokenScamSecurityRisk')}
+ ,
+ {
+ onClose();
+ history.push(
+ `${SECURITY_ROUTE}#auto-detect-tokens`,
+ );
+ }}
+ >
+ {t('inYourSettings')}
+ ,
+ ],
+ )}
+
+
+
+ ) : (
+
+
- {t('learnScamRisk')}
- ,
- ],
- )}
-
-
-
- )}
-
-
- handleCustomAddressChange(e.target.value)
- }
- helpText={
- customAddressError ||
- mainnetTokenWarning ||
- nftAddressError
- }
- error={
- customAddressError ||
- mainnetTokenWarning ||
- nftAddressError
- }
- textFieldProps={{
- className:
+ ? Severity.Warning
+ : Severity.Info
+ }
+ data-testid="custom-token-warning"
+ >
+
+ {t(
+ isDynamicTokenListAvailable
+ ? 'customTokenWarningInTokenDetectionNetwork'
+ : 'customTokenWarningInNonTokenDetectionNetwork',
+ [
+
+ {t('learnScamRisk')}
+ ,
+ ],
+ )}
+
+
+
+ )}
+
+
+ handleCustomAddressChange(e.target.value)
+ }
+ helpText={
customAddressError ||
mainnetTokenWarning ||
nftAddressError
- ? 'import-tokens-modal__custom-token-form__text-outline-error'
- : 'import-tokens-modal__custom-token-form__text-outline-success',
- }}
- inputProps={{
- 'data-testid': 'import-tokens-modal-custom-address',
- }}
- />
- {showSymbolAndDecimals && (
-
- {t('tokenSymbol')}>}
- value={customSymbol}
- onChange={(e) =>
- handleCustomSymbolChange(e.target.value)
- }
- helpText={customSymbolError}
- error={customSymbolError}
- textFieldProps={{
- className: customSymbolError
- ? 'import-tokens-modal__custom-token-form__text-outline-error'
- : 'import-tokens-modal__custom-token-form__text-outline-success',
- }}
- inputProps={{
- 'data-testid':
- 'import-tokens-modal-custom-symbol',
- }}
- />
-
- handleCustomDecimalsChange(e.target.value)
- }
- helpText={customDecimalsError}
- error={customDecimalsError}
- disabled={decimalAutoFilled}
- min={MIN_DECIMAL_VALUE}
- max={MAX_DECIMAL_VALUE}
- textFieldProps={{
- className: customDecimalsError
+ }
+ error={
+ customAddressError ||
+ mainnetTokenWarning ||
+ nftAddressError
+ }
+ textFieldProps={{
+ className:
+ customAddressError ||
+ mainnetTokenWarning ||
+ nftAddressError
? 'import-tokens-modal__custom-token-form__text-outline-error'
: 'import-tokens-modal__custom-token-form__text-outline-success',
- }}
- inputProps={{
- 'data-testid':
- 'import-tokens-modal-custom-decimals',
- }}
- />
-
- )}
+ }}
+ inputProps={{
+ 'data-testid': 'import-tokens-modal-custom-address',
+ }}
+ />
+ {showSymbolAndDecimals && (
+
+ {t('tokenSymbol')}>}
+ value={customSymbol}
+ onChange={(e) =>
+ handleCustomSymbolChange(e.target.value)
+ }
+ helpText={customSymbolError}
+ error={customSymbolError}
+ textFieldProps={{
+ className: customSymbolError
+ ? 'import-tokens-modal__custom-token-form__text-outline-error'
+ : 'import-tokens-modal__custom-token-form__text-outline-success',
+ }}
+ inputProps={{
+ 'data-testid':
+ 'import-tokens-modal-custom-symbol',
+ }}
+ />
+
+ handleCustomDecimalsChange(e.target.value)
+ }
+ helpText={customDecimalsError}
+ error={customDecimalsError}
+ disabled={decimalAutoFilled}
+ min={MIN_DECIMAL_VALUE}
+ max={MAX_DECIMAL_VALUE}
+ textFieldProps={{
+ className: customDecimalsError
+ ? 'import-tokens-modal__custom-token-form__text-outline-error'
+ : 'import-tokens-modal__custom-token-form__text-outline-success',
+ }}
+ inputProps={{
+ 'data-testid':
+ 'import-tokens-modal-custom-decimals',
+ }}
+ />
+
+ )}
+
-
- )}
-
-
+ )}
+
+
+ )}
{isConfirming ? (