dunzo

esorjin20 · Mar 23, 2022 · bdc5ae3 · bdc5ae3
1 parent 79c2e20
commit bdc5ae3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/client/src/components/collection/Collection.js b/client/src/components/collection/Collection.js
@@ -181,7 +181,7 @@ function Collection(props) {
             {!smallWindow ?
                 (
                     <>
-                        <SkinChangerWarning skinsOwned={props.skinsOwned}/>
+                        {props.loadout !== null ? <SkinChangerWarning skinsOwned={props.skinsOwned}/> : null}
                         <Grid className={classes.root} style={props.style} container justifyContent="center" direction="row" alignItems="center" spacing={3}>
                             {grid.map(row => {
                                 if (props.loadout !== null) {

diff --git a/client/src/components/collection/sub/SkinChangerWarning.js b/client/src/components/collection/sub/SkinChangerWarning.js
@@ -22,23 +22,36 @@ function SkinChangerWarning(props){
     const skinsOwned = props.skinsOwned
 
     const [acknowledged, setAcknowledged] = useLocalStorage("skinChangerWarningAcknowledged", false);
+    const [enableButton, setEnableButton] = useState(false);
+    const [open, setOpen] = useState(false);
 
     useEffect(() => {
-        if(skinsOwned > Config.SKIN_CHANGER_WARNING_THRESHOLD){
+        if(skinsOwned > Config.SKIN_CHANGER_WARNING_THRESHOLD && skinsOwned !== -1){
             setAcknowledged(true);
         }
-    })
+        if((!acknowledged && skinsOwned < Config.SKIN_CHANGER_WARNING_THRESHOLD) && skinsOwned !== -1){
+            setOpen(true);
+        }
+    }, [skinsOwned]);
+
+    useEffect(() => {
+        if(open){
+            setTimeout(() => {
+                setEnableButton(true);
+            }, 3000);
+        }
+    }, [open])
 
     return (
-        <Dialog open={!acknowledged && skinsOwned < Config.SKIN_CHANGER_WARNING_THRESHOLD} fullWidth maxWidth="xs" onClose={null}>
-            <DialogTitle>VIM is NOT a skin changer</DialogTitle>
+        <Dialog open={open} fullWidth maxWidth="xs" onClose={null}>
+            <DialogTitle>⚠️ VIM is NOT a skin changer ⚠️</DialogTitle>
             <DialogContent className={classes.content}>
                 <DialogContentText style={{ }}>
                     You own {skinsOwned} skins. VIM is NOT a skin changer and will not give you "free skins". VIM only works with skins you own.
                 </DialogContentText>
             </DialogContent>
             <DialogActions>
-                <Button color="primary" onClick={() => {setAcknowledged(true)}}>
+                <Button disabled={!enableButton} color="primary" onClick={() => {setAcknowledged(true); setOpen(false);}}>
                     I understand
                 </Button>
             </DialogActions>

diff --git a/client/src/pages/CollectionHome.js b/client/src/pages/CollectionHome.js
@@ -28,7 +28,7 @@ function CollectionHome(props) {
     const [showWeaponEditor, setWeaponEditorState] = useState(false);
     const [loadout, setLoadout] = useState({});
     const [weaponEditor, setWeaponEditor] = useState();
-    const [uniqueSkinsOwned, setUniqueSkinsOwned] = useState(0);
+    const [uniqueSkinsOwned, setUniqueSkinsOwned] = useState(-1);
 
     useEffect(() => {
         if (!loaded) {
@@ -51,12 +51,15 @@ function CollectionHome(props) {
 
     useEffect(() => {
         // count how many skins are owned for skin changer warning dialog
-        var skinsOwned = 0;
+        var skinsOwned = -1;
 
         for (var weapon in inventoryData) {
             skinsOwned += Object.keys(inventoryData[weapon].skins).length - 1;
         }
-        setUniqueSkinsOwned(skinsOwned);
+        if(skinsOwned !== -1){
+            setUniqueSkinsOwned(skinsOwned + 1);
+        }
+
     }, [inventoryData])
 
     function load() {

diff --git a/client/src/services/ClientConfig.js b/client/src/services/ClientConfig.js
@@ -7,7 +7,7 @@ const Config = {
     SOCKET_RETRY_THRESHOLD: 5,
 
     WEIGHT_INTERVALS: 10,
-    SKIN_CHANGER_WARNING_THRESHOLD: 5,
+    SKIN_CHANGER_WARNING_THRESHOLD: 10,
 
     NAVIGATION_ENABLED: false,
     ENABLED_PAGES: {