Skip to content

fix: remove segmented tab on confirm import modal #29720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 3, 2025
Merged

fix: remove segmented tab on confirm import modal #29720

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9689292
fix: :lipstick: remove segmented tab on confirm import modal
matteoscurati Jan 15, 2025
230a786
Merge branch 'main' into fix/remove-segmented-tab-on-confirm-import-t…
matteoscurati Jan 27, 2025
16f0679
Merge branch 'main' into fix/remove-segmented-tab-on-confirm-import-t…
matteoscurati Jan 27, 2025
6163542
test: :white_check_mark: fix test
matteoscurati Jan 27, 2025
4711875
Merge branch 'fix/remove-segmented-tab-on-confirm-import-token-page' …
matteoscurati Jan 27, 2025
9fa78c5
Merge branch 'main' into fix/remove-segmented-tab-on-confirm-import-t…
matteoscurati Jan 29, 2025
f3ac77b
Merge branch 'main' into fix/remove-segmented-tab-on-confirm-import-t…
matteoscurati Jan 30, 2025
9eb8ca5
Merge branch 'main' into fix/remove-segmented-tab-on-confirm-import-t…
darkwing Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
334 changes: 167 additions & 167 deletions ui/components/multichain/import-tokens-modal/import-tokens-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,17 +518,17 @@ export const ImportTokensModal = ({ onClose }) => {
{t('importTokensCamelCase')}
</ModalHeader>
<Box className="import-tokens-modal__body">
<Tabs t={t} tabsClassName="import-tokens-modal__tabs">
{showSearchTab ? (
<Tab
activeClassName="import-tokens-modal__active-tab"
buttonClassName="import-tokens-modal__button-tab"
tabKey="search"
name={t('search')}
>
{isConfirming ? (
<ImportTokensModalConfirm />
) : (
{isConfirming ? (
<ImportTokensModalConfirm />
) : (
<Tabs t={t} tabsClassName="import-tokens-modal__tabs">
{showSearchTab ? (
<Tab
activeClassName="import-tokens-modal__active-tab"
buttonClassName="import-tokens-modal__button-tab"
tabKey="search"
name={t('search')}
>
<Box paddingTop={4}>
{useTokenDetection ? null : (
<Box paddingLeft={4} paddingRight={4}>
Expand Down Expand Up @@ -577,170 +577,170 @@ export const ImportTokensModal = ({ onClose }) => {
onToggleToken={(token) => handleToggleToken(token)}
/>
</Box>
)}
</Tab>
) : null}
<Tab
activeClassName="import-tokens-modal__active-tab"
buttonClassName="import-tokens-modal__button-tab"
tabKey="customToken"
name={t('customToken')}
>
{isConfirming ? (
<ImportTokensModalConfirm />
) : (
<Box paddingTop={4}>
<Box className="import-tokens-modal__custom-token-form__container">
{tokenDetectionInactiveOnNonMainnetSupportedNetwork ? (
<Box paddingLeft={4} paddingRight={4}>
<BannerAlert severity={Severity.Warning}>
<Text variant={TextVariant.bodyMd}>
{t(
'customTokenWarningInTokenDetectionNetworkWithTDOFF',
[
<ButtonLink
key="import-token-security-risk"
rel="noopener noreferrer"
target="_blank"
href={ZENDESK_URLS.TOKEN_SAFETY_PRACTICES}
>
{t('tokenScamSecurityRisk')}
</ButtonLink>,
<ButtonLink
type="link"
key="import-token-token-detection-announcement"
onClick={() => {
onClose();
history.push(
`${SECURITY_ROUTE}#auto-detect-tokens`,
);
}}
>
{t('inYourSettings')}
</ButtonLink>,
],
)}
</Text>
</BannerAlert>
</Box>
) : (
<Box paddingLeft={4} paddingRight={4}>
<BannerAlert
severity={
isDynamicTokenListAvailable
? Severity.Warning
: Severity.Info
}
data-testid="custom-token-warning"
>
<Text variant={TextVariant.bodyMd}>
{t(
</Tab>
) : null}
<Tab
activeClassName="import-tokens-modal__active-tab"
buttonClassName="import-tokens-modal__button-tab"
tabKey="customToken"
name={t('customToken')}
>
{isConfirming ? (
<ImportTokensModalConfirm />
) : (
<Box paddingTop={4}>
<Box className="import-tokens-modal__custom-token-form__container">
{tokenDetectionInactiveOnNonMainnetSupportedNetwork ? (
<Box paddingLeft={4} paddingRight={4}>
<BannerAlert severity={Severity.Warning}>
<Text variant={TextVariant.bodyMd}>
{t(
'customTokenWarningInTokenDetectionNetworkWithTDOFF',
[
<ButtonLink
key="import-token-security-risk"
rel="noopener noreferrer"
target="_blank"
href={ZENDESK_URLS.TOKEN_SAFETY_PRACTICES}
>
{t('tokenScamSecurityRisk')}
</ButtonLink>,
<ButtonLink
type="link"
key="import-token-token-detection-announcement"
onClick={() => {
onClose();
history.push(
`${SECURITY_ROUTE}#auto-detect-tokens`,
);
}}
>
{t('inYourSettings')}
</ButtonLink>,
],
)}
</Text>
</BannerAlert>
</Box>
) : (
<Box paddingLeft={4} paddingRight={4}>
<BannerAlert
severity={
isDynamicTokenListAvailable
? 'customTokenWarningInTokenDetectionNetwork'
: 'customTokenWarningInNonTokenDetectionNetwork',
[
<ButtonLink
key="import-token-fake-token-warning"
rel="noopener noreferrer"
target="_blank"
href={ZENDESK_URLS.TOKEN_SAFETY_PRACTICES}
>
{t('learnScamRisk')}
</ButtonLink>,
],
)}
</Text>
</BannerAlert>
</Box>
)}
<Box>
<FormTextField
paddingLeft={4}
paddingRight={4}
paddingTop={6}
label={t('tokenContractAddress')}
value={customAddress}
onChange={(e) =>
handleCustomAddressChange(e.target.value)
}
helpText={
customAddressError ||
mainnetTokenWarning ||
nftAddressError
}
error={
customAddressError ||
mainnetTokenWarning ||
nftAddressError
}
textFieldProps={{
className:
? Severity.Warning
: Severity.Info
}
data-testid="custom-token-warning"
>
<Text variant={TextVariant.bodyMd}>
{t(
isDynamicTokenListAvailable
? 'customTokenWarningInTokenDetectionNetwork'
: 'customTokenWarningInNonTokenDetectionNetwork',
[
<ButtonLink
key="import-token-fake-token-warning"
rel="noopener noreferrer"
target="_blank"
href={ZENDESK_URLS.TOKEN_SAFETY_PRACTICES}
>
{t('learnScamRisk')}
</ButtonLink>,
],
)}
</Text>
</BannerAlert>
</Box>
)}
<Box>
<FormTextField
paddingLeft={4}
paddingRight={4}
paddingTop={6}
label={t('tokenContractAddress')}
value={customAddress}
onChange={(e) =>
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 && (
<Box>
<FormTextField
paddingLeft={4}
paddingRight={4}
paddingTop={4}
label={<>{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',
}}
/>
<FormTextField
paddingLeft={4}
paddingRight={4}
paddingTop={4}
label={t('decimal')}
type="number"
value={customDecimals}
onChange={(e) =>
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',
}}
/>
</Box>
)}
}}
inputProps={{
'data-testid': 'import-tokens-modal-custom-address',
}}
/>
{showSymbolAndDecimals && (
<Box>
<FormTextField
paddingLeft={4}
paddingRight={4}
paddingTop={4}
label={<>{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',
}}
/>
<FormTextField
paddingLeft={4}
paddingRight={4}
paddingTop={4}
label={t('decimal')}
type="number"
value={customDecimals}
onChange={(e) =>
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',
}}
/>
</Box>
)}
</Box>
</Box>
</Box>
</Box>
)}
</Tab>
</Tabs>
)}
</Tab>
</Tabs>
)}
</Box>
{isConfirming ? (
<Box
Expand Down
Loading