diff --git a/src/contexts/walletConnect/WalletConnectSessionProposalModal.tsx b/src/contexts/walletConnect/WalletConnectSessionProposalModal.tsx index bbce3677..e253453e 100644 --- a/src/contexts/walletConnect/WalletConnectSessionProposalModal.tsx +++ b/src/contexts/walletConnect/WalletConnectSessionProposalModal.tsx @@ -69,7 +69,8 @@ const WalletConnectSessionProposalModal = ({ const dispatch = useAppDispatch() const walletMnemonic = useAppSelector((s) => s.wallet.mnemonic) const { requiredChainInfo, metadata } = parseSessionProposalEvent(proposalEvent) - const addressesInGroup = useAppSelector((s) => selectAddressesInGroup(s, requiredChainInfo?.addressGroup)) + const group = requiredChainInfo?.addressGroup + const addressesInGroup = useAppSelector((s) => selectAddressesInGroup(s, group)) const currentAddressIndexes = useRef(addresses.map(({ index }) => index)) const persistAddressSettings = usePersistAddressSettings() @@ -99,12 +100,7 @@ const WalletConnectSessionProposalModal = ({ setLoading('Generating new address...') const { masterKey } = await walletImportAsyncUnsafe(mnemonicToSeed, walletMnemonic) - const newAddressData = deriveNewAddressData( - masterKey, - requiredChainInfo?.addressGroup, - undefined, - currentAddressIndexes.current - ) + const newAddressData = deriveNewAddressData(masterKey, group, undefined, currentAddressIndexes.current) const newAddress = { ...newAddressData, settings: { label: '', color: getRandomLabelColor(), isDefault: false } } try { @@ -164,7 +160,7 @@ const WalletConnectSessionProposalModal = ({ The dApp asks for an address in group - {requiredChainInfo?.addressGroup}. Click below to generate one! + {group}. Click below to generate one! @@ -179,10 +175,10 @@ const WalletConnectSessionProposalModal = ({ <> {showAlternativeSignerAddresses ? ( - Addresses in group {requiredChainInfo?.addressGroup} + Addresses{group !== undefined ? ` in group ${group}` : ''} Tap to select another one - {addressesInGroup.map((address, index) => ( + {addressesInGroup.map((address) => ( Connect with address Tap to change the address to connect with. - setShowAlternativeSignerAddresses(true)} /> + setShowAlternativeSignerAddresses(true)} + isSelected + /> )}