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: AccountApproval, ACcountRightButton, AddCustomCollectible, AddCustomToken, AddressCopy, BackupAlert useGoToBridge events migration #8657

Merged
merged 1 commit into from
Feb 23, 2024
Merged

feat: AccountApproval, ACcountRightButton, AddCustomCollectible, AddCustomToken, AddressCopy, BackupAlert useGoToBridge events migration #8657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 13 additions & 11 deletions app/components/UI/AccountApproval/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import Text from '../../../component-library/components/Texts/Text';
import NotificationManager from '../../../core/NotificationManager';

import { MetaMetricsEvents } from '../../../core/Analytics';
import AnalyticsV2 from '../../../util/analyticsV2';

import URL from 'url-parse';
import { getAddressAccountType } from '../../../util/address';
Expand All @@ -40,6 +39,7 @@ import ShowWarningBanner from './showWarningBanner';
import { ConnectAccountModalSelectorsIDs } from '../../../../e2e/selectors/Modals/ConnectAccountModal.selectors';
import { CommonSelectorsIDs } from '../../../../e2e/selectors/Common.selectors';
import { getDecimalChainId } from '../../../util/networks';
import { withMetricsAwareness } from '../../../components/hooks/useMetrics';

/**
* Account access approval component
Expand Down Expand Up @@ -87,6 +87,10 @@ class AccountApproval extends PureComponent {
* A string representing the network chainId
*/
chainId: PropTypes.string,
/**
* Metrics injected by withMetricsAwareness HOC
*/
metrics: PropTypes.object,
};

