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

Jump to bottom

feat: add custom network modal form #25213

Merged
merged 8 commits into from
Jun 18, 2024
Merged

feat: add custom network modal form #25213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8c5fcdb
feat: add custom network modal
salimtb Jun 14, 2024
4a01a06
feat: add tooltip
salimtb Jun 14, 2024
2db5534
fix: fix PR comments
salimtb Jun 18, 2024
047f870
fix: fix PR comments
salimtb Jun 18, 2024
0a46ff6
fix: fix PR comments
salimtb Jun 18, 2024
b10510e
fix: fix PR comments
salimtb Jun 18, 2024
d05e473
fix: fix unit test
salimtb Jun 18, 2024
2aa6a48
Merge branch 'develop' into add-custom-network-modal-form
bergeron Jun 18, 2024
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
7 changes: 7 additions & 0 deletions app/_locales/en/messages.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

307 changes: 175 additions & 132 deletions ui/components/multichain/network-list-menu/network-list-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,23 @@ import {
getIsUnlocked,
} from '../../../ducks/metamask/metamask';
import { getLocalNetworkMenuRedesignFeatureFlag } from '../../../helpers/utils/feature-flags';
import AddNetworkModal from '../../../pages/onboarding-flow/add-network-modal';
import PopularNetworkList from './popular-network-list/popular-network-list';
import NetworkListSearch from './network-list-search/network-list-search';

const ACTION_MODES = {
// Displays the search box and network list
LIST: 'list',
// Displays the Add form
ADD: 'add',
// Displays the Edit form
EDIT: 'edit',
};

