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

fix: approve deeplink displays domain pill with selected address #7601

Merged
merged 4 commits into from
Nov 6, 2023
Merged

fix: approve deeplink displays domain pill with selected address #7601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e3e120
hide origin pill for origin is deeplink
blackdevelopa Oct 25, 2023
b269920
update snapshot
blackdevelopa Oct 25, 2023
06c1c9a
rebased to main
blackdevelopa Nov 2, 2023
260e939
Merge branch 'main' into 7545/domain_pill_deeplink
blackdevelopa Nov 6, 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
2 changes: 2 additions & 0 deletions app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
import AppConstants from '../../../core/AppConstants';
export const { ORIGIN_DEEPLINK, ORIGIN_QR_CODE } = AppConstants.DEEPLINKS;
export const APPROVE_TRANSACTION_ORIGIN_PILL =
'approve_transaction_origin_pill';
20 changes: 20 additions & 0 deletions app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React from 'react';
import renderWithProvider from '../../../util/test/renderWithProvider';
import ApproveTransactionHeader from './';
import initialBackgroundState from '../../../util/test/initial-background-state.json';
import { APPROVE_TRANSACTION_ORIGIN_PILL } from './ApproveTransactionHeader.constants';

jest.mock('../../../core/Engine', () => ({
context: {
Expand Down Expand Up @@ -128,4 +129,23 @@ describe('ApproveTransactionHeader', () => {
);
expect(container).toMatchSnapshot();
});

it('should not show an origin pill if origin is deeplink', () => {
const { queryByTestId } = renderWithProvider(
<ApproveTransactionHeader
from="0x0"
origin="qr-code"
url="http://metamask.github.io"
asset={{
address: '0x0',
symbol: 'RAN',
decimals: 18,
}}
/>,
{ state: mockInitialState },
);

const originPill = queryByTestId(APPROVE_TRANSACTION_ORIGIN_PILL);
expect(originPill).toBeNull();
});
});
43 changes: 24 additions & 19 deletions app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useStyles } from '../../../component-library/hooks';
import { selectProviderConfig } from '../../../selectors/networkController';
import { selectAccounts } from '../../../selectors/accountTrackerController';
import { selectIdentities } from '../../../selectors/preferencesController';
import { renderAccountName, renderShortAddress } from '../../../util/address';
import { renderAccountName } from '../../../util/address';
import { getUrlObj, prefixUrlWithProtocol } from '../../../util/browser';
import {
getNetworkImageSource,
Expand All @@ -23,6 +23,7 @@ import useAddressBalance from '../../hooks/useAddressBalance/useAddressBalance';
import {
ORIGIN_DEEPLINK,
ORIGIN_QR_CODE,
APPROVE_TRANSACTION_ORIGIN_PILL,
} from './ApproveTransactionHeader.constants';
import stylesheet from './ApproveTransactionHeader.styles';
import { ApproveTransactionHeaderI } from './ApproveTransactionHeader.types';
Expand Down Expand Up @@ -64,16 +65,21 @@ const ApproveTransactionHeader = ({

const isOriginDeepLinkVal =
origin === ORIGIN_DEEPLINK || origin === ORIGIN_QR_CODE;
const isOriginWalletConnectVal = origin?.startsWith(WALLET_CONNECT_ORIGIN);

const isOriginMMSDKRemoteConnVal = origin?.startsWith(
AppConstants.MM_SDK.SDK_REMOTE_ORIGIN,
);

setAccountName(accountNameVal);
setIsOriginDeepLink(isOriginDeepLinkVal);
setIsOriginWalletConnect(isOriginWalletConnectVal);
setIsOriginMMSDKRemoteConn(isOriginMMSDKRemoteConnVal);

if (!origin) {
setIsOriginWalletConnect(false);
setIsOriginMMSDKRemoteConn(false);

return;
}

setIsOriginWalletConnect(origin.startsWith(WALLET_CONNECT_ORIGIN));
setIsOriginMMSDKRemoteConn(
origin.startsWith(AppConstants.MM_SDK.SDK_REMOTE_ORIGIN),
);
}, [accounts, identities, activeAddress, origin]);

const networkImage = getNetworkImageSource({
Expand All @@ -83,13 +89,13 @@ const ApproveTransactionHeader = ({

const domainTitle = useMemo(() => {
let title = '';
if (isOriginDeepLink) {
title = renderShortAddress(from);
} else if (isOriginWalletConnect) {
title = getUrlObj(origin.split(WALLET_CONNECT_ORIGIN)[1]).origin;
if (isOriginWalletConnect) {
title = getUrlObj(
(origin as string).split(WALLET_CONNECT_ORIGIN)[1],
).origin;
} else if (isOriginMMSDKRemoteConn) {
title = getUrlObj(
origin.split(AppConstants.MM_SDK.SDK_REMOTE_ORIGIN)[1],
(origin as string).split(AppConstants.MM_SDK.SDK_REMOTE_ORIGIN)[1],
).origin;
} else {
title = prefixUrlWithProtocol(currentEnsName || origin || url);
Expand All @@ -99,19 +105,17 @@ const ApproveTransactionHeader = ({
}, [
currentEnsName,
origin,
isOriginDeepLink,
isOriginWalletConnect,
isOriginMMSDKRemoteConn,
from,
url,
]);

const faviconUpdatedOrigin = useMemo(() => {
let newOrigin = origin;
let newOrigin = origin as string;
if (isOriginWalletConnect) {
newOrigin = origin.split(WALLET_CONNECT_ORIGIN)[1];
newOrigin = newOrigin.split(WALLET_CONNECT_ORIGIN)[1];
} else if (isOriginMMSDKRemoteConn) {
newOrigin = origin.split(AppConstants.MM_SDK.SDK_REMOTE_ORIGIN)[1];
newOrigin = newOrigin.split(AppConstants.MM_SDK.SDK_REMOTE_ORIGIN)[1];
}
return newOrigin;
}, [origin, isOriginWalletConnect, isOriginMMSDKRemoteConn]);
Expand All @@ -120,8 +124,9 @@ const ApproveTransactionHeader = ({

return (
<View style={styles.transactionHeader}>
{origin ? (
{origin && !isOriginDeepLink ? (
<TagUrl
testID={APPROVE_TRANSACTION_ORIGIN_PILL}
imageSource={faviconSource}
label={domainTitle}
style={styles.tagUrl}
Expand Down
1 change: 1 addition & 0 deletions ...mponents/UI/ApproveTransactionHeader/__snapshots__/ApproveTransactionHeader.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ exports[`ApproveTransactionHeader should render correctly 1`] = `
"paddingVertical": 8,
}
}
testID="approve_transaction_origin_pill"
>
<View
style={
Expand Down
Loading