Tiny bug fixes (#55)

* do not show modal a hundred times * make colors a little better (worse?)
anysphere · Jul 28, 2022 · 2067a05 · 2067a05
1 parent eb60a81
commit 2067a05
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/gui/src/renderer/Main.tsx b/gui/src/renderer/Main.tsx
@@ -69,6 +69,7 @@ function Main({
     updateTab,
   ] = useTabs(defaultTabs);
   const [modal, setModal] = React.useState<JSX.Element | null>(null);
+  const [hasShownInitialModal, setHasShownInitialModal] = React.useState(false);
 
   const statusState = React.useContext(statusContext);
 
@@ -135,6 +136,9 @@ function Main({
   }, [setModal]);
 
   React.useEffect(() => {
+    if (hasShownInitialModal) {
+      return;
+    }
     if (initialModal === InitialModal.AddFriendByPublicId) {
       setModal(
         <AddFriend
@@ -148,7 +152,14 @@ function Main({
         />
       );
     }
-  }, [closeModal, statusState, initialModal, initialModalData]);
+    setHasShownInitialModal(true);
+  }, [
+    closeModal,
+    statusState,
+    initialModal,
+    initialModalData,
+    hasShownInitialModal,
+  ]);
 
   const openFriendModal = React.useCallback(() => {
     setModal(

diff --git a/gui/src/renderer/components/Invitations.tsx b/gui/src/renderer/components/Invitations.tsx
@@ -51,7 +51,7 @@ function OutgoingAsyncInvitationComp({
   return (
     <div
       className={`${
-        active ? "border-asbrown-100 bg-asbeige" : "border-white bg-white"
+        active ? "border-asbrown-100 bg-asbeige2" : "border-white bg-white"
       } my-2 rounded-sm border-l-4 px-4 py-4`}
     >
       <div className="flex flex-row gap-5">
@@ -113,7 +113,7 @@ function IncomingInvitationComp({
   return (
     <div
       className={`${
-        active ? "border-asbrown-100 bg-asbeige" : "border-white bg-white"
+        active ? "border-asbrown-100 bg-asbeige2" : "border-white bg-white"
       } my-2 rounded-sm border-l-4 px-4 py-4`}
     >
       <div className="flex flex-row gap-5">

diff --git a/gui/src/renderer/components/MessageList.tsx b/gui/src/renderer/components/MessageList.tsx
@@ -30,7 +30,7 @@ function IncomingMessageBlurb({
   return (
     <div
       className={`${
-        active ? "border-asbrown-100 bg-asbeige" : "border-white bg-white"
+        active ? "border-asbrown-100 bg-asbeige2" : "border-white bg-white"
       } my-2 rounded-sm border-l-4 px-4 py-4`}
     >
       <div className="flex flex-row gap-5">

diff --git a/gui/tailwind.config.js b/gui/tailwind.config.js
@@ -31,6 +31,7 @@ module.exports = {
           dark: "#194F39",
         },
         asbeige: "#F9F7F1",
+        asbeige2: "#FCFBF8",
         asyellow: {
           light: "#FECA6F",
           500: "#E2A924",