export const NetworkListMenu = ({ onClose }) => {
const t = useI18nContext();

const [actionMode, setActionMode] = useState(ACTION_MODES.LIST);
const nonTestNetworks = useSelector(getNonTestNetworks);
const testNetworks = useSelector(getTestNetworks);
const showTestNetworks = useSelector(getShowTestNetworks);
Expand All @@ -99,6 +110,13 @@ export const NetworkListMenu = ({ onClose }) => {

const isUnlocked = useSelector(getIsUnlocked);

let title = t('networkMenuHeading');
if (actionMode === ACTION_MODES.ADD) {
title = t('addCustomNetwork');
} else if (actionMode === ACTION_MODES.EDIT) {
title = currentNetwork.nickname;
}

const orderedNetworksList = useSelector(getOrderedNetworksList);

const networkConfigurationChainIds = Object.values(networkConfigurations).map(
Expand Down Expand Up @@ -315,6 +333,11 @@ export const NetworkListMenu = ({ onClose }) => {
}
};

const headerAdditionalProps =
actionMode === ACTION_MODES.LIST
? {}
: { onBack: () => setActionMode(ACTION_MODES.LIST) };

return (
<Modal isOpen onClose={onClose}>
<ModalOverlay />
Expand All @@ -332,145 +355,165 @@ export const NetworkListMenu = ({ onClose }) => {
paddingRight={4}
paddingBottom={6}
onClose={onClose}
{...headerAdditionalProps}
>
{t('networkMenuHeading')}
{title}
</ModalHeader>
<>
<NetworkListSearch
searchQuery={searchQuery}
setSearchQuery={setSearchQuery}
setFocusSearch={setFocusSearch}
/>
{showBanner ? (
<BannerBase
className="network-list-menu__banner"
marginLeft={4}
marginRight={4}
marginBottom={4}
backgroundColor={BackgroundColor.backgroundAlternative}
startAccessory={
<Box
display={Display.Flex}
alignItems={AlignItems.center}
justifyContent={JustifyContent.center}
>
<img
src="./images/dragging-animation.svg"
alt="drag-and-drop"
/>
</Box>
}
onClose={() => hideNetworkBanner()}
description={t('dragAndDropBanner')}
{actionMode === ACTION_MODES.LIST ? (
<>
<NetworkListSearch
searchQuery={searchQuery}
setSearchQuery={setSearchQuery}
setFocusSearch={setFocusSearch}
/>
) : null}
<Box className="multichain-network-list-menu">
{searchResults.length === 0 && focusSearch ? (
<Text
paddingLeft={4}
paddingRight={4}
color={TextColor.textMuted}
data-testid="multichain-network-menu-popover-no-results"
>
{t('noNetworksFound')}
</Text>
) : (
<DragDropContext onDragEnd={onDragEnd}>
<Droppable droppableId="characters">
{(provided) => (
<Box
className="characters"
{...provided.droppableProps}
ref={provided.innerRef}
>
{searchResults.map((network, index) => {
const isCurrentNetwork =
currentNetwork.id === network.id;

const canDeleteNetwork =
isUnlocked && !isCurrentNetwork && network.removable;

const networkListItem = generateNetworkListItem({
network,
isCurrentNetwork,
canDeleteNetwork,
});

return (
<Draggable
key={network.id}
draggableId={network.id}
index={index}
>
{(providedDrag) => (
<Box
ref={providedDrag.innerRef}
{...providedDrag.draggableProps}
{...providedDrag.dragHandleProps}
>
{networkListItem}
</Box>
)}
</Draggable>
);
})}
{provided.placeholder}
</Box>
)}
</Droppable>
</DragDropContext>
)}
{networkMenuRedesign ? (
<PopularNetworkList
searchAddNetworkResults={searchAddNetworkResults}
{showBanner ? (
<BannerBase
className="network-list-menu__banner"
marginLeft={4}
marginRight={4}
marginBottom={4}
backgroundColor={BackgroundColor.backgroundAlternative}
startAccessory={
<Box
display={Display.Flex}
alignItems={AlignItems.center}
justifyContent={JustifyContent.center}
>
<img
src="./images/dragging-animation.svg"
alt="drag-and-drop"
/>
</Box>
}
onClose={() => hideNetworkBanner()}
description={t('dragAndDropBanner')}
/>
) : null}
<Box
padding={4}
display={Display.Flex}
justifyContent={JustifyContent.spaceBetween}
>
<Text>{t('showTestnetNetworks')}</Text>
<ToggleButton
value={showTestNetworks}
disabled={currentlyOnTestNetwork}
onToggle={handleToggle}
/>
</Box>
{showTestNetworks || currentlyOnTestNetwork ? (
<Box className="multichain-network-list-menu">
{generateMenuItems(searchTestNetworkResults)}
<Box className="multichain-network-list-menu">
<Box
paddingRight={4}
paddingLeft={4}
paddingBottom={4}
display={Display.Flex}
justifyContent={JustifyContent.spaceBetween}
>
<Text> {t('enabledNetworks')}</Text>
</Box>
) : null}
</Box>
<Box paddingLeft={4} paddingRight={4} paddingTop={4}>
<ButtonSecondary
size={ButtonSecondarySize.Lg}
startIconName={IconName.Add}
block
onClick={() => {
if (isFullScreen) {
if (completedOnboarding) {
history.push(ADD_POPULAR_CUSTOM_NETWORK);
} else {
dispatch(showModal({ name: 'ONBOARDING_ADD_NETWORK' }));
{searchResults.length === 0 && focusSearch ? (
<Text
paddingLeft={4}
paddingRight={4}
color={TextColor.textMuted}
data-testid="multichain-network-menu-popover-no-results"
>
{t('noNetworksFound')}
</Text>
) : (
<DragDropContext onDragEnd={onDragEnd}>
<Droppable droppableId="characters">
{(provided) => (
<Box
className="characters"
{...provided.droppableProps}
ref={provided.innerRef}
>
{searchResults.map((network, index) => {
const isCurrentNetwork =
currentNetwork.id === network.id;

const canDeleteNetwork =
isUnlocked &&
!isCurrentNetwork &&
network.removable;

const networkListItem = generateNetworkListItem({
network,
isCurrentNetwork,
canDeleteNetwork,
});

return (
<Draggable
key={network.id}
draggableId={network.id}
index={index}
>
{(providedDrag) => (
<Box
ref={providedDrag.innerRef}
{...providedDrag.draggableProps}
{...providedDrag.dragHandleProps}
>
{networkListItem}
</Box>
)}
</Draggable>
);
})}
{provided.placeholder}
</Box>
)}
</Droppable>
</DragDropContext>
)}
{networkMenuRedesign ? (
<PopularNetworkList
searchAddNetworkResults={searchAddNetworkResults}
/>
) : null}
<Box
padding={4}
display={Display.Flex}
justifyContent={JustifyContent.spaceBetween}
>
<Text>{t('showTestnetNetworks')}</Text>
<ToggleButton
value={showTestNetworks}
disabled={currentlyOnTestNetwork}
onToggle={handleToggle}
/>
</Box>
{showTestNetworks || currentlyOnTestNetwork ? (
<Box className="multichain-network-list-menu">
{generateMenuItems(searchTestNetworkResults)}
</Box>
) : null}
</Box>
<Box paddingLeft={4} paddingRight={4} paddingTop={4}>
<ButtonSecondary
size={ButtonSecondarySize.Lg}
startIconName={IconName.Add}
block
onClick={() => {
if (!networkMenuRedesign) {
if (isFullScreen) {
if (completedOnboarding) {
history.push(ADD_POPULAR_CUSTOM_NETWORK);
} else {
dispatch(showModal({ name: 'ONBOARDING_ADD_NETWORK' }));
}
} else {
global.platform.openExtensionInBrowser(
ADD_POPULAR_CUSTOM_NETWORK,
);
}
dispatch(toggleNetworkMenu());
return;
}
} else {
global.platform.openExtensionInBrowser(
ADD_POPULAR_CUSTOM_NETWORK,
);
}
dispatch(toggleNetworkMenu());
trackEvent({
event: MetaMetricsEventName.AddNetworkButtonClick,
category: MetaMetricsEventCategory.Network,
});
}}
>
{t('addNetwork')}
</ButtonSecondary>
</Box>
</>
trackEvent({
event: MetaMetricsEventName.AddNetworkButtonClick,
category: MetaMetricsEventCategory.Network,
});
setActionMode(ACTION_MODES.ADD);
}}
>
{t('addNetwork')}
</ButtonSecondary>
</Box>
</>
) : (
<AddNetworkModal showHeader={false} />
)}
</ModalContent>
</Modal>
);
Expand Down
Loading