Skip to content

Commit 998f3c1

Browse files
authored
Merge pull request #3264 from emmanuel-musau/chore/outcomes-1.3.0
chore(outcomes): add background color and upgrade to v1.3.0 with nece…
2 parents f3835ce + 24cbf0f commit 998f3c1

File tree

5 files changed

+65
-50
lines changed

5 files changed

+65
-50
lines changed

govtool/frontend/package-lock.json

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

govtool/frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@emotion/styled": "^11.11.0",
2828
"@emurgo/cardano-serialization-lib-asmjs": "^12.1.1",
2929
"@hookform/resolvers": "^3.3.1",
30-
"@intersect.mbo/govtool-outcomes-pillar-ui": "1.2.5",
30+
"@intersect.mbo/govtool-outcomes-pillar-ui": "1.3.0",
3131
"@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
3232
"@intersect.mbo/pdf-ui": "0.6.4",
3333
"@mui/icons-material": "^5.14.3",

govtool/frontend/src/pages/GovernanceActionOutComes.tsx

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,52 +3,57 @@ import React, { Suspense } from "react";
33
import { Footer, TopNav } from "@/components/organisms";
44
import { useCardano } from "@/context";
55
import { useScreenDimension } from "@/hooks";
6+
import { Background } from "@/components/atoms";
67

78
const GovernanceActionsOutcomes = React.lazy(
89
() => import("@intersect.mbo/govtool-outcomes-pillar-ui/dist/esm"),
910
);
1011

1112
export const GovernanceActionOutComesPillar = () => {
1213
const { pagePadding } = useScreenDimension();
13-
const { ...context } = useCardano();
14+
const { walletApi, ...context } = useCardano();
1415
return (
15-
<Box
16-
sx={{
17-
display: "flex",
18-
flexDirection: "column",
19-
flex: 1,
20-
minHeight: !context.isEnabled ? "100vh" : "auto",
21-
}}
22-
>
23-
{!context.isEnabled && <TopNav />}
16+
<Background>
2417
<Box
2518
sx={{
26-
px: context.isEnabled ? { xs: 2, sm: 5 } : pagePadding,
27-
py: 3,
2819
display: "flex",
20+
flexDirection: "column",
2921
flex: 1,
22+
minHeight: !context.isEnabled ? "100vh" : "auto",
3023
}}
3124
>
32-
<Suspense
33-
fallback={
34-
<Box
35-
sx={{
36-
display: "flex",
37-
flex: 1,
38-
alignItems: "center",
39-
justifyContent: "center",
40-
}}
41-
>
42-
<CircularProgress />
43-
</Box>
44-
}
25+
{!context.isEnabled && <TopNav />}
26+
<Box
27+
sx={{
28+
px: context.isEnabled ? { xs: 2, sm: 5 } : pagePadding,
29+
py: 3,
30+
display: "flex",
31+
flex: 1,
32+
}}
4533
>
46-
<GovernanceActionsOutcomes
47-
apiUrl={import.meta.env.VITE_OUTCOMES_API_URL}
48-
/>
49-
</Suspense>
34+
<Suspense
35+
fallback={
36+
<Box
37+
sx={{
38+
display: "flex",
39+
flex: 1,
40+
alignItems: "center",
41+
justifyContent: "center",
42+
}}
43+
>
44+
<CircularProgress />
45+
</Box>
46+
}
47+
>
48+
<GovernanceActionsOutcomes
49+
apiUrl={import.meta.env.VITE_OUTCOMES_API_URL}
50+
ipfsGateway={import.meta.env.VITE_IPFS_GATEWAY}
51+
walletAPI={{ ...context, ...walletApi }}
52+
/>
53+
</Suspense>
54+
</Box>
55+
{!context.isEnabled && <Footer />}
5056
</Box>
51-
{!context.isEnabled && <Footer />}
52-
</Box>
57+
</Background>
5358
);
5459
};

govtool/frontend/src/types/@intersect.mbo.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ type ProposalDiscussionProps = {
2828

2929
type GovernanceActionsOutcomesProps = {
3030
apiUrl?: string;
31+
ipfsGateway?: string;
32+
walletAPI?: any;
3133
};
3234

3335
declare module "@intersect.mbo/pdf-ui/cjs" {

govtool/frontend/yarn.lock

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,16 +1487,20 @@
14871487
resolved "https://registry.npmjs.org/@inquirer/type/-/type-3.0.4.tgz"
14881488
integrity sha512-2MNFrDY8jkFYc9Il9DgLsHhMzuHnOYM1+CUYVWbzu9oT0hC7V7EcYvdCKeoll/Fcci04A+ERZ9wcc7cQ8lTkIA==
14891489

1490-
"@intersect.mbo/govtool-outcomes-pillar-ui@1.2.5":
1491-
version "1.2.5"
1492-
resolved "https://registry.npmjs.org/@intersect.mbo/govtool-outcomes-pillar-ui/-/govtool-outcomes-pillar-ui-1.2.5.tgz"
1493-
integrity sha512-z0QDUZKj262vvNCtjr2L8ILgeub8da3ryhMhgLJpuxuO1zfEBUhTuwUPkRuLBE1Gf52TW/AfgmR2qXANsjY4/Q==
1490+
"@intersect.mbo/govtool-outcomes-pillar-ui@1.3.0":
1491+
version "1.3.0"
1492+
resolved "https://registry.npmjs.org/@intersect.mbo/govtool-outcomes-pillar-ui/-/govtool-outcomes-pillar-ui-1.3.0.tgz"
1493+
integrity sha512-6+H+QG8kyM2UUEycNsjrF1K5+UGUw6+wy7gRxlyOtFjIrZ9CUdTfwwyD1hrh+g55awZ4t+EmQgYB00An0iXOag==
14941494
dependencies:
14951495
"@fontsource/poppins" "^5.0.14"
14961496
"@intersect.mbo/intersectmbo.org-icons-set" "^1.0.8"
1497-
axios "^1.7.9"
1497+
axios "^1.8.4"
14981498
bech32 "^2.0.0"
14991499
buffer "^6.0.3"
1500+
react-diff-view "^3.2.1"
1501+
rehype-katex "^7.0.1"
1502+
remark-math "^6.0.0"
1503+
unidiff "^1.0.4"
15001504

15011505
"@intersect.mbo/intersectmbo.org-icons-set@^1.0.8", "@intersect.mbo/intersectmbo.org-icons-set@^1.1.0":
15021506
version "1.1.0"
@@ -4486,10 +4490,10 @@ axe-core@^4.10.0:
44864490
resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz"
44874491
integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==
44884492

4489-
axios@^1.4.0, axios@^1.6.1, axios@^1.7.2, axios@^1.7.9:
4490-
version "1.7.9"
4491-
resolved "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz"
4492-
integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
4493+
axios@^1.4.0, axios@^1.6.1, axios@^1.7.2, axios@^1.8.4:
4494+
version "1.8.4"
4495+
resolved "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz"
4496+
integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==
44934497
dependencies:
44944498
follow-redirects "^1.15.6"
44954499
form-data "^4.0.0"

0 commit comments

Comments
 (0)