Merge pull request #8 from ecency/bugfix/review-issues-2

Bugfix/review issues 2
ecency · Sep 9, 2024 · 829654a · 829654a
2 parents 2118b8c + 6c64845
commit 829654a
Show file tree

Hide file tree

Showing 30 changed files with 420 additions and 278 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/next.config.js b/next.config.js
@@ -19,6 +19,7 @@ const config = {
     return config;
   },
   images: {
+    unoptimized: true,
     remotePatterns: [
       {
         protocol: "https",

diff --git a/package.json b/package.json
@@ -10,6 +10,9 @@
     "test": "jest"
   },
   "dependencies": {
+    "@bugsnag/browser-performance": "^2.9.0",
+    "@bugsnag/js": "^8.0.0",
+    "@bugsnag/plugin-react": "^8.0.0",
     "@ecency/ns-query": "1.2.9-next",
     "@ecency/render-helper": "^2.2.29",
     "@emoji-mart/data": "^1.1.2",

diff --git a/public/sw.js b/public/sw.js
diff --git a/public/workbox-9b4d2a02.js b/public/workbox-9b4d2a02.js
diff --git a/src/api/mutations/entry-reblog.ts b/src/api/mutations/entry-reblog.ts
@@ -1,14 +1,17 @@
-import { useMutation } from "@tanstack/react-query";
-import { Entry } from "@/entities";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { BlogEntry, Entry } from "@/entities";
 import { broadcastPostingJSON, formatError } from "@/api/operations";
 import { useGlobalStore } from "@/core/global-store";
 import { useRecordUserActivity } from "@/api/mutations/record-user-activity";
 import { error, info, success } from "@/features/shared";
 import i18next from "i18next";
+import { QueryIdentifiers } from "@/core/react-query";
+import { EcencyEntriesCacheManagement } from "@/core/caches";
 
 export function useEntryReblog(entry: Entry) {
   const activeUser = useGlobalStore((s) => s.activeUser);
   const { mutateAsync: recordUserActivity } = useRecordUserActivity();
+  const queryClient = useQueryClient();
 
   return useMutation({
     mutationKey: ["entryReblog", activeUser?.username, entry.author, entry.permlink],
@@ -26,13 +29,42 @@ export function useEntryReblog(entry: Entry) {
 
       const json = ["reblog", message];
       const r = await broadcastPostingJSON(username, "follow", json);
-      await recordUserActivity({ ty: 130, bl: r.block_num, tx: r.id });
+      recordUserActivity({ ty: 130, bl: r.block_num, tx: r.id });
       return [r, isDelete];
     },
-    onSuccess: ([_, isDelete]) =>
+    onSuccess: ([_, isDelete]) => {
       isDelete
         ? info(i18next.t("entry-reblog.delete-success"))
-        : success(i18next.t("entry-reblog.success")),
+        : success(i18next.t("entry-reblog.success"));
+      EcencyEntriesCacheManagement.updateReblogsCount(
+        entry,
+        (entry.reblogs ?? 0) + (isDelete ? -1 : 1)
+      );
+      queryClient.setQueryData<BlogEntry[]>(
+        [QueryIdentifiers.REBLOGS, activeUser?.username, 200],
+        (data) => {
+          if (!data) {
+            return data;
+          }
+
+          return isDelete
+            ? data.filter((d) => d.author !== entry.author || d.permlink !== entry.permlink)
+            : [
+                {
+                  entry_id: entry.id ?? 0,
+                  blog: activeUser?.username ?? "",
+                  post_id: entry.post_id,
+                  num: 0,
+                  author: entry.author,
+                  permlink: entry.permlink,
+                  reblogged_on: new Date().toISOString(),
+                  created: entry.created
+                },
+                ...data
+              ];
+        }
+      );
+    },
     onError: (e) => error(...formatError(e))
   });
 }
diff --git a/src/api/mutations/notifications/mark-notifications.ts b/src/api/mutations/notifications/mark-notifications.ts
@@ -10,9 +10,13 @@ export function useMarkNotifications() {
   return useMutation({
     mutationKey: ["notifications", "mark"],
     mutationFn: ({ id }: { id: string | undefined }) => markNotifications(activeUser!.username, id),
-    onSuccess: () =>
+    onSuccess: () => {
       queryClient.invalidateQueries({
         queryKey: [QueryIdentifiers.NOTIFICATIONS_UNREAD_COUNT, activeUser?.username]
-      })
+      });
+      queryClient.invalidateQueries({
+        queryKey: [QueryIdentifiers.NOTIFICATIONS, activeUser?.username]
+      });
+    }
   });
 }
diff --git a/src/api/mutations/notifications/update-notifications-settings.ts b/src/api/mutations/notifications/update-notifications-settings.ts
@@ -22,7 +22,6 @@ export function useUpdateNotificationsSettings() {
       ),
     onError: (e) => error(...formatError(e)),
     onSuccess: (settings) => {
-      console.log("here", settings);
       success(i18next.t("preferences.updated"));
       getQueryClient().setQueryData(
         [QueryIdentifiers.NOTIFICATIONS_SETTINGS, activeUser?.username],

diff --git a/src/api/queries/dynamic-props-query.ts b/src/api/queries/dynamic-props-query.ts
@@ -12,6 +12,8 @@ export const getDynamicPropsQuery = () =>
   EcencyQueriesManager.generateClientServerQuery({
     queryKey: [QueryIdentifiers.DYNAMIC_PROPS],
     refetchInterval: 60000,
+    staleTime: 60000,
+    refetchOnMount: true,
     queryFn: async (): Promise<DynamicProps> => {
       const globalDynamic = await getDynamicGlobalProperties();
       const feedHistory = await getFeedHistory();
@@ -50,20 +52,5 @@ export const getDynamicPropsQuery = () =>
         vestingRewardPercent,
         accountCreationFee
       };
-    },
-    initialData: {
-      hivePerMVests: 1,
-      base: 1,
-      quote: 1,
-      fundRecentClaims: 1,
-      fundRewardBalance: 1,
-      hbdPrintRate: 1,
-      hbdInterestRate: 1,
-      headBlock: 1,
-      totalVestingFund: 1,
-      totalVestingShares: 1,
-      virtualSupply: 1,
-      vestingRewardPercent: 1,
-      accountCreationFee: "3.000 HIVE"
     }
   });