diff --git a/package.json b/package.json
index a06f079..dcc2656 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "ghost-dao-interface",
"private": true,
- "version": "0.5.27",
+ "version": "0.5.28",
"type": "module",
"scripts": {
"dev": "vite",
diff --git a/src/components/Chip/Chip.jsx b/src/components/Chip/Chip.jsx
index f19cbe8..b558d1f 100644
--- a/src/components/Chip/Chip.jsx
+++ b/src/components/Chip/Chip.jsx
@@ -9,12 +9,12 @@ const classes = {
const StyledMuiChip = styled(MuiChip, {
shouldForwardProp: prop => prop !== "template" && prop !== "strong",
-})(({ theme, template, strong }) => {
+})(({ theme, template, background, strong }) => {
return {
[`&.${classes.chip}`]: {
height: "21px",
borderRadius: "16px",
- backgroundColor: template
+ backgroundColor: background ? background : template
? template === "purple"
? theme.colors.special["olyZaps"]
: template === "gray"
@@ -42,8 +42,8 @@ const StyledMuiChip = styled(MuiChip, {
};
});
-const Chip = ({ template, strong = false, ...props }) => {
- return ;
+const Chip = ({ background, template, strong = false, ...props }) => {
+ return ;
};
export default Chip;
diff --git a/src/containers/Governance/ProposalDetails.jsx b/src/containers/Governance/ProposalDetails.jsx
index dfa9532..cb3dfb4 100644
--- a/src/containers/Governance/ProposalDetails.jsx
+++ b/src/containers/Governance/ProposalDetails.jsx
@@ -32,7 +32,7 @@ import { formatNumber, formatCurrency, shorten } from "../../helpers";
import { prettifySecondsInDays } from "../../helpers/timeUtil";
import { DecimalBigNumber, } from "../../helpers/DecimalBigNumber";
-import { convertStatusToTemplate, convertStatusToLabel } from "./helpers";
+import { convertStatusToColor, convertStatusToLabel } from "./helpers";
import { parseFunctionCalldata } from "./components/functions";
import { networkAvgBlockSpeed } from "../../constants";
@@ -223,7 +223,7 @@ const ProposalDetails = ({ chainId, address, connect, config }) => {
}
diff --git a/src/containers/Governance/components/ProposalsList.jsx b/src/containers/Governance/components/ProposalsList.jsx
index 0a5cc02..ba222e0 100644
--- a/src/containers/Governance/components/ProposalsList.jsx
+++ b/src/containers/Governance/components/ProposalsList.jsx
@@ -33,7 +33,7 @@ import { PrimaryButton, TertiaryButton } from "../../../components/Button";
import ProposalInfoText from "./ProposalInfoText";
import {
- convertStatusToTemplate,
+ convertStatusToColor,
convertStatusToLabel,
MY_PROPOSALS_PREFIX,
VOTED_PROPOSALS_PREFIX
@@ -174,7 +174,7 @@ const ProposalTable = ({ children }) => (
Status
Vote Ends
Voting Stats
-
+
@@ -231,7 +231,7 @@ const ProposalRow = ({ proposal, blockNumber, openProposal, chainId }) => {
@@ -290,7 +290,7 @@ const ProposalCard = ({ proposal, blockNumber, openProposal, chainId }) => {
diff --git a/src/containers/Governance/components/functions/CreateBond.jsx b/src/containers/Governance/components/functions/CreateBond.jsx
index 04f3717..5ebbd95 100644
--- a/src/containers/Governance/components/functions/CreateBond.jsx
+++ b/src/containers/Governance/components/functions/CreateBond.jsx
@@ -296,7 +296,7 @@ const TokenAndBooleansArguments = ({
rightText={"False"}
setLeftValue={() => setCapacityInQuote(true)}
setRightValue={() => setCapacityInQuote(false)}
- tooltip={`Determines how the bond market capacity is measured. True = measured in ${nativeCurrency}, False = measured in ${ftsoSymbol}.`}
+ tooltip={`Determines how the bond market capacity is measured. True = measured in _quoteToken, False = measured in ${ftsoSymbol}.`}
/>
{
+export const convertStatusToColor = (status) => {
switch (status) {
- case 7:
- return 'darkGray';
+ case 1:
+ return "#f2e370";
case 2:
- return 'warning';
- case 4:
- return 'success';
+ return "#f06f73";
case 3:
- return 'error';
+ return "#f06f73";
+ case 4:
+ return "#60c45b";
+ case 5:
+ return "#60c45b";
+ case 6:
+ return "#f06f73";
+ case 7:
+ return "#f2e370";
default:
- return 'darkGray';
+ return "#a2b7ce";
}
}