address feedback

Author: adonesky1

app/scripts/migrations/160.test.ts

@@ -28,7 +28,7 @@ describe(`migration #${version}`, () => {
     expect(newStorage.meta).toStrictEqual({ version });
   });
 
-  it('adds the `endowment:caip25` permission with the current globally selected chainId (and no accounts) permissioned to Snaps with the `endowment:ethereum-provider` permission and which do not already a `endowment:caip25` permission', async () => {
+  it('adds the `endowment:caip25` permission with the current globally selected chainId (and no accounts) permissioned to Snaps with the `endowment:ethereum-provider` permission and which do not already have a `endowment:caip25` permission', async () => {
     const oldStorage = {
       meta: { version: oldVersion },
       data: {

app/scripts/migrations/160.ts

@@ -211,14 +211,10 @@ function transformState(state: Record<string, unknown>) {
     let caip25PermissionCaveatWithCurrentChainIdAndAccountsSet =
       caip25PermissionCaveatWithCurrentChainIdSet;
 
-    if (subject.permissions[Caip25EndowmentPermissionName]) {
-      const existingCaveat = subject.permissions[
-        Caip25EndowmentPermissionName
-      ]?.caveats?.find((caveat) => caveat.type === Caip25CaveatType);
-      if (existingCaveat && existingCaveat.value) {
-        const alreadyPermissionedAccounts = getEthAccounts(
-          existingCaveat.value as Caip25CaveatValue,
-        );
+    const existingCaveat = getExistingCaip25PermissionCaveat(subject);
+    if (existingCaveat) {
+      const alreadyPermissionedAccounts = getEthAccounts(existingCaveat);
+      if (alreadyPermissionedAccounts) {
         caip25PermissionCaveatWithCurrentChainIdAndAccountsSet = setEthAccounts(
           caip25PermissionCaveatWithCurrentChainIdSet,
           alreadyPermissionedAccounts,