added CAIP-25 to remove the round-trip required for wallet_getCapabilities

advanced/wallets/react-wallet-v2/src/utils/EIP5792WalletUtil.ts

@@ -0,0 +1,20 @@
+import { eip155Addresses } from './EIP155WalletUtil'
+import { GetCapabilitiesResult, supportedEIP5792CapabilitiesForEOA, supportedEIP5792CapabilitiesForSCA } from '@/data/EIP5792Data'
+
+export function getWalletCapabilities(addresses:string[]){
+  const walletCapabilities:GetCapabilitiesResult = {}
+  addresses.forEach(address => {
+      const namespacesAddress = address.split(':');
+      // address will be the last index element whether
+      // its a simple address or namespace:chainId:address
+      const addr = namespacesAddress[namespacesAddress.length - 1 ] ;
+
+      if(eip155Addresses.includes(addr) && Object.keys(supportedEIP5792CapabilitiesForEOA).length !== 0){
+        walletCapabilities[addr] = supportedEIP5792CapabilitiesForEOA
+      }
+
+      walletCapabilities[addr] = supportedEIP5792CapabilitiesForSCA
+
+  })
+  return walletCapabilities
+}

advanced/wallets/react-wallet-v2/src/views/SessionProposalModal.tsx

@@ -35,6 +35,7 @@ import SettingsStore from '@/store/SettingsStore'
 import usePriorityAccounts from '@/hooks/usePriorityAccounts'
 import useSmartAccounts from '@/hooks/useSmartAccounts'
 import { EIP5792_METHODS } from '@/data/EIP5792Data'
+import { getWalletCapabilities } from '@/utils/EIP5792WalletUtil'
 
 const StyledText = styled(Text, {
   fontWeight: 400
@@ -253,13 +254,17 @@ export default function SessionProposalModal() {
       setIsLoadingApprove(true)
       try {
         if (reorderedEip155Accounts.length > 0) {
-          // we should append the smart accounts to the available eip155 accounts
-          namespaces.eip155.accounts = namespaces.eip155.accounts.concat(reorderedEip155Accounts)
+          // reorderedEip155Accounts includes Smart Accounts(if enabled) and EOA's
+          namespaces.eip155.accounts = reorderedEip155Accounts
         }
-
+        //get capabilities for all reorderedEip155Accounts in wallet
+        const capabilities = getWalletCapabilities(reorderedEip155Accounts)
+        const sessionProperties = { capabilities: JSON.stringify(capabilities) }
+
         await web3wallet.approveSession({
           id: proposal.id,
-          namespaces
+          namespaces,
+          sessionProperties
         })
         SettingsStore.setSessions(Object.values(web3wallet.getActiveSessions()))
       } catch (e) {