Skip to content

Commit

Permalink
fix(12527): sdk connection with unknown url causes a bug (#12566)
Browse files Browse the repository at this point in the history
<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
When the user uses SDK to connect to a dapp which does not provide a
URL, unknown URL, this causes a bug.
<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

## **Related issues**

Fixes: #12527

## **Manual testing steps**

1. Go to https://unknown-url.vercel.app/
2. Tap connect
3. choose Metamask Wallet, or scan the QR Code with the MetaMask QR Code
reader


## **Screenshots/Recordings**


<img width="350" alt="Screenshot 2024-04-18s at 3 56 43 PM"
src="https://github.com/user-attachments/assets/34a58eb7-3b65-4d9a-bf9e-5191e4a8fa5d">





<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
  • Loading branch information
EtherWizard33 authored Dec 5, 2024
1 parent 16f3df4 commit 43ae0a1
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions app/components/Views/AccountConnect/AccountConnect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ const AccountConnect = (props: AccountConnectProps) => {
const dappIconUrl = sdkConnection?.originatorInfo?.icon;
const dappUrl = sdkConnection?.originatorInfo?.url ?? '';

const [isSdkUrlUnknown, setIsSdkUrlUnknown] = useState(false);

const { domainTitle, hostname } = useMemo(() => {
let title = '';
let dappHostname = dappUrl || channelIdOrHostname;
Expand All @@ -178,6 +180,7 @@ const AccountConnect = (props: AccountConnectProps) => {
dappHostname = inappBrowserOrigin;
} else {
title = strings('sdk.unknown');
setIsSdkUrlUnknown(true);
}

return { domainTitle: title, hostname: dappHostname };
Expand Down Expand Up @@ -357,7 +360,13 @@ const AccountConnect = (props: AccountConnectProps) => {
.build(),
);
},
[accountsLength, channelIdOrHostname, trackEvent, createEventBuilder, eventSource],
[
accountsLength,
channelIdOrHostname,
trackEvent,
createEventBuilder,
eventSource,
],
);

const navigateToUrlInEthPhishingModal = useCallback(
Expand Down Expand Up @@ -799,7 +808,9 @@ const AccountConnect = (props: AccountConnectProps) => {
const renderConnectScreens = useCallback(() => {
switch (screen) {
case AccountConnectScreens.SingleConnect:
return isMultichainVersion1Enabled
return isSdkUrlUnknown
? renderSingleConnectScreen()
: isMultichainVersion1Enabled
? renderPermissionsSummaryScreen()
: renderSingleConnectScreen();
case AccountConnectScreens.SingleConnectSelector:
Expand All @@ -811,6 +822,7 @@ const AccountConnect = (props: AccountConnectProps) => {
}
}, [
screen,
isSdkUrlUnknown,
renderSingleConnectScreen,
renderPermissionsSummaryScreen,
renderSingleConnectSelectorScreen,
Expand Down

0 comments on commit 43ae0a1

Please sign in to comment.