Skip to content
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
22 changes: 11 additions & 11 deletions site/src/App/index.jsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import React from "react";
import { HashRouter, Redirect, Route, Switch } from "react-router-dom";
import { connect } from "../services/websocket";
// import { connect } from "../services/websocket";

import Container from "../components/Container";
import { Wrapper, PageWrapper } from "./components";
import ScrollToTop from "../components/ScrollToTop";
import Header from "../pages/Header";
import Footer from "../pages/Footer";
import Tips from "../pages/Tips";
// import Tips from "../pages/Tips";
import TipsRedirect from "../pages/Tips/TipsRedirect";
// import Proposals from "../pages/Proposals";
import ProposalsRedirect from "../pages/Proposals/ProposalsRedirect";
// import CentrifugeProposals from "../pages/CentrifugeProposals";
import Bounties from "../pages/Bounties";
import ChildBounties from "../pages/ChildBounties";
import Burnt from "../pages/Burnt";
import TipDetail from "../pages/TipDetail";
import TipFinders from "../pages/TipFinders";
// import TipDetail from "../pages/TipDetail";
// import TipFinders from "../pages/TipFinders";
import ProposalDetail from "../pages/ProposalDetail";
// import BountyDetail from "../pages/BountyDetail";
import ChildBountyDetail from "../pages/BountyDetail/ChildBountyDetail/index";
Expand All @@ -40,8 +40,8 @@ import ProposalBeneficiaries from "../pages/ProposalBeneficiaries";
import BeneficiariesRedirect from "../pages/Beneficiaries/BeneficiariesRedirect";
import UsersDetail from "../pages/UsersDetail";
import BeneficiariesDetail from "../pages/BeneficiariesDetail";
import CouncilorsDetail from "../pages/CouncilorsDetail";
import Councilors from "../pages/Councilors";
// import CouncilorsDetail from "../pages/CouncilorsDetail";
// import Councilors from "../pages/Councilors";
import Referenda from "../pages/Referenda";

