Merge branch 'master' into release/v0.3.0

golemfoundation · Mar 25, 2024 · 5b1e4b6 · 5b1e4b6
2 parents 3c5187b + 870bb4d
commit 5b1e4b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/client/src/components/shared/ButtonAddToAllocate/ButtonAddToAllocate.tsx b/client/src/components/shared/ButtonAddToAllocate/ButtonAddToAllocate.tsx
@@ -28,6 +28,9 @@ const ButtonAddToAllocate: FC<ButtonAddToAllocateProps> = ({
   const [isTooltipClicked, setIsTooltipClicked] = useState(false);
   const [isTooltipVisible, setIsTooltipVisible] = useState(false);
   const tooltipText = useMemo(() => {
+    if (isArchivedProject && isAllocatedTo) {
+      return t('donated');
+    }
     if (isAddedToAllocate && isTooltipClicked) {
       return t('saved');
     }
@@ -39,7 +42,7 @@ const ButtonAddToAllocate: FC<ButtonAddToAllocateProps> = ({
     }
     return t('saveToAllocate');
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isAddedToAllocate, isTooltipClicked]);
+  }, [isAddedToAllocate, isTooltipClicked, isArchivedProject, isAllocatedTo]);
 
   const handleTooltipVisibilityChange = (isVisible: boolean) => {
     setIsTooltipVisible(isVisible);
@@ -61,7 +64,7 @@ const ButtonAddToAllocate: FC<ButtonAddToAllocateProps> = ({
       Icon={
         <Tooltip
           hideAfterClick
-          isDisabled={isArchivedProject || isPatronMode}
+          isDisabled={isPatronMode || (isArchivedProject && !isAddedToAllocate)}
           onClickCallback={() => {
             if (isTooltipVisible) {
               setIsTooltipClicked(true);

diff --git a/client/src/components/ui/InputText/InputText.module.scss b/client/src/components/ui/InputText/InputText.module.scss
@@ -89,7 +89,7 @@
           font-size: $font-size-18;
 
           &.hasSuffix {
-            padding: 0 5.2rem 0 2.8rem;
+            padding: 0 5.5rem 0 2.8rem;
           }
         }
       }

diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
@@ -75,7 +75,8 @@
         "saveToAllocate": "Save to allocate",
         "saved": "Saved",
         "removeFromAllocate": "Remove from allocate",
-        "removed": "Removed"
+        "removed": "Removed",
+        "donated": "Donated"
       },
       "rewardsCalculator": {
         "enterGLMAmount": "Enter a GLM amount",