Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: v2, move summary code #4038

Merged
merged 3 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/kintsugi-next/pages/democracy/proposals/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import PostList from "next-common/components/postList";
import { EmptyList } from "next-common/utils/constants";
import { withCommonProps } from "next-common/lib";
import nextApi from "next-common/services/nextApi";
import DemocracySummary from "next-common/components/summary/v2/democracySummary";
import DemocracySummary from "next-common/components/summary/democracySummary";
import { useChain } from "next-common/context/chain";
import KintsugiDemocracyStaking from "components/summary/kintsugiDemocracyStaking";
import normalizeProposalListItem from "next-common/utils/viewfuncs/democracy/normalizeProposalListItem";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useSelector } from "react-redux";
import { fellowshipCoreMembersSelector } from "next-common/store/reducers/fellowship/core";
import Summary from "next-common/components/summary/v2/base";
import Summary from "next-common/components/summary";
import { isNil } from "lodash-es";
import LoadableContent from "next-common/components/common/loadableContent";
import { fellowshipCollectiveMembersSelector } from "next-common/store/reducers/fellowship/collective";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PrimaryCard } from "next-common/components/styled/containers/primaryCard";
import SummaryItems from "next-common/components/summary/summaryItems";
import Summary from "next-common/components/summary";
import { ClosedTag } from "next-common/components/tags/state/styled";
import { useSalaryAsset } from "next-common/hooks/useSalaryAsset";
import getCycleBudgetSummaryItem from "../summary/budget";
Expand Down Expand Up @@ -77,7 +77,7 @@ export default function FellowshipSalaryCycleDetailInfoClosed({ cycle = {} }) {
return (
<PrimaryCard>
<div className="flex justify-between gap-x-4">
<SummaryItems
<Summary
items={[
{
title: "Cycle",
Expand All @@ -92,7 +92,7 @@ export default function FellowshipSalaryCycleDetailInfoClosed({ cycle = {} }) {

<hr className="my-4" />

<SummaryItems items={items} />
<Summary items={items} />

<div className="mt-4">
<FellowshipCycleProgress cycle={cycle} />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PrimaryCard } from "next-common/components/styled/containers/primaryCard";
import SummaryItems from "next-common/components/summary/summaryItems";
import Summary from "next-common/components/summary";
import { ActiveTag } from "next-common/components/tags/state/styled";
import getCycleBudgetSummaryItem from "../summary/budget";
import { useSalaryAsset } from "next-common/hooks/useSalaryAsset";
Expand Down Expand Up @@ -102,7 +102,7 @@ export default function FellowshipSalaryCycleDetailInfoOngoing({ cycle = {} }) {
return (
<PrimaryCard>
<div className="flex justify-between gap-x-4">
<SummaryItems
<Summary
items={[
{
title: "Cycle",
Expand All @@ -117,11 +117,11 @@ export default function FellowshipSalaryCycleDetailInfoOngoing({ cycle = {} }) {

<hr className="my-4" />

<SummaryItems
<Summary
items={desktopSummaryItems}
className={cn(navCollapsed ? "max-sm:hidden" : "max-md:hidden")}
/>
<SummaryItems
<Summary
items={mobileSummaryItems}
className={cn(navCollapsed ? "sm:hidden" : "md:hidden")}
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemocracySummaryFooter from "next-common/components/summary/democracySummaryFooter";
import ListLayout from "../ListLayout";
import DemocracySummary from "next-common/components/summary/v2/democracySummary";
import DemocracySummary from "next-common/components/summary/democracySummary";
import { useChain, useChainSettings } from "next-common/context/chain";
import Chains from "next-common/utils/consts/chains";
import { useUser } from "next-common/context/user";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
isLoadingAccountInfoSelector,
} from "next-common/store/reducers/myOnChainData/account";
import LoadableItem from "next-common/components/overview/accountInfo/components/loadableItem";
import Summary from "next-common/components/summary/v2/base";
import Summary from "next-common/components/summary";

export default function AccountBalances() {
const accountInfo = useSelector(accountInfoSelector);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import useSubFellowshipSalaryStats from "next-common/hooks/fellowship/salary/useSubFellowshipSalaryStats";
import useFellowshipSalaryPeriods from "next-common/hooks/fellowship/salary/useFellowshipSalaryPeriods";
import Summary from "next-common/components/summary/v2/base";
import Summary from "next-common/components/summary";
import { useSalaryAsset } from "next-common/hooks/useSalaryAsset";
import { cn } from "next-common/utils";
import { chunk } from "lodash-es";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import LoadableContent from "next-common/components/common/loadableContent";
import { SecondaryCard } from "next-common/components/styled/containers/secondaryCard";
import SummaryItems from "next-common/components/summary/summaryItems";
import Summary from "next-common/components/summary";
import ValueDisplay from "next-common/components/valueDisplay";
import { useChainSettings } from "next-common/context/chain";
import { toPrecision } from "next-common/utils";
Expand All @@ -14,7 +14,7 @@ export default function DemocracyBeenDelegatedSummary({

return (
<SecondaryCard>
<SummaryItems
<Summary
items={[
{
title: "Been Delegated Votes",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import LoadableContent from "next-common/components/common/loadableContent";
import { SecondaryCard } from "next-common/components/styled/containers/secondaryCard";
import SummaryItems from "next-common/components/summary/summaryItems";
import Summary from "next-common/components/summary";

export default function ReferendaBeenDelegatedSummary({
beenDelegatedList,
Expand All @@ -15,7 +15,7 @@ export default function ReferendaBeenDelegatedSummary({

return (
<SecondaryCard>
<SummaryItems
<Summary
items={[
{
title: "Tracks",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import BigNumber from "bignumber.js";
import LoadableContent from "next-common/components/common/loadableContent";
import { SecondaryCard } from "next-common/components/styled/containers/secondaryCard";
import SummaryItems from "next-common/components/summary/summaryItems";
import Summary from "next-common/components/summary";
import ValueDisplay from "next-common/components/valueDisplay";
import { useChainSettings } from "next-common/context/chain";
import { toPrecision } from "next-common/utils";
Expand All @@ -15,7 +15,7 @@ export default function DemocracyDelegatedVotes({ delegating, isLoading }) {

return (
<SecondaryCard>
<SummaryItems
<Summary
items={[
{
title: "Delegated Votes",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import LoadableContent from "next-common/components/common/loadableContent";
import { SecondaryCard } from "next-common/components/styled/containers/secondaryCard";
import SummaryItems from "next-common/components/summary/summaryItems";
import Summary from "next-common/components/summary";
import { profileReferendaDelegationsSelector } from "next-common/store/reducers/profile/referendaDelegations";
import { useSelector } from "react-redux";

Expand All @@ -14,7 +14,7 @@ export default function TracksSummary() {

return (
<SecondaryCard>
<SummaryItems
<Summary
items={[
{
title: "Tracks",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import SummaryItems from "next-common/components/summary/summaryItems";
import Summary from "next-common/components/summary";
import { SecondaryCard } from "next-common/components/styled/containers/secondaryCard";
import { Title } from "./styled";
import { ModuleTab, useAvailableModuleTabs, useModuleName } from "./common";
Expand Down Expand Up @@ -60,7 +60,7 @@ export default function VotingHistorySummary() {
</div>
)}
<SecondaryCard>
<SummaryItems items={items} />
<Summary items={items} />
</SecondaryCard>
</>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import SummaryItems from "next-common/components/summary/summaryItems";
import Summary from "next-common/components/summary";
import ValueDisplay from "next-common/components/valueDisplay";
import { useChainSettings } from "next-common/context/chain";
import { toPrecision } from "next-common/utils";
Expand Down Expand Up @@ -47,5 +47,5 @@ export default function DemocracySummary({ summary }) {
},
];

return <SummaryItems items={items} />;
return <Summary items={items} />;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Summary from "next-common/components/summary/v2/base";
import Summary from "next-common/components/summary";
import { usePageProps } from "next-common/context/page";
import ActiveValue from "../overviewSummary/activeValue";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { extractTime } from "@polkadot/util";
import dayjs from "dayjs";
import CountDown from "next-common/components/summary/countDown";
import { SummaryGreyText } from "next-common/components/summary/styled";
import Summary from "next-common/components/summary/v2/base";
import Summary from "next-common/components/summary";
import Tooltip from "next-common/components/tooltip";
import { useChain, useChainSettings } from "next-common/context/chain";
import { useDemocracySummaryData } from "next-common/hooks/useDemoracySummaryData";
Expand Down
2 changes: 1 addition & 1 deletion packages/next-common/components/summary/gov2Summary.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Summary from "next-common/components/summary/v2/base";
import Summary from "next-common/components/summary";
import { SummaryGreyText } from "next-common/components/summary/styled";

export default function Gov2Summary({ summary }) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useSelector } from "react-redux";
import { blockTimeSelector } from "next-common/store/reducers/chainSlice";
import { estimateBlocksTime, toPrecision } from "next-common/utils";
import { SummaryGreyText } from "next-common/components/summary/styled";
import Summary from "next-common/components/summary/v2/base";
import Summary from "next-common/components/summary";
import ValueDisplay from "next-common/components/valueDisplay";
import { useChainSettings } from "next-common/context/chain";
import Gov2TrackSummaryThresholdCurves from "./gov2TrackSummaryThresholdCurves";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useNavCollapsed } from "next-common/context/nav";
import { SummaryTitle } from "./styled";
import { cn } from "next-common/utils";

export default function SummaryItems({ items, className }) {
export default function Summary({ items, className }) {
const [navCollapsed] = useNavCollapsed();

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
useMenuHasTreasuryChildBounties,
useMenuHasTreasuryTips,
} from "../../../context/chain";
import Summary from "../v2/base";
import Summary from "..";
import isMoonChain from "next-common/utils/isMoonChain";
import { usePageProps } from "next-common/context/page";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import useTreasuryFree from "../../../utils/hooks/useTreasuryFree";
import { useChain } from "../../../context/chain";
import Summary from "../v2/base";
import Summary from "..";
import TreasurySummaryNextBurn from "./nextBurn";
import { isKintsugiChain } from "next-common/utils/chain";
import SpendPeriod from "next-common/components/summary/treasurySummary/spendPeriod";
Expand Down
6 changes: 0 additions & 6 deletions packages/next-common/components/summary/v2/base.jsx

This file was deleted.

2 changes: 1 addition & 1 deletion packages/next/components/alliance/memberSummary.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import Summary from "next-common/components/summary/v2/base";
import Summary from "next-common/components/summary";

export default function MemberSummary({ fellow, ally, retiring }) {
return (
Expand Down
2 changes: 1 addition & 1 deletion packages/next/components/alliance/unscrupulousSummary.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import Summary from "next-common/components/summary/v2/base";
import Summary from "next-common/components/summary";

export default function UnscrupulousSummary({ accounts, websites }) {
return (
Expand Down
4 changes: 2 additions & 2 deletions packages/next/components/myvotes/summary/summary.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { cn, toPrecision } from "next-common/utils";
import { useChainSettings } from "next-common/context/chain";
import { ModuleTab } from "next-common/components/profile/votingHistory/common";
import { SecondaryCard } from "next-common/components/styled/containers/secondaryCard";
import SummaryItems from "next-common/components/summary/summaryItems";
import Summary from "next-common/components/summary";
import BigNumber from "bignumber.js";
import PriorInfo from "./prior";
import LoadableContent from "next-common/components/common/loadableContent";
Expand Down Expand Up @@ -95,7 +95,7 @@ export default function ReferendaVoteSummary({
<ModuleTab />
</div>
<SecondaryCard>
<SummaryItems items={items} />
<Summary items={items} />
</SecondaryCard>
</>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/next/pages/democracy/externals/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import nextApi from "next-common/services/nextApi";
import businessCategory from "next-common/utils/consts/business/category";
import normalizeExternalListItem from "next-common/utils/viewfuncs/democracy/normliazeExternalListItem";
import ListLayout from "next-common/components/layout/ListLayout";
import DemocracySummary from "next-common/components/summary/v2/democracySummary";
import DemocracySummary from "next-common/components/summary/democracySummary";
import { fetchOpenGovTracksProps } from "next-common/services/serverSide";

export default function DemocracyExternalsPage({ externals, chain, summary }) {
Expand Down
2 changes: 1 addition & 1 deletion packages/next/pages/democracy/proposals/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import nextApi from "next-common/services/nextApi";
import businessCategory from "next-common/utils/consts/business/category";
import normalizeProposalListItem from "next-common/utils/viewfuncs/democracy/normalizeProposalListItem";
import ListLayout from "next-common/components/layout/ListLayout";
import DemocracySummary from "next-common/components/summary/v2/democracySummary";
import DemocracySummary from "next-common/components/summary/democracySummary";
import { fetchOpenGovTracksProps } from "next-common/services/serverSide";
import { useChain, useChainSettings } from "next-common/context/chain";
import Chains from "next-common/utils/consts/chains";
Expand Down
Loading