approval banner fix, and graphql dependabot update

modules/polling/components/PollWinningOptionBox.tsx

@@ -38,12 +38,6 @@ export default function PollWinningOptionBox({
       result.mkrSupport === tally.results[0].mkrSupport
   ).length;
 
-  // Winner will be null if the winning conditions are not met, but we want to display the leading option too
-  const leadingOption = typeof tally.winner === 'number' ? tally.winner : tally.results[0].optionId;
-  const leadingOptionName = `${
-    typeof tally.winner === 'number' ? tally.winningOptionName : tally.results[0].optionName
-  }${numberOfLeadingOptions > 1 ? ` & ${numberOfLeadingOptions - 1} more` : ''}`;
-
   const winningVictoryCondition = tally.parameters.victoryConditions.find(
     (v, index) => index === tally.victoryConditionMatched
   );
@@ -66,6 +60,13 @@ export default function PollWinningOptionBox({
     isDefault = true;
   }
 
+    // Winner will be null if the winning conditions are not met, but we want to display the leading option too
+    const leadingOption = typeof tally.winner === 'number' ? tally.winner : tally.results[0].optionId;
+    const leadingOptionName = `${
+      typeof tally.winner === 'number' ? tally.winningOptionName : tally.results[0].optionName
+      //don't show "& n more" if isDefault since there's only ever 1 default option
+    }${!isDefault && numberOfLeadingOptions > 1 ? ` & ${numberOfLeadingOptions - 1} more` : ''}`;
+
   return (
     <Flex sx={{ py: 2, justifyContent: 'center' }}>
       <ErrorBoundary componentName="Winning option">

modules/polling/helpers/parsePollMetadata.ts

@@ -32,7 +32,20 @@ export async function parsePollMetadata(
     [key: number]: string[];
   }
 ): Promise<Poll> {
-  const { data: pollMeta, content } = matter(document || '');
+  const { data: pollMeta, content } = matter(document || '', {
+    engines: {
+      javascript: {
+        parse: function () {
+          console.log('Parsing JavaScript is not allowed');
+          return {};
+        },
+        stringify: function () {
+          console.log('Stringifying JavaScript is not allowed');
+          return '';
+        }
+      }
+    }
+  });
   const summary = pollMeta?.summary || '';
   const title = pollMeta?.title || '';
   const options = pollMeta.options;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "governance-portal-v2",
   "license": "AGPL-3.0-only",
-  "version": "0.11.7",
+  "version": "0.11.8",
   "engines": {
     "node": ">=16.0.0"
   },
@@ -139,7 +139,7 @@
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-testing-library": "^5.10.2",
     "glob": "^8.0.3",
-    "graphql": "^16.2.0",
+    "graphql": "^16.8.1",
     "hardhat": "^2.12.1-unknown-txs.0",
     "husky": "^6.0.0",
     "istanbul-lib-coverage": "^3.2.0",

yarn.lock

@@ -8660,10 +8660,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.12.1.tgz#c62d5ac54dbd409cc6520b0b39de374b3d59d0dd"
   integrity sha512-umt4f5NnMK46ChM2coO36PTFhHouBrK9stWWBczERguwYrGnPNxJ9dimU6IyOBfOkC6Izhkg4H8+F51W/8CYDg==
 
-graphql@^16.2.0:
-  version "16.6.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb"
-  integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==
+graphql@^16.8.1:
+  version "16.8.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07"
+  integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==
 
 gray-matter@^4.0.2:
   version "4.0.3"