Merge pull request #3072 from tahowallet/completed-abilities

Fetch completed abilities
tahowallet · Mar 10, 2023 · 87db50f · 87db50f
2 parents f240a82 + adebed0
commit 87db50f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/background/lib/daylight.ts b/background/lib/daylight.ts
@@ -60,6 +60,7 @@ export type DaylightAbility = {
   openAt: string | null
   closeAt: string | null
   isClosed: boolean | null
+  walletCompleted: boolean | null
   createdAt: string
   chain: string
   sourceId: string
@@ -95,6 +96,8 @@ export const getDaylightAbilities = async (
   // The limit needs to be set. It is set to the highest value.
   requestURL.searchParams.set("limit", "1000")
   requestURL.searchParams.set("deadline", "all")
+  requestURL.searchParams.set("showCompleted", "true")
+  requestURL.searchParams.set("markAsShown", "true")
 
   try {
     const response: AbilitiesResponse = await fetchJson({

diff --git a/background/redux-slices/abilities.ts b/background/redux-slices/abilities.ts
@@ -64,7 +64,6 @@ const abilitiesSlice = createSlice({
             immerState.abilities[address][ability.abilityId]
           immerState.abilities[address][ability.abilityId] = {
             ...ability,
-            completed: existingAbility.completed,
             removedFromUi: existingAbility.removedFromUi,
           }
         } else {

diff --git a/background/services/abilities/db.ts b/background/services/abilities/db.ts
@@ -27,9 +27,12 @@ export class AbilitiesDatabase extends Dexie {
       id: number
     }
     if (JSON.stringify(correctAbility) !== JSON.stringify(ability)) {
+      const updateCompleted =
+        ability.completed === true && existingAbility.completed === false
+
       await this.abilities.update(existingAbility, {
         ...ability,
-        completed: existingAbility.completed,
+        completed: updateCompleted ? true : existingAbility.completed,
         removedFromUi: existingAbility.removedFromUi,
       })
       return true

diff --git a/background/services/abilities/index.ts b/background/services/abilities/index.ts
@@ -59,7 +59,7 @@ const normalizeDaylightAbilities = (
       imageUrl: daylightAbility.imageUrl || undefined,
       openAt: daylightAbility.openAt || undefined,
       closeAt: daylightAbility.closeAt || undefined,
-      completed: false,
+      completed: daylightAbility.walletCompleted || false,
       removedFromUi: false,
       address: normalizeEVMAddress(address),
       requirement: normalizeDaylightRequirements(