Merge pull request #3234 from OlympusDAO/develop

[Release] - RBS Capacity when wall is inactive
OlympusDAO · Nov 20, 2024 · cd73b0c · cd73b0c
2 parents 75a18bd + 8c957c3
commit cd73b0c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/views/Governance/Proposals/index.tsx b/src/views/Governance/Proposals/index.tsx
@@ -91,7 +91,7 @@ export const ProposalPage = () => {
                 )}
                 <Typography fontSize={"18px"} fontWeight={600}>
                   {pending && proposalDetails.startDate ? (
-                    `Voting Starts in ${DateTime.fromJSDate(proposalDetails.startDate).toRelative({
+                    `Voting Starts ${DateTime.fromJSDate(proposalDetails.startDate).toRelative({
                       base: DateTime.fromJSDate(currentBlockTime),
                     })}`
                   ) : proposalDetails.status === "Succeeded" ? (

diff --git a/src/views/Range/RangeChart.tsx b/src/views/Range/RangeChart.tsx
@@ -123,7 +123,9 @@ const RangeChart = (props: {
         <DataRow title="Wall" balance={formatCurrency(lowerWall, 2, reserveSymbol)} />
         <DataRow
           title="Capacity"
-          balance={`${capacityFormatter.format(parseBigNumber(rangeData.low.capacity, 18))} ${reserveSymbol} `}
+          balance={`${
+            rangeData.low.active ? capacityFormatter.format(parseBigNumber(rangeData.low.capacity, 18)) : 0
+          } ${reserveSymbol} `}
         />
         <Typography fontSize="15px" fontWeight={600} mt="33px">
           Upper Range
@@ -132,7 +134,9 @@ const RangeChart = (props: {
         <DataRow title="Wall" balance={formatCurrency(upperWall, 2, reserveSymbol)} />
         <DataRow
           title="Capacity"
-          balance={`${capacityFormatter.format(parseBigNumber(rangeData.high.capacity, 9))} OHM`}
+          balance={`${
+            rangeData.high.active ? capacityFormatter.format(parseBigNumber(rangeData.high.capacity, 9)) : 0
+          } OHM`}
         />
         {label === "now" && (
           <>

diff --git a/src/views/Range/index.tsx b/src/views/Range/index.tsx
@@ -95,7 +95,13 @@ export const Range = () => {
       ? parseBigNumber(upperMaxPayout, 9)
       : parseBigNumber(rangeData.high.capacity, 9);
 
-  const maxCapacity = sellActive ? lowerMaxCapacity : upperMaxCapacity;
+  const maxCapacity = sellActive
+    ? rangeData.low.active
+      ? lowerMaxCapacity
+      : 0
+    : rangeData.high.active
+      ? upperMaxCapacity
+      : 0;
 
   useEffect(() => {
     if (reserveAmount && ohmAmount) {