Skip to content

fix: 'Connection Request Complete' analytics event not firing #19042

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

Merged
merged 1 commit into from
Sep 3, 2025
+10 −2
Merged

fix: 'Connection Request Complete' analytics event not firing #19042

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
12 changes: 10 additions & 2 deletions app/util/address/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import {
import {
getChecksumAddress,
type Hex,
isCaipAccountId,
isHexString,
isStrictHexString,
parseCaipAccountId,
} from '@metamask/utils';
import punycode from 'punycode/punycode';
import ExtendedKeyringTypes from '../../constants/keyringTypes';
Expand Down Expand Up @@ -422,17 +424,22 @@ export function getLabelTextByAddress(address: string) {
* @returns {String} - Returns address's account type
*/
export function getAddressAccountType(address: string) {
if (!isValidHexAddress(address)) {
if (!isValidHexAddress(address) && !isCaipAccountId(address)) {
throw new Error(`Invalid address: ${address}`);
}

const parsedAddress = isCaipAccountId(address)
? parseCaipAccountId(address).address
: address;

const { KeyringController } = Engine.context;
const { keyrings } = KeyringController.state;
const targetKeyring = keyrings.find((keyring) =>
keyring.accounts
.map((account) => toFormattedAddress(account))
.includes(toFormattedAddress(address)),
.includes(toFormattedAddress(parsedAddress)),
);

if (targetKeyring) {
switch (targetKeyring.type) {
case ExtendedKeyringTypes.qr:
Expand Down Expand Up @@ -530,6 +537,7 @@ export function isValidHexAddress(
const addressToCheck = allowNonPrefixed
? addHexPrefix(possibleAddress)
: possibleAddress;

if (!isHexString(addressToCheck)) {
return false;
}
Expand Down
Loading