feat(nui): Progress bar cancel

web/src/components/CircleProgressbar.tsx

@@ -26,14 +26,26 @@ const CircleProgressbar: React.FC = () => {
   const [visible, setVisible] = React.useState(false);
   const [progressDuration, setProgressDuration] = React.useState(0);
   const [value, setValue] = React.useState(0);
+  const [cancelled, setCancelled] = React.useState(false);
 
   const progressComplete = () => {
     setVisible(false);
     fetchNui("progressComplete");
   };
 
+  const progressCancel = () => {
+    setCancelled(true);
+    setValue(99); // Sets the final value to 100% kek
+    setTimeout(() => {
+      setVisible(false);
+    }, 2500);
+  };
+
+  useNuiEvent("progressCancel", progressCancel);
+
   useNuiEvent<Props>("circleProgress", (data) => {
     if (visible) return;
+    setCancelled(false);
     setVisible(true);
     setValue(0);
     setProgressDuration(data.duration);
@@ -61,14 +73,24 @@ const CircleProgressbar: React.FC = () => {
           value={value}
           size="7rem"
           onAnimationEnd={progressComplete}
-          sx={{
+          color={cancelled ? "rgb(198, 40, 40)" : "blue.300"}
-            ".chakra-progress__indicator": {
+          sx={
-              transition: "none !important",
+            !cancelled
-              animation: "progress linear forwards !important",
+              ? {
-              animationDuration: `${progressDuration}ms !important`,
+                  ".chakra-progress__indicator": {
-              opacity: "1 !important",
+                    transition: "none !important",
-            },
+                    animation: "progress linear forwards !important",
-          }}
+                    animationDuration: `${progressDuration}ms !important`,
+                    opacity: "1 !important",
+                  },
+                }
+              : {
+                  ".chakra-progress__indicator": {
+                    transition: "none !important",
+                    strokeDasharray: "264, 0 !important", // sets circle to full
+                  },
+                }
+          }
         >
           <CircularProgressLabel color="black">{value}%</CircularProgressLabel>
         </CircularProgress>

web/src/components/Progressbar.tsx

@@ -29,14 +29,25 @@ const Progressbar: React.FC = () => {
   const [visible, setVisible] = React.useState(false);
   const [label, setLabel] = React.useState("");
   const [duration, setDuration] = React.useState(0);
+  const [cancelled, setCancelled] = React.useState(false);
 
   const progressComplete = () => {
     setVisible(false);
     fetchNui("progressComplete");
   };
 
+  const progressCancel = () => {
+    setCancelled(true);
+    setTimeout(() => {
+      setVisible(false);
+    }, 2500);
+  };
+
+  useNuiEvent("progressCancel", progressCancel);
+
   useNuiEvent<Props>("progress", (data) => {
     if (visible) return;
+    setCancelled(false);
     setVisible(true);
     setLabel(data.label);
     setDuration(data.duration);
@@ -59,12 +70,21 @@ const Progressbar: React.FC = () => {
             height="3rem"
             flex="1 1 auto"
             onAnimationEnd={progressComplete}
-            sx={{
+            sx={
-              // really scuffed solution but works, wonder if there's a better way to do this?
+              !cancelled
-              "> div:first-of-type": {
+                ? {
-                animation: `progress-bar linear ${duration}ms`,
+                    // really scuffed solution but works, wonder if there's a better way to do this?
-              },
+                    "> div:first-of-type": {
-            }}
+                      animation: `progress-bar linear ${duration}ms`,
+                    },
+                  }
+                : {
+                    "> div:first-of-type": {
+                      width: "100%",
+                      backgroundColor: "rgb(198, 40, 40)",
+                    },
+                  }
+            }
           >
             <ProgressLabel fontSize={22}>{label}</ProgressLabel>
           </Progress>