From bf4fb29fe6b2b1129600aa41d36ee6f8441845ec Mon Sep 17 00:00:00 2001
From: Sam Keen <samuel.kleinmann@gmail.com>
Date: Fri, 11 Aug 2023 10:08:31 +0100
Subject: [PATCH] fix(governance): fixes settlement oracle display in
 governance (#4534)

---
 apps/governance/.env                                |  1 +
 .../proposal-market-data/proposal-market-data.tsx   |  6 +++---
 .../proposals/components/proposal/proposal.tsx      |  6 +++---
 .../proposals/proposal/proposal-container.tsx       | 13 +++++--------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/apps/governance/.env b/apps/governance/.env
index a9b48bb2e..266d00b1b 100644
--- a/apps/governance/.env
+++ b/apps/governance/.env
@@ -9,6 +9,7 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https:
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
diff --git a/apps/governance/src/routes/proposals/components/proposal-market-data/proposal-market-data.tsx b/apps/governance/src/routes/proposals/components/proposal-market-data/proposal-market-data.tsx
index 6cce4d6fe..bf491b2b3 100644
--- a/apps/governance/src/routes/proposals/components/proposal-market-data/proposal-market-data.tsx
+++ b/apps/governance/src/routes/proposals/components/proposal-market-data/proposal-market-data.tsx
@@ -25,7 +25,7 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
+import type { MarketInfo } from '@vegaprotocol/markets';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import { create } from 'zustand';
 
@@ -47,8 +47,8 @@ export const ProposalMarketData = ({
   marketData,
   parentMarketData,
 }: {
-  marketData: MarketInfoWithData;
-  parentMarketData?: MarketInfoWithData;
+  marketData: MarketInfo;
+  parentMarketData?: MarketInfo;
 }) => {
   const { t } = useTranslation();
   const { isOpen, open, close } = useMarketDataDialogStore();
diff --git a/apps/governance/src/routes/proposals/components/proposal/proposal.tsx b/apps/governance/src/routes/proposals/components/proposal/proposal.tsx
index 5839e08c3..6a93c3167 100644
--- a/apps/governance/src/routes/proposals/components/proposal/proposal.tsx
+++ b/apps/governance/src/routes/proposals/components/proposal/proposal.tsx
@@ -13,7 +13,7 @@ import Routes from '../../../routes';
 import { ProposalMarketData } from '../proposal-market-data';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
+import type { MarketInfo } from '@vegaprotocol/markets';
 import type { AssetQuery } from '@vegaprotocol/assets';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
@@ -31,8 +31,8 @@ export enum ProposalType {
 export interface ProposalProps {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
   networkParams: Partial<NetworkParamsResult>;
-  newMarketData?: MarketInfoWithData | null;
-  parentMarketData?: MarketInfoWithData | null;
+  newMarketData?: MarketInfo | null;
+  parentMarketData?: MarketInfo | null;
   assetData?: AssetQuery | null;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   restData: any;
diff --git a/apps/governance/src/routes/proposals/proposal/proposal-container.tsx b/apps/governance/src/routes/proposals/proposal/proposal-container.tsx
index a97fcbd69..7f2114eed 100644
--- a/apps/governance/src/routes/proposals/proposal/proposal-container.tsx
+++ b/apps/governance/src/routes/proposals/proposal/proposal-container.tsx
@@ -8,7 +8,7 @@ import { useProposalQuery } from './__generated__/Proposal';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { ENV } from '../../../config';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
+import { marketInfoProvider } from '@vegaprotocol/markets';
 import { useAssetQuery } from '@vegaprotocol/assets';
 import {
   NetworkParams,
@@ -95,7 +95,7 @@ export const ProposalContainer = () => {
     loading: newMarketLoading,
     error: newMarketError,
   } = useDataProvider({
-    dataProvider: marketInfoWithDataProvider,
+    dataProvider: marketInfoProvider,
     skipUpdates: true,
     variables: {
       marketId: data?.proposal?.id || '',
@@ -109,12 +109,9 @@ export const ProposalContainer = () => {
     error: parentMarketIdError,
   } = useParentMarketIdQuery({
     variables: {
-      marketId: newMarketData?.data?.market?.id || '',
+      marketId: newMarketData?.id || '',
     },
-    skip:
-      !FLAGS.SUCCESSOR_MARKETS ||
-      !isSuccessor ||
-      !newMarketData?.data?.market?.id,
+    skip: !FLAGS.SUCCESSOR_MARKETS || !isSuccessor || !newMarketData?.id,
   });
 
   const {
@@ -122,7 +119,7 @@ export const ProposalContainer = () => {
     loading: parentMarketLoading,
     error: parentMarketError,
   } = useDataProvider({
-    dataProvider: marketInfoWithDataProvider,
+    dataProvider: marketInfoProvider,
     skipUpdates: true,
     variables: {
       marketId: parentMarketId?.market?.parentMarketID || '',