Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import React, {
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
useCallback,
useContext,
///: END:ONLY_INCLUDE_IF
} from 'react';
import React, { useCallback, useContext } from 'react';
import { useHistory } from 'react-router-dom';
import {
Box,
Expand Down Expand Up @@ -42,20 +37,20 @@ import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
// eslint-disable-next-line import/no-restricted-paths
import { getEnvironmentType } from '../../../../app/scripts/lib/util';
import {
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
getIsAddSnapAccountEnabled,
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
getIsWatchEthereumAccountEnabled,
///: END:ONLY_INCLUDE_IF
getManageInstitutionalWallets,
} from '../../../selectors';
import { INSTITUTIONAL_WALLET_SNAP_ID } from '../../../../shared/lib/accounts';
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
import {
MetaMetricsEventAccountType,
MetaMetricsEventCategory,
MetaMetricsEventName,
} from '../../../../shared/constants/metametrics';
import { MetaMetricsContext } from '../../../contexts/metametrics';
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
import {
ACCOUNT_WATCHER_NAME,
ACCOUNT_WATCHER_SNAP_ID,
Expand Down Expand Up @@ -88,9 +83,9 @@ export const AddWalletModal: React.FC<AddWalletModalProps> = ({
const institutionalWalletsEnabled = useSelector(
getManageInstitutionalWallets,
);
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
const trackEvent = useContext(MetaMetricsContext);
const addSnapAccountEnabled = useSelector(getIsAddSnapAccountEnabled);
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
const isAddWatchEthereumAccountEnabled = useSelector(
getIsWatchEthereumAccountEnabled,
);
Expand Down Expand Up @@ -144,7 +139,6 @@ export const AddWalletModal: React.FC<AddWalletModalProps> = ({
}
};

///: BEGIN:ONLY_INCLUDE_IF(build-flask)
const handleSnapAccountLinkClick = useCallback(() => {
trackEvent({
category: MetaMetricsEventCategory.Navigation,
Expand All @@ -163,7 +157,6 @@ export const AddWalletModal: React.FC<AddWalletModalProps> = ({
url: process.env.ACCOUNT_SNAPS_DIRECTORY_URL as string,
});
}, [trackEvent]);
///: END:ONLY_INCLUDE_IF

///: BEGIN:ONLY_INCLUDE_IF(build-flask)
const handleAddWatchAccount = useCallback(async () => {
Expand Down Expand Up @@ -238,46 +231,42 @@ export const AddWalletModal: React.FC<AddWalletModalProps> = ({
<Icon name={IconName.ArrowRight} size={IconSize.Sm} />
</Box>
))}
{
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
addSnapAccountEnabled && (
<Box
key="snap-account"
onClick={() => handleSnapAccountLinkClick()}
onKeyDown={(e: React.KeyboardEvent) => {
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault();
handleSnapAccountLinkClick();
}
}}
alignItems={BoxAlignItems.Center}
padding={4}
gap={3}
backgroundColor={BoxBackgroundColor.BackgroundDefault}
flexDirection={BoxFlexDirection.Row}
borderColor={BoxBorderColor.BorderMuted}
className="hover:bg-background-default-hover cursor-pointer transition-all duration-200 w-full text-left outline-none focus:outline-none focus:shadow-none focus-visible:shadow-[inset_0_0_0_2px_var(--color-primary-default)]"
tabIndex={0}
data-testid={`add-wallet-modal-snap-account`}
{addSnapAccountEnabled && (
<Box
key="snap-account"
onClick={() => handleSnapAccountLinkClick()}
onKeyDown={(e: React.KeyboardEvent) => {
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault();
handleSnapAccountLinkClick();
}
}}
alignItems={BoxAlignItems.Center}
padding={4}
gap={3}
backgroundColor={BoxBackgroundColor.BackgroundDefault}
flexDirection={BoxFlexDirection.Row}
borderColor={BoxBorderColor.BorderMuted}
className="hover:bg-background-default-hover cursor-pointer transition-all duration-200 w-full text-left outline-none focus:outline-none focus:shadow-none focus-visible:shadow-[inset_0_0_0_2px_var(--color-primary-default)]"
tabIndex={0}
data-testid={`add-wallet-modal-snap-account`}
>
<Icon
name={IconName.Snaps}
size={IconSize.Md}
color={IconColor.IconAlternative}
/>
<Text
variant={TextVariant.BodyMd}
fontWeight={FontWeight.Medium}
color={TextColor.TextDefault}
className="flex-1"
>
<Icon
name={IconName.Snaps}
size={IconSize.Md}
color={IconColor.IconAlternative}
/>
<Text
variant={TextVariant.BodyMd}
fontWeight={FontWeight.Medium}
color={TextColor.TextDefault}
className="flex-1"
>
{t('settingAddSnapAccount')}
</Text>
<Icon name={IconName.ArrowRight} size={IconSize.Sm} />
</Box>
)
///: END:ONLY_INCLUDE_IF
}
{t('settingAddSnapAccount')}
</Text>
<Icon name={IconName.ArrowRight} size={IconSize.Sm} />
</Box>
)}
{
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
isAddWatchEthereumAccountEnabled && (
Expand Down
Loading