From 742347d89851ac06587c174819b3e62edc710827 Mon Sep 17 00:00:00 2001
From: gitstart-omnivore <gitstart@users.noreply.github.com>
Date: Wed, 25 May 2022 16:56:17 +0000
Subject: [PATCH 1/2] Fixed archive button not changing to unarchive.

---
 .../templates/article/ArticleActionsMenu.tsx  | 41 +++++++++++++++----
 .../networking/queries/useGetArticleQuery.tsx |  1 +
 .../web/pages/[username]/[slug]/index.tsx     | 22 ++++++++++
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/packages/web/components/templates/article/ArticleActionsMenu.tsx b/packages/web/components/templates/article/ArticleActionsMenu.tsx
index 1500b4105..d21a533d3 100644
--- a/packages/web/components/templates/article/ArticleActionsMenu.tsx
+++ b/packages/web/components/templates/article/ArticleActionsMenu.tsx
@@ -150,14 +150,39 @@ export function ArticleActionsMenu(props: ArticleActionsMenuProps): JSX.Element
 
       <MenuSeparator layout={props.layout} />
 
-      <Button style='articleActionIcon' onClick={() => props.articleActionHandler('archive')}>
-        <TooltipWrapped
-          tooltipContent="Archive"
-          tooltipSide={props.layout == 'side' ? 'right' : 'bottom'}
-        >
-          <ArchiveBox size={24} color={theme.colors.readerFont.toString()} />
-        </TooltipWrapped>
-      </Button>
+      {!props.article?.isArchived ? (
+          <Button
+            style="articleActionIcon"
+            onClick={() => props.articleActionHandler('archive')}
+          >
+            <TooltipWrapped
+              tooltipContent="Archive"
+              tooltipSide={props.layout == 'side' ? 'right' : 'bottom'}
+            >
+              <ArchiveBox
+                size={24}
+                color={theme.colors.readerFont.toString()}
+              />
+            </TooltipWrapped>
+          </Button>
+        ) : (
+          <Button
+            style="articleActionIcon"
+            onClick={() => props.articleActionHandler('unarchive')}
+          >
+            <TooltipWrapped
+              tooltipContent="Unarchive"
+              tooltipSide={props.layout == 'side' ? 'right' : 'bottom'}
+            >
+              {/* // This should be unarchive icon */}
+              <ArchiveBox
+                size={24}
+                color={theme.colors.readerFont.toString()}
+              />
+            </TooltipWrapped>
+          </Button>
+        )}
+
       {/* <MenuSeparator layout={props.layout} />
 
       <Button style='articleActionIcon'>
diff --git a/packages/web/lib/networking/queries/useGetArticleQuery.tsx b/packages/web/lib/networking/queries/useGetArticleQuery.tsx
index 3c318ba15..e1072896c 100644
--- a/packages/web/lib/networking/queries/useGetArticleQuery.tsx
+++ b/packages/web/lib/networking/queries/useGetArticleQuery.tsx
@@ -40,6 +40,7 @@ export type ArticleAttributes = {
   author?: string
   image?: string
   savedAt: string
+  isArchived: boolean
   createdAt: string
   publishedAt?: string
   description?: string
diff --git a/packages/web/pages/[username]/[slug]/index.tsx b/packages/web/pages/[username]/[slug]/index.tsx
index cc18240c3..9b756ca3c 100644
--- a/packages/web/pages/[username]/[slug]/index.tsx
+++ b/packages/web/pages/[username]/[slug]/index.tsx
@@ -62,6 +62,28 @@ export default function Home(): JSX.Element {
 
   const actionHandler = useCallback(async(action: string, arg?: unknown) => {
     switch (action) {
+      case 'unarchive':
+          if (article) {
+            removeItemFromCache(cache, mutate, article.id)
+
+            setLinkArchivedMutation({
+              linkId: article.id,
+              archived: false,
+            }).then((res) => {
+              if (res) {
+                showSuccessToast('Link unarchived', {
+                  position: 'bottom-right',
+                })
+              } else {
+                showErrorToast('Error unarchiving link', {
+                  position: 'bottom-right',
+                })
+              }
+            })
+
+            router.push(`/home`)
+          }
+          break
       case 'archive':
         if (article) {
           removeItemFromCache(cache, mutate, article.id)

From b00875cd424d339a472268daa87ea04e2941c4d8 Mon Sep 17 00:00:00 2001
From: gitstart-omnivore <gitstart@users.noreply.github.com>
Date: Thu, 2 Jun 2022 08:46:18 +0000
Subject: [PATCH 2/2] Changed unarchive icon and added unarchive functionality.

---
 .../web/components/templates/article/ArticleActionsMenu.tsx  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/web/components/templates/article/ArticleActionsMenu.tsx b/packages/web/components/templates/article/ArticleActionsMenu.tsx
index d21a533d3..c8e0fb9c4 100644
--- a/packages/web/components/templates/article/ArticleActionsMenu.tsx
+++ b/packages/web/components/templates/article/ArticleActionsMenu.tsx
@@ -1,5 +1,5 @@
 import { Separator } from "@radix-ui/react-separator"
-import { ArchiveBox, DotsThree, HighlighterCircle, TagSimple, TextAa } from "phosphor-react"
+import { ArchiveBox, DotsThree, HighlighterCircle, TagSimple, TextAa, Tray } from "phosphor-react"
 import { ArticleAttributes } from "../../../lib/networking/queries/useGetArticleQuery"
 import { Button } from "../../elements/Button"
 import { Dropdown } from "../../elements/DropdownElements"
@@ -174,8 +174,7 @@ export function ArticleActionsMenu(props: ArticleActionsMenuProps): JSX.Element
               tooltipContent="Unarchive"
               tooltipSide={props.layout == 'side' ? 'right' : 'bottom'}
             >
-              {/* // This should be unarchive icon */}
-              <ArchiveBox
+              <Tray
                 size={24}
                 color={theme.colors.readerFont.toString()}
               />