From 7589d134d07146d4276711794f55ad2955041daf Mon Sep 17 00:00:00 2001
From: MuckT <mcgtom10@gmail.com>
Date: Sat, 10 Feb 2024 16:35:25 -0800
Subject: [PATCH] feat: use block and unblock in address input for clarity

---
 .../components/AddressInput/AddressInput.tsx  | 33 +++++++++++++++----
 src/controllers/AddressInputController.tsx    | 13 ++++++--
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/component-library/components/AddressInput/AddressInput.tsx b/src/component-library/components/AddressInput/AddressInput.tsx
index 5e3076f9..ce2d5dfb 100644
--- a/src/component-library/components/AddressInput/AddressInput.tsx
+++ b/src/component-library/components/AddressInput/AddressInput.tsx
@@ -1,7 +1,9 @@
 import { ChevronLeftIcon, XCircleIcon } from "@heroicons/react/outline";
 import { useTranslation } from "react-i18next";
 import { Avatar } from "../Avatar/Avatar";
-import { classNames } from "../../../helpers";
+import { TAILWIND_MD_BREAKPOINT, classNames } from "../../../helpers";
+import { ActiveTab } from "../../../store/xmtp";
+import useWindowSize from "../../../hooks/useWindowSize";
 
 interface AddressInputProps {
   /**
@@ -50,6 +52,10 @@ interface AddressInputProps {
    * Is there a right icon click event that needs to be handled?
    */
   onRightIconClick?: () => void;
+  /**
+   * Currently Active Tab
+   */
+  activeTab: ActiveTab;
 }
 
 export const AddressInput = ({
@@ -61,9 +67,12 @@ export const AddressInput = ({
   value,
   onLeftIconClick,
   onRightIconClick,
+  activeTab,
 }: AddressInputProps) => {
   const { t } = useTranslation();
   const subtextColor = isError ? "text-red-600" : "text-gray-500";
+  const [width] = useWindowSize();
+  const isMobileView = width <= TAILWIND_MD_BREAKPOINT;
   return (
     <div
       className={classNames(
@@ -124,12 +133,22 @@ export const AddressInput = ({
           </div>
         </div>
       </form>
-      {onRightIconClick && (
-        <XCircleIcon
-          onClick={onRightIconClick}
-          height="24"
-          className="text-red-600 cursor-pointer"
-        />
+      {onRightIconClick && activeTab === "messages" && (
+        <button
+          type="button"
+          className="text-indigo-600 font-bold text-md"
+          onClick={onRightIconClick}>
+          {t("consent.block")}
+        </button>
+      )}
+      {/* Check for mobile view to avoid having multiple block elements visible on Desktop */}
+      {isMobileView && onRightIconClick && activeTab === "blocked" && (
+        <button
+          type="button"
+          className="text-indigo-600 font-bold text-md"
+          onClick={onRightIconClick}>
+          {t("consent.unblock")}
+        </button>
       )}
     </div>
   );
diff --git a/src/controllers/AddressInputController.tsx b/src/controllers/AddressInputController.tsx
index 97e9c141..397945fd 100644
--- a/src/controllers/AddressInputController.tsx
+++ b/src/controllers/AddressInputController.tsx
@@ -22,9 +22,10 @@ export const AddressInputController = () => {
   const setConversationTopic = useXmtpStore((s) => s.setConversationTopic);
   const changedConsentCount = useXmtpStore((s) => s.changedConsentCount);
   const setChangedConsentCount = useXmtpStore((s) => s.setChangedConsentCount);
+  const activeTab = useXmtpStore((s) => s.activeTab);
 
   const { getCachedByPeerAddress, getCachedByTopic } = useConversation();
-  const { deny } = useConsent();
+  const { deny, allow } = useConsent();
 
   // manage address input state
   useAddressInput();
@@ -105,9 +106,15 @@ export const AddressInputController = () => {
         setConversationTopic("");
       }}
       onRightIconClick={() => {
-        void deny([recipientAddress]);
-        setChangedConsentCount(changedConsentCount + 1);
+        if (activeTab === "messages") {
+          void deny([recipientAddress]);
+          setChangedConsentCount(changedConsentCount + 1);
+        } else if (activeTab === "blocked") {
+          void allow([recipientAddress]);
+          setChangedConsentCount(changedConsentCount + 1);
+        }
       }}
+      activeTab={activeTab}
     />
   );
 };