import { usePreload } from "../utils/hooks";
Expand All @@ -56,7 +56,7 @@ import BountyDetailRedirect from "../pages/BountyDetail/BountyDetailRedirect";
export default function App() {
usePreload();

connect();
// connect();

return (
<HashRouter>
Expand All @@ -76,8 +76,8 @@ export default function App() {
<Route exact path="/bounties" component={Bounties} />
<Route exact path="/child-bounties" component={ChildBounties} />
{/* <Route exact path="/transfers" component={Transfers} /> */}
<Route exact path="/tip-finders" component={TipFinders} />
<Route exact path="/tips/:tipId" component={TipDetail} />
{/* <Route exact path="/tip-finders" component={TipFinders} /> */}
{/* <Route exact path="/tips/:tipId" component={TipDetail} /> */}
<Route
exact
path="/proposal-beneficiaries"
Expand Down Expand Up @@ -171,12 +171,12 @@ export default function App() {
path="/beneficiaries/:address/:tableTab?"
component={BeneficiariesDetail}
/>
<Route exact path="/councilors" component={Councilors} />
{/* <Route exact path="/councilors" component={Councilors} />
<Route
exact
path="/councilors/:address"
component={CouncilorsDetail}
/>
/> */}
{/* <Route exact path="/users" component={Users} /> */}
<Route exact path="/users/:address" component={UsersDetail} />
<Route
Expand Down
9 changes: 2 additions & 7 deletions site/src/pages/Header/ScanHeight.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ import styled, { css } from "styled-components";
import { useSelector, useDispatch } from "react-redux";
import Card from "../../components/Card";

import {
chainSelector,
scanHeightSelector,
} from "../../store/reducers/chainSlice";
import { chainSelector } from "../../store/reducers/chainSlice";
import {
currentNodeSelector,
setCurrentNode,
Expand Down Expand Up @@ -231,7 +228,6 @@ const NodeItem = styled.div`
const ScanHeight = () => {
useUpdateNodesDelay();
const dispatch = useDispatch();
const scanHeight = useSelector(scanHeightSelector);
const chain = useSelector(chainSelector);
const currentNode = useSelector(currentNodeSelector);
const nodesSetting = useSelector(nodesSelector);
Expand Down Expand Up @@ -304,8 +300,7 @@ const ScanHeight = () => {
<ImageWithDark
src={`/imgs/logo-${currentChainSettings.value}.svg`}
/>
<DarkMinorLabel>Height</DarkMinorLabel>
<DarkMajorLabel>{`#${scanHeight.toLocaleString()}`}</DarkMajorLabel>
<DarkMinorLabel>{currentChainSettings.name}</DarkMinorLabel>
</div>
<Button isActive={symbolOpen}>
<IconMask
Expand Down
26 changes: 13 additions & 13 deletions site/src/pages/Header/SubHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import TipFindersMenu from "./TipFindersMenu";
import ProposalBeneficiariesMenu from "./ProposalBeneficiariesMenu";
import UsersMenu from "./UsersMenu";
import ReferendaMenu from "./ReferendaMenu";
import { fetchIncomeCount } from "../../store/reducers/incomeSlice";
// import { fetchIncomeCount } from "../../store/reducers/incomeSlice";
import { useSelector, useDispatch } from "react-redux";
import { showMenuTabsSelector } from "../../store/reducers/menuSlice";
import Card from "../../components/Card";
Expand All @@ -32,7 +32,7 @@ import GasFeeIncomeMenu from "./GasFeeIncomeMenu";
import BlockRewardsIncomeMenu from "./BlockRewardsMenu";
import BeneficiariesMenu from "./beneficiariesMenu";
import { fetchOverviewSummary } from "../../store/reducers/overviewSummarySlice";
import CouncilorsMenu from "./councilorsMenu";
// import CouncilorsMenu from "./councilorsMenu";

const Wrapper = styled.div`
position: relative;
Expand Down Expand Up @@ -177,21 +177,21 @@ const TabExampleSecondaryPointing = () => {
active: "/beneficiaries" === pathname,
},
},
{
menuItem: {
as: NavLink,
id: "CouncilorsTab",
to: "/councilors",
key: "councilors",
content: <CouncilorsMenu />,
active: "/councilors" === pathname,
},
},
// {
// menuItem: {
// as: NavLink,
// id: "CouncilorsTab",
// to: "/councilors",
// key: "councilors",
// content: <CouncilorsMenu />,
// active: "/councilors" === pathname,
// },
// },
];
}, [pathname]);

useEffect(() => {
dispatch(fetchIncomeCount());
// dispatch(fetchIncomeCount());
if (isKusama || isPolkadot) {
dispatch(fetchOverviewSummary());
}
Expand Down
8 changes: 5 additions & 3 deletions site/src/pages/Overview/BeneficiaryTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ import Text from "../../components/Text";
import Card from "../../components/Card";
import TableNoDataCell from "../../components/TableNoDataCell";
import { overviewSelector } from "../../store/reducers/overviewSlice";
import { NavLink } from "react-router-dom";
import TextMinor from "../../components/TextMinor";
import GrayImage from "../../components/GrayImage";
import { USER_ROLES } from "../../constants";
import ExternalLink from "../../components/ExternalLink.jsx";
import { chainSelector } from "../../store/reducers/chainSlice";

export const CardWrapper = styled(Card)`
overflow-x: hidden;
Expand Down Expand Up @@ -66,17 +67,18 @@ export const TableCell = styled(Table.Cell)`
const BeneficiaryTable = () => {
const overview = useSelector(overviewSelector);
const data = overview.bestProposalBeneficiaries || [];
const chain = useSelector(chainSelector);

return (
<CardWrapper>
<TitleContainer>
<Title>Top Proposal Beneficiaries</Title>
<NavLink to={"/proposal-beneficiaries"}>
<ExternalLink href={`https://${chain}.subsquare.io/treasury`}>
<LinkButton>
View All
<GrayImage src="/imgs/caret-right.svg" width={24} />
</LinkButton>
</NavLink>
</ExternalLink>
</TitleContainer>

<TableWrapper>
Expand Down
14 changes: 9 additions & 5 deletions site/src/pages/Overview/TopBeneficiariesTable/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
Title,
TitleContainer,
} from "../BeneficiaryTable.jsx";
import { NavLink } from "react-router-dom";
import Table from "../../../components/Table";
import TableNoDataCell from "../../../components/TableNoDataCell.jsx";
import User from "../../../components/User/index.jsx";
Expand All @@ -26,6 +25,8 @@ import ValueDisplay from "../../../components/ValueDisplay.jsx";
import { p_14_medium } from "../../../styles/text.js";
import styled from "styled-components";
import IconMask from "../../../components/Icon/Mask.jsx";
import ExternalLink from "../../../components/ExternalLink.jsx";
import { chainSelector } from "../../../store/reducers/chainSlice";

const TotalValueCellWrapper = styled.div`
${p_14_medium}
Expand All @@ -36,6 +37,7 @@ const TotalValueCellWrapper = styled.div`
export default function TopBeneficiariesTable() {
const dispatch = useDispatch();
const topBeneficiaries = useSelector(topBeneficiariesSelector);
const chain = useSelector(chainSelector);

useEffect(() => {
dispatch(fetchTopBeneficiaries());
Expand All @@ -45,7 +47,7 @@ export default function TopBeneficiariesTable() {
<CardWrapper>
<TitleContainer>
<Title>Top Beneficiaries</Title>
<NavLink to={"/beneficiaries"}>
<ExternalLink href={`https://${chain}.subsquare.io/treasury`}>
<LinkButton>
View All
<IconMask
Expand All @@ -54,7 +56,7 @@ export default function TopBeneficiariesTable() {
color="textSecondary"
/>
</LinkButton>
</NavLink>
</ExternalLink>
</TitleContainer>

<TableWrapper>
Expand All @@ -79,13 +81,15 @@ export default function TopBeneficiariesTable() {
return (
<TableRow key={index}>
<Table.Cell>
<NavLink to={`/beneficiaries/${item.address}`}>
<ExternalLink
href={`https://${chain}.subsquare.io/user/${item.address}/treasury`}
>
<User
role={USER_ROLES.Beneficiary}
address={item.address}
noLink
/>
</NavLink>
</ExternalLink>
</Table.Cell>
<TableCell textAlign={"right"}>
<ProposalsWrapper>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/Overview/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ const Overview = () => {
<TableWrapper>
{!isCentrifuge && <TopBeneficiariesTable />}
{!isKusama && <BeneficiaryTable />}
{currentChainSettings.hasTips && <ProposerTable />}
{/* {currentChainSettings.hasTips && <ProposerTable />} */}
</TableWrapper>
</>
);
Expand Down
10 changes: 9 additions & 1 deletion site/src/pages/Overview/polkadot/treasuryDetail/bounties.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import BigNumber from "bignumber.js";
import { polkadot } from "../../../../utils/chains/polkadot";
import { usePolkadotTreasuryData } from "../../../../context/PolkadotTreasury";
import useFiatPrice from "../../../../hooks/useFiatPrice";
import { ExternalLink } from "./common/assetItem";

const Link = styled(LinkOrigin)`
color: var(--textSecondary);
Expand All @@ -32,7 +33,14 @@ export default function TreasuryDetailBounties() {
<TreasuryDetailItem
title={
<>
<Link to="/bounties">Bounties</Link> · {bountiesCount}
<ExternalLink
href="https://polkadot.subsquare.io/treasury/bounties"
externalIcon
externalIconColor="textSecondary"
>
Bounties
</ExternalLink>
· {bountiesCount}
</>
}
iconSrc="/imgs/data-bounties.svg"
Expand Down