Merge branch 'staging' into skeleton-table

NEAR-DevHub · Jan 29, 2025 · 83f07d1 · 83f07d1
2 parents 70ee27a + 1d27285
commit 83f07d1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/instances/widgets.treasury-factory.near/widget/components/OffCanvas.jsx b/instances/widgets.treasury-factory.near/widget/components/OffCanvas.jsx
@@ -11,8 +11,10 @@ const children = props.children;
 
 const Container = styled.div`
   opacity: 1 !important;
+
   .offcanvas.offcanvas-end {
     width: 30% !important;
+    z-index: 1060;
   }
 
   @media screen and (max-width: 1200px) {
@@ -28,14 +30,13 @@ const Container = styled.div`
   }
 
   .offcanvas {
-    border-top-left-radius: 1rem !important;
-    border-bottom-left-radius: 1rem !important;
     overflow: auto;
   }
 `;
 
 return (
   <Container>
+    <div className={`fade ${showCanvas ? "modal-backdrop show" : ""}`} />
     <div
       className={`offcanvas offcanvas-end ${showCanvas ? "show" : ""}`}
       tabIndex="-1"

diff --git a/instances/widgets.treasury-factory.near/widget/components/templates/AppLayout.jsx b/instances/widgets.treasury-factory.near/widget/components/templates/AppLayout.jsx
@@ -415,7 +415,12 @@ function AppLayout({ page, instance, children, treasuryDaoID, accountId }) {
 
   return (
     <ParentContainer data-bs-theme={isDarkTheme ? "dark" : "light"}>
-      <Theme className="min-h-100 w-100">
+      <Theme
+        className="w-100"
+        style={{
+          minHeight: gatewayURL.includes("near.org") ? "100vh" : "100%",
+        }}
+      >
         <AppHeader page={page} instance={instance} />
         <BalanceBanner accountId={accountId} treasuryDaoID={treasuryDaoID} />
         <div className="px-3 pb-3 w-100 h-100">{children}</div>

diff --git a/instances/widgets.treasury-factory.near/widget/pages/settings/Thresholds.jsx b/instances/widgets.treasury-factory.near/widget/pages/settings/Thresholds.jsx
@@ -419,11 +419,15 @@ return (
                     if (isPercentageSelected) {
                       if (number > 100)
                         setValueError("Maximum percentage allowed is 100.");
+                      else if (number < 1)
+                        setValueError("Minimum percentage allowed is 1.");
                     } else {
                       if (number > selectedGroup.members.length)
                         setValueError(
                           `Maximum members allowed is ${selectedGroup.members.length}.`
                         );
+                      if (number < 1)
+                        setValueError("Minimum members allowed is 1.");
                     }
                   },
                   value: selectedVoteValue,

diff --git a/...gets.treasury-factory.near/widget/pages/stake-delegation/ValidatorsDropDownWithSearch.jsx b/...gets.treasury-factory.near/widget/pages/stake-delegation/ValidatorsDropDownWithSearch.jsx
@@ -45,8 +45,8 @@ const code = `
   <style>
 
   :root {
-    --bs-body-bg: inherit !important;
-    --bs-border-color: inherit !important;
+    --bs-body-bg: ${colors["--bg-page-color"]} !important;
+    --bs-border-color: ${colors["--border-color"]} !important;
   }
   body {
     background-color: ${colors["--bg-page-color"]} !important;
@@ -153,9 +153,15 @@ const code = `
     border-color: ${colors["--border-color"]} !important;
     background: ${colors["--grey-035"]} !important;
   }
-  .btn{
+  .btn {
     padding: 0.5rem 1.2rem !important;
   }
+  .btn, .input-group-text, input, textarea {
+    border-color: ${colors["--border-color"]} !important;
+  }
+  .input-icon {
+    background: ${colors["--bg-page-color"]} !important;
+  }
   .theme-btn {
     background: ${colors["--theme-color"]} !important;
     color: white !important;