Skip to content
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

Fix #20934 - Show network icon in New Network popover #21016

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Fix #20934 - Show network icon in New Network popover #21016

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
343633d
Fix #20934 - Show network icon in New Network popover
darkwing Sep 22, 2023
af1a57c
changed from a Chip to a PickerNetwork and centered
HowardBraham Sep 25, 2023
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
69 changes: 23 additions & 46 deletions ui/components/ui/new-network-info/new-network-info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React, { useContext, useEffect, useState, useCallback } from 'react';
import React, { useCallback, useContext, useEffect, useState } from 'react';
import { useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import { TOKEN_API_METASWAP_CODEFI_URL } from '../../../../shared/constants/tokens';
import fetchWithCache from '../../../../shared/lib/fetch-with-cache';
import { I18nContext } from '../../../contexts/i18n';
import Popover from '../popover';
import Button from '../button';
import Identicon from '../identicon';
import Box from '../box';
import { getProviderConfig } from '../../../ducks/metamask/metamask';
import {
AlignItems,
Color,
Expand All @@ -14,29 +13,23 @@ import {
TextAlign,
TextVariant,
} from '../../../helpers/constants/design-system';
import { TOKEN_API_METASWAP_CODEFI_URL } from '../../../../shared/constants/tokens';
import fetchWithCache from '../../../../shared/lib/fetch-with-cache';
import {
getNativeCurrencyImage,
getUseTokenDetection,
} from '../../../selectors';
import { getProviderConfig } from '../../../ducks/metamask/metamask';
import { IMPORT_TOKEN_ROUTE } from '../../../helpers/constants/routes';
import Chip from '../chip/chip';
import { getCurrentNetwork, getUseTokenDetection } from '../../../selectors';
import { setFirstTimeUsedNetwork } from '../../../store/actions';
import { NETWORK_TYPES } from '../../../../shared/constants/network';
import { Icon, IconName, Text } from '../../component-library';
import { getNetworkLabelKey } from '../../../helpers/utils/i18n-helper';
import { PickerNetwork, Text } from '../../component-library';
import Box from '../box';
import Button from '../button';
import Popover from '../popover';

const NewNetworkInfo = () => {
export default function NewNetworkInfo() {
const t = useContext(I18nContext);
const history = useHistory();
const [tokenDetectionSupported, setTokenDetectionSupported] = useState(false);
const [showPopup, setShowPopup] = useState(true);
const [isLoading, setIsLoading] = useState(true);
const autoDetectToken = useSelector(getUseTokenDetection);
const primaryTokenImage = useSelector(getNativeCurrencyImage);
const providerConfig = useSelector(getProviderConfig);
const currentNetwork = useSelector(getCurrentNetwork);

const onCloseClick = () => {
setShowPopup(false);
Expand Down Expand Up @@ -95,29 +88,15 @@ const NewNetworkInfo = () => {
>
{t('switchedTo')}
</Text>
<Chip
className="new-network-info__token-box"
backgroundColor={Color.backgroundAlternative}
maxContent={false}
label={
providerConfig.type === NETWORK_TYPES.RPC
? providerConfig.nickname ?? t('privateNetwork')
: t(getNetworkLabelKey(providerConfig.type))
}
labelProps={{
color: Color.textDefault,
}}
leftIcon={
primaryTokenImage ? (
<Identicon image={primaryTokenImage} diameter={14} />
) : (
<Icon
className="question"
name={IconName.Question}
color={Color.iconDefault}
/>
)
}
<PickerNetwork
label={currentNetwork?.nickname}
src={currentNetwork?.rpcPrefs?.imageUrl}
marginLeft="auto"
marginRight="auto"
marginTop={4}
marginBottom={4}
iconProps={{ display: 'none' }} // do not show the dropdown icon
as="div" // do not render as a button
/>
<Text
variant={TextVariant.bodySmBold}
Expand All @@ -129,7 +108,7 @@ const NewNetworkInfo = () => {
{t('thingsToKeep')}
</Text>
<Box marginRight={4} marginLeft={5} marginTop={6}>
{providerConfig.ticker ? (
{providerConfig.ticker && (
<Box
display={Display.Flex}
alignItems={AlignItems.center}
Expand Down Expand Up @@ -160,7 +139,7 @@ const NewNetworkInfo = () => {
])}
</Text>
</Box>
) : null}
)}
<Box
display={Display.Flex}
alignItems={AlignItems.center}
Expand Down Expand Up @@ -241,6 +220,4 @@ const NewNetworkInfo = () => {
</Popover>
)
);
};

export default NewNetworkInfo;
}
Loading