From cd26d0edf3cd654055bf263fe1bf25b9681ca447 Mon Sep 17 00:00:00 2001
From: Miodec <bartnikjack@gmail.com>
Date: Sat, 3 Sep 2022 15:08:38 +0200
Subject: [PATCH] claiming badges adding xp after alerts panel was closed

---
 .../src/ts/controllers/badge-controller.ts    |  4 ++
 frontend/src/ts/db.ts                         | 11 ++++++
 frontend/src/ts/elements/alerts.ts            | 39 ++++++++++++-------
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/frontend/src/ts/controllers/badge-controller.ts b/frontend/src/ts/controllers/badge-controller.ts
index 46b1ed59e..26d472a9e 100644
--- a/frontend/src/ts/controllers/badge-controller.ts
+++ b/frontend/src/ts/controllers/badge-controller.ts
@@ -120,3 +120,7 @@ export function getHTMLById(
     badge.icon ? `<i class="fas ${badge.icon}"></i>` : ""
   }${noText ? "" : `<div class="text">${badge.name}</div>`}</div>`;
 }
+
+export function getById(id: number): MonkeyTypes.UserBadge {
+  return badges[id];
+}
diff --git a/frontend/src/ts/db.ts b/frontend/src/ts/db.ts
index f18c26263..21f5089a0 100644
--- a/frontend/src/ts/db.ts
+++ b/frontend/src/ts/db.ts
@@ -815,6 +815,17 @@ export function addXp(xp: number): void {
   setSnapshot(snapshot);
 }
 
+export function addBadge(badge: MonkeyTypes.Badge): void {
+  const snapshot = getSnapshot();
+  if (snapshot.inventory === undefined) {
+    snapshot.inventory = {
+      badges: [],
+    };
+  }
+  snapshot.inventory.badges.push(badge);
+  setSnapshot(snapshot);
+}
+
 // export async function DB.getLocalTagPB(tagId) {
 //   function cont() {
 //     let ret = 0;
diff --git a/frontend/src/ts/elements/alerts.ts b/frontend/src/ts/elements/alerts.ts
index ca833d4fd..5965a322a 100644
--- a/frontend/src/ts/elements/alerts.ts
+++ b/frontend/src/ts/elements/alerts.ts
@@ -4,6 +4,8 @@ import { Auth } from "../firebase";
 import * as AccountButton from "../elements/account-button";
 import * as DB from "../db";
 import * as NotificationEvent from "../observables/notification-event";
+import * as BadgeController from "../controllers/badge-controller";
+import * as Notifications from "../elements/notifications";
 
 let accountAlerts: MonkeyTypes.MonkeyMail[] = [];
 
@@ -14,6 +16,8 @@ export function hide(): void {
   if (!$("#alertsPopupWrapper").hasClass("hidden")) {
     setBellButtonColored(false);
 
+    const badgesClaimed: string[] = [];
+    let totalXpClaimed = 0;
     if (mailToMarkRead.length > 0 || mailToDelete.length > 0) {
       Ape.users.updateInbox({
         mailIdsToMarkRead: undefined, //todo remove
@@ -30,19 +34,15 @@ export function hide(): void {
           return a.concat(b);
         }, []);
 
-      let totalXpClaimed = 0;
-
       for (const r of rewardsClaimed) {
         if (r.type === "xp") {
           totalXpClaimed += r.item as number;
         } else if (r.type === "badge") {
-          // todo
+          const badge = BadgeController.getById(r.item.id);
+          badgesClaimed.push(badge.name);
+          DB.addBadge(r.item);
         }
       }
-
-      const snapxp = DB.getSnapshot().xp;
-      AccountButton.updateXpBar(snapxp, totalXpClaimed);
-      DB.addXp(totalXpClaimed);
     }
 
     $("#alertsPopup").animate(
@@ -61,6 +61,22 @@ export function hide(): void {
         },
         100,
         () => {
+          if (badgesClaimed.length > 0) {
+            Notifications.add(
+              `New badge${
+                badgesClaimed.length > 1 ? "s" : ""
+              } unlocked: ${badgesClaimed.join(", ")}`,
+              1,
+              5,
+              "Reward",
+              "gift"
+            );
+          }
+          if (totalXpClaimed > 0) {
+            const snapxp = DB.getSnapshot().xp;
+            AccountButton.updateXpBar(snapxp, totalXpClaimed);
+            DB.addXp(totalXpClaimed);
+          }
           $("#alertsPopupWrapper").addClass("hidden");
         }
       );
@@ -113,14 +129,7 @@ async function getAccountAlerts(): Promise<void> {
   $("#alertsPopup .accountAlerts .list").empty();
 
   if (inboxResponse.status !== 200) {
-    // addNotification(, -1);
-    $("#alertsPopup .accountAlerts .list").html(
-      `
-      <div class="nothing">
-      Error getting inbox: ${inboxResponse.message}
-      </div>
-      `
-    );
+    Notifications.add(`Error getting inbox: ${inboxResponse.message}`, -1);
     return;
   }
   const inboxData = inboxResponse.data as {