Merge branch 'master' into staging

decentraland · Sep 23, 2021 · 823cbd3 · 823cbd3
2 parents f66d73a + f1ccf55
commit 823cbd3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/lib/api/builder.ts b/src/lib/api/builder.ts
@@ -571,9 +571,14 @@ export class BuilderAPI extends BaseAPI {
     }
   }
 
-  async fetchAssetPacks() {
-    const remotePacks: RemoteAssetPack[] = await this.request('get', `/assetPacks`)
-    return remotePacks.map(fromRemoteAssetPack)
+  async fetchAssetPacks(address?: string): Promise<FullAssetPack[]> {
+    const promisesOfRemoteAssetPacks: Array<Promise<RemoteAssetPack[]>> = [this.request('get', '/assetPacks?owner=default')]
+    if (address) {
+      promisesOfRemoteAssetPacks.push(this.request('get', `/assetPacks?owner=${address}`))
+    }
+
+    const assetPacks: RemoteAssetPack[][] = await Promise.all(promisesOfRemoteAssetPacks)
+    return assetPacks.reduce((acc, curr) => acc.concat(curr), []).map(fromRemoteAssetPack)
   }
 
   async deleteAssetPack(assetPack: FullAssetPack) {

diff --git a/src/modules/assetPack/sagas.ts b/src/modules/assetPack/sagas.ts
@@ -1,5 +1,6 @@
 import { call, put, takeLatest, all, select } from 'redux-saga/effects'
 
+import { getData as getWallet } from 'decentraland-dapps/dist/modules/wallet/selectors'
 import {
   LOAD_ASSET_PACKS_REQUEST,
   loadAssetPacksSuccess,
@@ -44,7 +45,8 @@ export function* assetPackSaga(builder: BuilderAPI) {
 
   function* handleLoadAssetPacks(_: LoadAssetPacksRequestAction) {
     try {
-      const assetPacks: FullAssetPack[] = yield call(() => builder.fetchAssetPacks())
+      const wallet: ReturnType<typeof getWallet> = yield select(getWallet)
+      const assetPacks: FullAssetPack[] = yield call([builder, 'fetchAssetPacks'], wallet?.address)
       yield put(loadAssetPacksSuccess(assetPacks))
     } catch (error) {
       yield put(loadAssetPacksFailure(error.message))