fix: fix conflicts

cardano-foundation · Apr 1, 2024 · 3cdf4b5 · 3cdf4b5
2 parents 7145f5d + 09b4985
commit 3cdf4b5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/src/components/GovernanceVotes/index.tsx b/src/components/GovernanceVotes/index.tsx
@@ -1098,11 +1098,15 @@ const FilterGovernanceVotes: React.FC<FilterGovernanceVotes> = ({ query, setQuer
     { value: POOLS_ACTION_TYPE.TREASURY_WITHDRAWALS_ACTION, text: t("drep.treasuryWithdrawals") },
     { value: POOLS_ACTION_TYPE.INFO_ACTION, text: t("pool.typeInfo") }
   ];
+
   const actionTypeListPools = [
     { value: POOLS_ACTION_TYPE.ALL, text: t("pool.any") },
     { value: POOLS_ACTION_TYPE.NO_CONFIDENCE, text: t("pool.typeMotion") },
     { value: POOLS_ACTION_TYPE.UPDATE_COMMITTEE, text: t("pool.typeConstitutional") },
+    { value: POOLS_ACTION_TYPE.NEW_CONSTITUTION, text: t("drep.updateConstitution") },
     { value: POOLS_ACTION_TYPE.HARD_FORK_INITIATION_ACTION, text: t("pool.typeHardFork") },
+    { value: POOLS_ACTION_TYPE.PARAMETER_CHANGE_ACTION, text: t("drep.protocolChange") },
+    { value: POOLS_ACTION_TYPE.TREASURY_WITHDRAWALS_ACTION, text: t("drep.treasuryWithdrawals") },
     { value: POOLS_ACTION_TYPE.INFO_ACTION, text: t("pool.typeInfo") }
   ];
 

diff --git a/src/components/share/styled.ts b/src/components/share/styled.ts
@@ -73,6 +73,7 @@ export const FlexCenter = styled(Box)`
 
 export const TruncateSubTitleContainer = styled(Box)(({ theme }) => ({
   maxWidth: "70vw",
+  textTransform: "lowercase",
   [theme.breakpoints.up("sm")]: {
     maxWidth: "60vw"
   },

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -1014,9 +1014,12 @@
   "pool.abstain": "Abstain",
   "pool.none": "None",
   "pool.typeMotion": "Motion of No-Confidence",
-  "pool.typeConstitutional": "Constitutional Committee",
+  "pool.typeConstitutional": "Constitutional Committe Updates",
   "pool.typeUpdate": "Update to the Constitutional or proposal policy",
   "pool.typeHardFork": "Hard-Fork Initiation",
+  "drep.updateConstitution": "Update to the Constitution",
+  "drep.protocolChange": "Protocol Parameter Changes",
+  "drep.treasuryWithdrawals": "Treasury Withdrawals",
   "pool.typeProtocol": "Protocol Parameter Changes",
 
   "pool.typeTreasury": "Treasury Withdrawals",

diff --git a/src/pages/DrepDetail/index.tsx b/src/pages/DrepDetail/index.tsx
@@ -190,7 +190,11 @@ const DrepDetail = () => {
           {t("drep.votingParticipation")}
         </TitleCard>
       ),
-      value: <ValueCard>{data?.votingParticipation}%</ValueCard>
+      value: (
+        <ValueCard>
+          {data?.votingParticipation !== null ? `${formatPercent(data?.votingParticipation)}` : t("common.N/A")}
+        </ValueCard>
+      )
     },
     {
       icon: LifetimeVoteDrepIcon,

diff --git a/src/pages/NativeScriptsAndSC/Card.tsx b/src/pages/NativeScriptsAndSC/Card.tsx
@@ -289,12 +289,12 @@ export const ChipContainer: React.FC<{
   Icon?: string | FunctionComponent<SVGProps<SVGSVGElement>>;
   message?: string | JSX.Element;
   titleTooltip?: string;
-  variant?: "success" | "warning" | "info" | "error";
+  variant?: "success" | "warning" | "info" | "error" | "gray";
   messageColor?: string;
 }> = ({ Icon, message, variant, titleTooltip, messageColor }) => {
   const theme = useTheme();
 
-  const color = (variant?: "success" | "warning" | "info" | "error") => {
+  const color = (variant?: "success" | "warning" | "info" | "error" | "gray") => {
     switch (variant) {
       case "success":
         return theme.palette.success[700];
@@ -304,12 +304,14 @@ export const ChipContainer: React.FC<{
         return theme.palette.warning[700];
       case "error":
         return theme.palette.error[700];
+      case "gray":
+        return theme.palette.secondary[600];
       default:
         return theme.palette.success[700];
     }
   };
 
-  const backgroundColor = (variant?: "success" | "warning" | "info" | "error") => {
+  const backgroundColor = (variant?: "success" | "warning" | "info" | "error" | "gray") => {
     switch (variant) {
       case "success":
         return theme.palette.success[100];
@@ -319,6 +321,8 @@ export const ChipContainer: React.FC<{
         return theme.palette.warning[100];
       case "error":
         return theme.palette.error[100];
+      case "gray":
+        return theme.isDark ? theme.palette.secondary[100] : theme.palette.primary[100];
 
       default:
         return theme.palette.success[100];