Merge pull request #30 from burrowHQ/fix-pool-unclaims

Fix pool unclaims
burrowHQ · Nov 23, 2023 · 90f1dba · 90f1dba
2 parents 2490994 + ff7007d
commit 90f1dba
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 13 deletions.
diff --git a/components/CustomModal/CustomModal.tsx b/components/CustomModal/CustomModal.tsx
@@ -48,7 +48,7 @@ const CustomModal = ({
     <Portal>
       <StyledWrapper
         className={twMerge("modal fade", show && "show", className)}
-        style={show ? { display: "block" } : {}}
+        // style={show ? { display: "block" } : {}}
       >
         <div className="overlay" onClick={onOutsideClick} />
         <div className={twMerge("modal-dialog background-paper", size && `modal-${size}`)}>

diff --git a/components/Modal/Controls.tsx b/components/Modal/Controls.tsx
@@ -18,8 +18,12 @@ export default function Controls({
   const dispatch = useAppDispatch();
 
   const handleInputChange = (e) => {
-    const value = e.target.value || 0;
-    if (new Decimal(value).gt(available)) return;
+    const { value } = e.target;
+    const numRegex = /^([0-9]*\.?[0-9]*$)/;
+    if (!numRegex.test(value) || Number(value) > Number(available)) {
+      e.preventDefault();
+      return;
+    }
     dispatch(updateAmount({ isMax: false, amount: value }));
   };
 
@@ -65,11 +69,10 @@ export default function Controls({
           <input
             type="number"
             placeholder="0.0"
-            step="0.01"
+            step="any"
             value={inputAmount}
             onChange={handleInputChange}
-            onFocus={handleFocus}
-            className="text-white"
+            className="text-white noselect"
           />
         </div>
         <TokenBox asset={asset} action={action} />

diff --git a/screens/Staking/modalStaking.tsx b/screens/Staking/modalStaking.tsx
@@ -49,6 +49,12 @@ const ModalStaking = ({ isOpen, onClose }) => {
 
   const handleInputChange = (e) => {
     let { value } = e?.target || {};
+    const numRegex = /^([0-9]*\.?[0-9]*$)/;
+    if (!numRegex.test(value)) {
+      e.preventDefault();
+      return;
+    }
+
     if (Number(value) > Number(total)) {
       value = total;
     }
@@ -120,9 +126,9 @@ const ModalStaking = ({ isOpen, onClose }) => {
         <input
           value={inputAmount}
           type="number"
-          step="0.01"
+          step="any"
           onChange={handleInputChange}
-          onFocus={handleFocus}
+          className="noselect"
         />
         <div className="btn-sm cursor-pointer" onClick={handleMaxClick}>
           Max

diff --git a/styles/global.css b/styles/global.css
@@ -22,6 +22,11 @@ body {
   color: #fff;
 }
 
+#__next{
+  background: #14162b;
+  height: 100%;
+}
+
 .sans-bold {
   font-family: "work-sans-bold";
 }
@@ -107,14 +112,18 @@ body,
   position: fixed;
   top: 0;
   left: 0;
-  /*z-index: 1055;*/
-  /*display: none;*/
+  /* z-index: 1055; */
+  /* display: none; */
   z-index: -99;
   width: 100%;
   height: 100%;
   overflow-x: hidden;
   overflow-y: auto;
   outline: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 10px 0;
 }
 
 .modal.show {
@@ -123,8 +132,8 @@ body,
 
 .modal-dialog {
   position: relative;
-  width: auto;
-  margin: 0.5rem;
+  width: 100%;
+  margin: auto 0;
   pointer-events: none;
 }
 
@@ -274,7 +283,6 @@ body,
 @media (min-width: 576px) {
   .modal-dialog {
     max-width: 800px;
-    margin: 10% auto;
   }
 
   .modal-dialog-scrollable {
@@ -722,3 +730,13 @@ options-list::-webkit-scrollbar {
 .nws-modal-wrapper .nws-modal .connecting-details span {
   color: #fff;
 }
+
+.noselect {
+  -webkit-touch-callout: none; /* iOS Safari */
+  -webkit-user-select: none; /* Safari */
+  -khtml-user-select: none; /* Konqueror HTML */
+  -moz-user-select: none; /* Old versions of Firefox */
+  -ms-user-select: none; /* Internet Explorer/Edge */
+  user-select: none; /* Non-prefixed version, currently
+                                  supported by Chrome, Edge, Opera and Firefox */
+}