Remove walletUid from pipeWalletServices result (#223)

onflow · Aug 7, 2024 · 919c227 · 919c227
1 parent 0956294
commit 919c227
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/helpers/__tests__/wallets.test.ts b/helpers/__tests__/wallets.test.ts
@@ -19,11 +19,12 @@ describe('wallets helpers', () => {
         uid: `${walletId}#authnpost`,
         endpoint: `http://localhost:8701/api/authn`,
         provider: {},
-        walletUid: walletId,
       },
     ] as ServiceWithWallet[]
 
-    const servicesPipe = jest.fn(() => clone(mockResult))
+    const servicesPipe = jest.fn(() => [
+      { ...mockResult[0], walletUid: walletId },
+    ])
     const makeServicesPipe = jest.fn(() => servicesPipe)
 
     const res = pipeWalletServices(makeServicesPipe)(wallets)
@@ -47,7 +48,7 @@ describe('wallets helpers', () => {
               ...y,
               walletUid: x.uid,
             })),
-          [] as ServiceWithWallet[]
+          [] as ServiceWithWallet[],
         ),
       ],
     ])

diff --git a/helpers/wallets.ts b/helpers/wallets.ts
@@ -12,7 +12,7 @@ export const pipeWalletServices =
     pipe(
       extractWalletServices,
       makeServicesPipe({ wallets }),
-      collectWalletsFromServices({ wallets })
+      collectWalletsFromServices({ wallets }),
     )(wallets)
 
 export const extractWalletServices = (wallets: Wallet[]): ServiceWithWallet[] =>
@@ -21,7 +21,7 @@ export const extractWalletServices = (wallets: Wallet[]): ServiceWithWallet[] =>
       ...wallet.services.map(service => ({
         ...service,
         walletUid: wallet.uid,
-      }))
+      })),
     )
     return acc
   }, [])
@@ -39,21 +39,21 @@ export const walletsForNetwork =
 export const collectWalletsFromServices =
   ({ wallets }: { wallets: Wallet[] }) =>
   (services: ServiceWithWallet[]) =>
-    services.reduce((acc, service) => {
+    services.reduce((acc, _service) => {
+      // Append service without reference to wallet
+      const { walletUid, ...service } = _service
       const existingWalletIdx = acc.findIndex(
-        wallet => wallet.uid === service.walletUid
+        wallet => wallet.uid === walletUid,
       )
 
       if (existingWalletIdx === -1) {
-        const wallet = wallets.find(wallet => wallet.uid === service.walletUid)
+        const wallet = wallets.find(wallet => wallet.uid === walletUid)
         acc.push({
           ...wallet,
           services: [service],
         })
       } else {
-        // Append service without reference to wallet
-        const { walletUid, ...serviceWithoutWallet } = service
-        acc[existingWalletIdx].services.push(serviceWithoutWallet)
+        acc[existingWalletIdx].services.push(service)
       }
       return acc
     }, [])
@@ -79,7 +79,7 @@ export function extractAllServicesWithProvider(wallets: Wallet[]) {
           ...walletToProvider(wallet),
           ...service.provider,
         },
-      }))
+      })),
     )
     return acc
   }, [])