state = {
Expand Down Expand Up @@ -133,12 +137,10 @@ class AccountApproval extends PureComponent {
const { hostname } = new URL(prefixedUrl);
this.checkUrlFlaggedAsPhishing(hostname);

InteractionManager.runAfterInteractions(() => {
AnalyticsV2.trackEvent(
MetaMetricsEvents.CONNECT_REQUEST_STARTED,
this.getAnalyticsParams(),
);
});
this.props.metrics.trackEvent(
MetaMetricsEvents.CONNECT_REQUEST_STARTED,
this.getAnalyticsParams(),
);
};

showWalletConnectNotification = (confirmation = false) => {
Expand Down Expand Up @@ -172,7 +174,7 @@ class AccountApproval extends PureComponent {
// onConfirm will close current window by rejecting current approvalRequest.
this.props.onCancel();

AnalyticsV2.trackEvent(
this.props.metrics.trackEvent(
MetaMetricsEvents.CONNECT_REQUEST_OTPFAILURE,
this.getAnalyticsParams(),
);
Expand All @@ -193,7 +195,7 @@ class AccountApproval extends PureComponent {
}

this.props.onConfirm();
AnalyticsV2.trackEvent(
this.props.metrics.trackEvent(
MetaMetricsEvents.CONNECT_REQUEST_COMPLETED,
this.getAnalyticsParams(),
);
Expand All @@ -204,7 +206,7 @@ class AccountApproval extends PureComponent {
* Calls onConfirm callback and analytics to track connect canceled event
*/
onCancel = () => {
AnalyticsV2.trackEvent(
this.props.metrics.trackEvent(
MetaMetricsEvents.CONNECT_REQUEST_CANCELLED,
this.getAnalyticsParams(),
);
Expand Down Expand Up @@ -381,4 +383,4 @@ const mapStateToProps = (state) => ({

AccountApproval.contextType = ThemeContext;

export default connect(mapStateToProps)(AccountApproval);
export default connect(mapStateToProps)(withMetricsAwareness(AccountApproval));
18 changes: 12 additions & 6 deletions app/components/UI/AccountOverview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import { ThemeContext, mockTheme } from '../../../util/theme';
import EthereumAddress from '../EthereumAddress';
import Identicon from '../Identicon';
import { MetaMetricsEvents } from '../../../core/Analytics';
import Analytics from '../../../core/Analytics/Analytics';
import AppConstants from '../../../core/AppConstants';
import Engine from '../../../core/Engine';
import { selectChainId } from '../../../selectors/networkController';
Expand All @@ -51,6 +50,7 @@ import { regex } from '../../../util/regex';
import Text, {
TextVariant,
} from '../../../component-library/components/Texts/Text';
import { withMetricsAwareness } from '../../../components/hooks/useMetrics';

const createStyles = (colors) =>
StyleSheet.create({
Expand Down Expand Up @@ -207,6 +207,10 @@ class AccountOverview extends PureComponent {
* Current opens tabs in browser
*/
browserTabs: PropTypes.array,
/**
* Metrics injected by withMetricsAwareness HOC
*/
metrics: PropTypes.object,
};

state = {
Expand Down Expand Up @@ -302,9 +306,8 @@ class AccountOverview extends PureComponent {
data: { msg: strings('account_details.account_copied_to_clipboard') },
});
setTimeout(() => this.props.protectWalletModalVisible(), 2000);
InteractionManager.runAfterInteractions(() => {
Analytics.trackEvent(MetaMetricsEvents.WALLET_COPIED_ADDRESS);
});

this.props.metrics.trackEvent(MetaMetricsEvents.WALLET_COPIED_ADDRESS);
};

doENSLookup = async () => {
Expand Down Expand Up @@ -337,7 +340,7 @@ class AccountOverview extends PureComponent {
screen: Routes.BROWSER.VIEW,
params,
});
Analytics.trackEvent(MetaMetricsEvents.PORTFOLIO_LINK_CLICKED, {
this.props.metrics.trackEvent(MetaMetricsEvents.PORTFOLIO_LINK_CLICKED, {
portfolioUrl: AppConstants.PORTFOLIO_URL,
});
};
Expand Down Expand Up @@ -478,4 +481,7 @@ const mapDispatchToProps = (dispatch) => ({

AccountOverview.contextType = ThemeContext;

export default connect(mapStateToProps, mapDispatchToProps)(AccountOverview);
export default connect(
mapStateToProps,
mapDispatchToProps,
)(withMetricsAwareness(AccountOverview));
13 changes: 6 additions & 7 deletions app/components/UI/AccountRightButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import BadgeWrapper from '../../../component-library/components/Badges/BadgeWrap
import { selectProviderConfig } from '../../../selectors/networkController';
import Routes from '../../../constants/navigation/Routes';
import { MetaMetricsEvents } from '../../../core/Analytics';
import Analytics from '../../../core/Analytics/Analytics';
import { AccountOverviewSelectorsIDs } from '../../../../e2e/selectors/AccountOverview.selectors';
import { useMetrics } from '../../../components/hooks/useMetrics';

const styles = StyleSheet.create({
leftButton: {
Expand Down Expand Up @@ -66,6 +66,7 @@ const AccountRightButton = ({
// Placeholder ref for dismissing keyboard. Works when the focused input is within a Webview.
const placeholderInputRef = useRef<TextInput>(null);
const { navigate } = useNavigation();
const { trackEvent } = useMetrics();
const [isKeyboardVisible, setIsKeyboardVisible] = useState<boolean>(false);

const accountAvatarType = useSelector((state: any) =>
Expand Down Expand Up @@ -122,12 +123,9 @@ const AccountRightButton = ({
navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
screen: Routes.SHEET.NETWORK_SELECTOR,
});
Analytics.trackEventWithParameters(
MetaMetricsEvents.NETWORK_SELECTOR_PRESSED,
{
chain_id: providerConfig.chainId,
},
);
trackEvent(MetaMetricsEvents.NETWORK_SELECTOR_PRESSED, {
chain_id: providerConfig.chainId,
});
} else {
onPress?.();
}
Expand All @@ -138,6 +136,7 @@ const AccountRightButton = ({
onPress,
navigate,
providerConfig.chainId,
trackEvent,
]);

const networkName = useMemo(
Expand Down
8 changes: 3 additions & 5 deletions app/components/UI/AddCustomCollectible/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import ActionView from '../ActionView';
import { isSmartContractAddress } from '../../../util/transactions';
import Device from '../../../util/device';
import { MetaMetricsEvents } from '../../../core/Analytics';
import AnalyticsV2 from '../../../util/analyticsV2';

import { useTheme } from '../../../util/theme';
import { CUSTOM_TOKEN_CONTAINER_ID } from '../../../../wdio/screen-objects/testIDs/Screens/AddCustomToken.testIds';
Expand All @@ -30,6 +29,7 @@ import {
import { selectChainId } from '../../../selectors/networkController';
import { selectSelectedAddress } from '../../../selectors/preferencesController';
import { getDecimalChainId } from '../../../util/networks';
import { useMetrics } from '../../../components/hooks/useMetrics';

const createStyles = (colors: any) =>
StyleSheet.create({
Expand Down Expand Up @@ -82,6 +82,7 @@ const AddCustomCollectible = ({
const [loading, setLoading] = useState(false);
const assetTokenIdInput = React.createRef() as any;
const { colors, themeAppearance } = useTheme();
const { trackEvent } = useMetrics();
const styles = createStyles(colors);

const selectedAddress = useSelector(selectSelectedAddress);
Expand Down Expand Up @@ -190,10 +191,7 @@ const AddCustomCollectible = ({
const { NftController } = Engine.context as any;
NftController.addNft(address, tokenId);

AnalyticsV2.trackEvent(
MetaMetricsEvents.COLLECTIBLE_ADDED,
getAnalyticsParams(),
);
trackEvent(MetaMetricsEvents.COLLECTIBLE_ADDED, getAnalyticsParams());
setLoading(false);
navigation.goBack();
};
Expand Down
Loading
Loading