Merge pull request #2632 from getAlby/fix/conditional-publisher

fix: don't render the publisher widget if there is an allowance
getAlby · Aug 5, 2023 · 0fb8b93 · 0fb8b93
2 parents 047979a + 0837ba3
commit 0fb8b93
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/app/screens/Home/DefaultView/index.tsx b/src/app/screens/Home/DefaultView/index.tsx
@@ -28,6 +28,7 @@ dayjs.extend(relativeTime);
 export type Props = {
   lnDataFromCurrentTab?: Battery[];
   currentUrl?: URL | null;
+  renderPublisherWidget?: boolean;
 };
 
 const DefaultView: FC<Props> = (props) => {
@@ -110,7 +111,7 @@ const DefaultView: FC<Props> = (props) => {
 
   return (
     <div className="w-full max-w-screen-sm h-full mx-auto overflow-y-auto no-scrollbar">
-      {!!props.lnDataFromCurrentTab?.length && (
+      {props.renderPublisherWidget && !!props.lnDataFromCurrentTab?.length && (
         <PublisherLnData lnData={props.lnDataFromCurrentTab[0]} />
       )}
       <div className="p-4">

diff --git a/src/app/screens/Home/index.tsx b/src/app/screens/Home/index.tsx
@@ -1,4 +1,4 @@
-import { FC, useState, useEffect, useCallback } from "react";
+import { FC, useCallback, useEffect, useState } from "react";
 import browser from "webextension-polyfill";
 import api from "~/common/lib/api";
 import type { Allowance, Battery } from "~/types";
@@ -11,6 +11,7 @@ const Home: FC = () => {
   const [currentUrl, setCurrentUrl] = useState<URL | null>(null);
   const [loadingAllowance, setLoadingAllowance] = useState(true);
   const [lnData, setLnData] = useState<Battery[]>([]);
+  const [renderDefaultView, setRenderDefaultView] = useState(false);
 
   const loadAllowance = useCallback(async () => {
     try {
@@ -84,19 +85,25 @@ const Home: FC = () => {
     return null;
   }
 
-  if (allowance) {
+  if (allowance && !renderDefaultView) {
     return (
       <AllowanceView
         allowance={allowance}
         lnDataFromCurrentTab={lnData}
-        onGoBack={() => setAllowance(null)}
+        onGoBack={() => setRenderDefaultView(true)}
         onEditComplete={loadAllowance}
         onDeleteComplete={() => setAllowance(null)}
       />
     );
   }
 
-  return <DefaultView currentUrl={currentUrl} lnDataFromCurrentTab={lnData} />;
+  return (
+    <DefaultView
+      renderPublisherWidget={!allowance}
+      currentUrl={currentUrl}
+      lnDataFromCurrentTab={lnData}
+    />
+  );
 };
 
 export default Home;