- {
}
* This is particularly to trap an exception thrown by `new URL`
* when an href is not a valid URL, for example, an email address"
*/
+ // eslint-disable-next-line no-console
console.error(err);
}
}
diff --git a/src/layouts/App.scss b/src/layouts/App.scss
index 769be7d89..d3e8bacbd 100644
--- a/src/layouts/App.scss
+++ b/src/layouts/App.scss
@@ -294,14 +294,24 @@ body {
.balances {
text-align: left;
- padding: 25px;
- border-bottom: 1px solid rgba(229, 235, 242, 1);
-
- h2 {
- font-size: 13px;
- color: rgba(0, 29, 53, 1);
- margin: 0;
- margin-bottom: 3px;
+ padding-left: 25px;
+ padding-right: 25px;
+ padding-top: 20px;
+ border-bottom: 1px solid $accent-6;
+ font-size: 11px;
+ color: $body-color;
+ font-weight: normal;
+ font-family: "Open Sans";
+
+ .userBalance,
+ .repBalance {
+ .heading {
+ font-size: 13px;
+ color: $black;
+ margin: 0;
+ margin-bottom: 3px;
+ font-weight: bold;
+ }
}
.noReputation {
@@ -310,44 +320,25 @@ body {
}
.userBalance {
- padding-top: 20px;
-
- div {
- font-size: 11px;
- color: rgba(78, 97, 118, 1);
- font-weight: normal;
- font-family: "Open Sans";
- }
+ padding-bottom: 20px;
}
- .daoBalance {
- margin-bottom: 3px;
+ .repBalance {
font-size: 12px;
- border-bottom: 1px dashed rgba(191, 203, 213, 1);
-
- b,
- span {
- background-color: rgba(252, 253, 255, 1);
- position: relative;
- top: 2px;
- font-weight: normal;
- font-family: "Open Sans";
- }
-
- b {
- display: inline-block;
- padding-right: 5px;
- }
+ margin-bottom: 20px;
+ background-color: rgba(252, 253, 255, 1);
+ font-weight: normal;
+ font-family: "Open Sans";
- span {
- float: right;
- }
+ .rep {
+ display: flex;
- label {
- display: block;
- font-size: 9px;
- margin-bottom: 10px;
- opacity: 0.7;
+ .underline {
+ flex-grow: 2;
+ border-bottom: 1px dashed $gray-2;
+ margin-left: 4px;
+ margin-right: 4px;
+ }
}
}
}
diff --git a/test/integration/profile.ts b/test/integration/profile.ts
index a1030c27f..527ede595 100644
--- a/test/integration/profile.ts
+++ b/test/integration/profile.ts
@@ -12,6 +12,12 @@ describe("Profile page", () => {
daoAddress = addresses.dao.Avatar.toLowerCase();
});
+ it("should also work without a DAO address", async () => {
+ await browser.url(`http://127.0.0.1:3000/profile/${userAddress}`);
+ const profileContainer = await $("*[data-test-id=\"profile-container\"]");
+ await profileContainer.waitForExist();
+ });
+
it("should exist and be editable", async () => {
await browser.url(`http://127.0.0.1:3000/profile/${userAddress}?daoAvatarAddress=${daoAddress}`);
@@ -30,10 +36,4 @@ describe("Profile page", () => {
const submitButton = await $("*[type=\"submit\"]");
await submitButton.click();
});
-
- it("should also work without a DAO address", async () => {
- await browser.url(`http://127.0.0.1:3000/profile/${userAddress}`);
- const profileContainer = await $("*[data-test-id=\"profile-container\"]");
- await profileContainer.waitForExist();
- });
});
Reputation
- { dao ? -
- {dao.name}
-
- :
-
- No Reputation
-
+ { (dao && currentAccountState) ?
+
+
: dao ?
+ Reputation
+
+
+ {dao.name}
+
+
+ No Reputation
+
: ""
}
-
-
);
}
@@ -65,14 +65,11 @@ export default withSubscription({
},
createObservable: ({ dao, address }: IExternalProps) => {
- if (!dao) {
- return of(null);
- }
- const daoState = dao;
const arc = getArc();
return combineLatest(
- address && daoState.dao.member(address).state( { subscribe: true }) || of(null),
+ address,
+ (address && dao && dao.dao.member(address).state( { subscribe: true })) || of(null),
ethBalance(address).pipe(ethErrorHandler()),
arc.GENToken().balanceOf(address).pipe(ethErrorHandler()),
);
diff --git a/src/components/Account/AccountProfilePage.tsx b/src/components/Account/AccountProfilePage.tsx
index 7dd5d83e4..5a1a05afb 100644
--- a/src/components/Account/AccountProfilePage.tsx
+++ b/src/components/Account/AccountProfilePage.tsx
@@ -284,7 +284,7 @@ class AccountProfilePage extends React.ComponentHoldings
-
-
-
-
+ : "" }
+
- Holdings
+
+
+
+
- {accountInfo
+ {(accountInfo && dao)
? {
daoState: IDAOState;
}
-type SubscriptionData = Proposal[];
-type IProps = IExternalProps & ISubscriptionProps;
+interface IState {
+ filteredProposalSet: Array;
+ filtering: boolean;
+}
+
+type SubscriptionData = Array;
+type IProps = IExternalProps & IState & ISubscriptionProps;
+
+const ProposalsHTML = (props:
+{
+ proposals: Array;
+ history: any;
+ daoState: IDAOState;
+ currentAccountAddress: Address;
+}): React.ReactElement => {
+ return <> {
+ props.proposals.map((proposal: Proposal) => {
+ return (> => {
+ const filter: any = {
+ };
+
+ if (titleSearch?.trim()) {
+ filter["title_contains"] = titleSearch;
+ }
-class DaoHistoryPage extends React.Component {
+ return dao.proposals({
+ where: filter,
+ orderBy: "closingAt",
+ orderDirection: "desc",
+ first: PAGE_SIZE,
+ skip,
+ }, { fetchAllData: true });
+};
+
+class DaoHistoryPage extends React.Component {
+
+ private filterString = "";
+
+ constructor(props: IProps) {
+ super(props);
+
+ this.state = {
+ filteredProposalSet: null,
+ filtering: false,
+ };
+ }
public componentDidMount() {
Analytics.track("Page View", {
@@ -34,35 +82,55 @@ class DaoHistoryPage extends React.Component {
});
}
+ onSearchChange = (e: any) => {
+ this.filterString = e.target.value;
+ }
+
+ onSearchExecute = async (e: any) => {
+ let foundProposals: Array;
+ if ((e.type === "blur") || (e.key === "Enter")) {
+ if (this.filterString?.length) {
+ this.setState({ filtering: true });
+ foundProposals = await proposalsQuery(this.props.daoState.dao, 0, this.filterString).pipe(first()).toPromise();
+ }
+ else {
+ foundProposals = null;
+ }
+ this.setState({ filteredProposalSet: foundProposals, filtering: false });
+ }
+ }
+
public render(): RenderOutput {
const { data, hasMoreToLoad, fetchMore, daoState, currentAccountAddress } = this.props;
- const proposals = data;
+ const proposals = this.state.filteredProposalSet ?? data;
- const proposalsHTML = proposals.map((proposal: Proposal) => {
- return ( {
}
public showPreStakeModal = (prediction: number): (_event: any) => void => async (_event: any): Promise => {
- if (!await enableWalletProvider( { showNotification: this.props.showNotification })) { return; }
+ if (!await enableWalletProvider({ showNotification: this.props.showNotification })) { return; }
this.setState({ pendingPrediction: prediction, showPreStakeModal: true });
}
@@ -86,7 +86,7 @@ class StakeButtons extends React.Component {
}
public handleClickPreApprove = async (_event: any): Promise => {
- if (!await enableWalletProvider( { showNotification: this.props.showNotification })) { return; }
+ if (!await enableWalletProvider({ showNotification: this.props.showNotification })) { return; }
const { approveStakingGens } = this.props;
approveStakingGens(this.props.proposal.votingMachine);
@@ -177,9 +177,10 @@ class StakeButtons extends React.Component {
(proposal.stage === IProposalStage.PreBoosted);
const disabledMessage =
- (proposal.stage === IProposalStage.Queued && expired) || proposal.stage === IProposalStage.ExpiredInQueue ? "Can't predict on expired proposals" :
- (proposal.stage === IProposalStage.Boosted || proposal.stage === IProposalStage.QuietEndingPeriod) ? "Can't predict on boosted proposals" :
- (proposal.stage === IProposalStage.Executed) ? `Can't predict on ${proposal.winningOutcome === IProposalOutcome.Pass ? "passed" : "failed"} proposals` : "";
+ (proposal.stage !== IProposalStage.Executed) ?
+ ((proposal.stage === IProposalStage.Queued && expired) || proposal.stage === IProposalStage.ExpiredInQueue ? "Can't predict on expired proposals" :
+ (proposal.stage === IProposalStage.Boosted || proposal.stage === IProposalStage.QuietEndingPeriod) ? "Can't predict on boosted proposals" : "")
+ : "";
const hasGens = currentAccountGens && currentAccountGens.gt(new BN(0));
@@ -206,13 +207,13 @@ class StakeButtons extends React.Component {
const passButton = (
);
const failButton = (
);
diff --git a/src/components/Proposal/Voting/VoteButtons.tsx b/src/components/Proposal/Voting/VoteButtons.tsx
index e72e3e8a6..5fa7d5404 100644
--- a/src/components/Proposal/Voting/VoteButtons.tsx
+++ b/src/components/Proposal/Voting/VoteButtons.tsx
@@ -19,7 +19,7 @@ interface IExternalProps {
contextMenu?: boolean;
currentAccountAddress: Address;
currentAccountState: IMemberState;
- currentVote: IProposalOutcome|undefined;
+ currentVote: IProposalOutcome | undefined;
dao: IDAOState;
expired?: boolean;
parentPage: Page;
@@ -35,7 +35,7 @@ type IProps = IExternalProps & IDispatchProps;
interface IState {
contextMenu?: boolean;
- currentVote: IProposalOutcome|undefined;
+ currentVote: IProposalOutcome | undefined;
showPreVoteModal: boolean;
}
@@ -96,48 +96,48 @@ class VoteButtons extends React.Component {
} = this.props;
const votingDisabled = proposal.stage === IProposalStage.ExpiredInQueue ||
- proposal.stage === IProposalStage.Executed ||
- (proposal.stage === IProposalStage.Queued && expired) ||
- (proposal.stage === IProposalStage.Boosted && expired) ||
- (proposal.stage === IProposalStage.QuietEndingPeriod && expired) ||
- (currentAccountState && currentAccountState.reputation.eq(new BN(0))) ||
- (currentAccountState && (proposal.createdAt < currentAccountState.createdAt) &&
- //this is a workaround till https://github.com/daostack/subgraph/issues/548
- (targetedNetwork() !== "ganache")) ||
- currentVote === IProposalOutcome.Pass ||
- currentVote === IProposalOutcome.Fail
- ;
+ proposal.stage === IProposalStage.Executed ||
+ (proposal.stage === IProposalStage.Queued && expired) ||
+ (proposal.stage === IProposalStage.Boosted && expired) ||
+ (proposal.stage === IProposalStage.QuietEndingPeriod && expired) ||
+ (currentAccountState && currentAccountState.reputation.eq(new BN(0))) ||
+ (currentAccountState && (proposal.createdAt < currentAccountState.createdAt) &&
+ //this is a workaround till https://github.com/daostack/subgraph/issues/548
+ (targetedNetwork() !== "ganache")) ||
+ currentVote === IProposalOutcome.Pass ||
+ currentVote === IProposalOutcome.Fail
+ ;
/**
* only used when votingDisabled
*/
const disabledMessage =
- ((currentVote === IProposalOutcome.Pass) || (currentVote === IProposalOutcome.Fail)) ?
- "Can't change your vote" :
- (currentAccountState && currentAccountState.reputation.eq(new BN(0))) ?
- "Requires reputation in this DAO" :
- /**
- * The following condition deduces that the user could not have had rep when the
- * proposal was created because of the following behavior in the subgraph:
- *
- * 1) `currentAccountState` (`ReputationHolder` in the subgraph) represents an entity that associates
- * a single DAO with an ethereum account
- * 2) currentAccountState can only exist in the subgraph when the account has > 0 rep in the DAO
- * 3) `currentAccountState.createdAt` is set only once: When currentAccountState is being instantiated
- * for the first time, in response to a Mint event that brings the rep > 0
- * 4) when a Burn event brings the rep <= 0, then the entity is removed from the subgraph
- * 5) when `currentAccount` is not found in the subgraph, then a fake `currentAccountState` is created with
- * rep == 0
- */
- (currentAccountState && (proposal.createdAt < currentAccountState.createdAt)) ?
- "Must have had reputation in this DAO when the proposal was created" :
- proposal.stage === IProposalStage.ExpiredInQueue ||
+ (proposal.stage !== IProposalStage.Executed) ?
+ (((currentVote === IProposalOutcome.Pass) || (currentVote === IProposalOutcome.Fail)) ?
+ "Can't change your vote" :
+ (currentAccountState && currentAccountState.reputation.eq(new BN(0))) ?
+ "Requires reputation in this DAO" :
+ /**
+ * The following condition deduces that the user could not have had rep when the
+ * proposal was created because of the following behavior in the subgraph:
+ *
+ * 1) `currentAccountState` (`ReputationHolder` in the subgraph) represents an entity that associates
+ * a single DAO with an ethereum account
+ * 2) currentAccountState can only exist in the subgraph when the account has > 0 rep in the DAO
+ * 3) `currentAccountState.createdAt` is set only once: When currentAccountState is being instantiated
+ * for the first time, in response to a Mint event that brings the rep > 0
+ * 4) when a Burn event brings the rep <= 0, then the entity is removed from the subgraph
+ * 5) when `currentAccount` is not found in the subgraph, then a fake `currentAccountState` is created with
+ * rep == 0
+ */
+ (currentAccountState && (proposal.createdAt < currentAccountState.createdAt)) ?
+ "Must have had reputation in this DAO when the proposal was created" :
+ proposal.stage === IProposalStage.ExpiredInQueue ||
(proposal.stage === IProposalStage.Boosted && expired) ||
(proposal.stage === IProposalStage.QuietEndingPeriod && expired) ||
(proposal.stage === IProposalStage.Queued && expired) ?
- "Can't vote on expired proposals" :
- proposal.stage === IProposalStage.Executed ?
- `Can't vote on ${proposal.winningOutcome === IProposalOutcome.Pass ? "passed" : "failed"} proposals` : "";
+ "Can't vote on expired proposals" : "")
+ : "";
const voteUpButtonClass = classNames({
[css.votedFor]: currentVote === IProposalOutcome.Pass,
@@ -177,10 +177,10 @@ class VoteButtons extends React.Component {
@@ -188,13 +188,13 @@ class VoteButtons extends React.Component {
{
:
@@ -228,12 +228,12 @@ class VoteButtons extends React.Component {
@@ -245,12 +245,12 @@ class VoteButtons extends React.Component {
Rep. Score
: ""}
{genName()}:
{formatTokens(genBalance)}
diff --git a/src/components/Buidlhub/Registration.scss b/src/components/Buidlhub/Registration.scss
index 210d28cd0..281ba52e0 100644
--- a/src/components/Buidlhub/Registration.scss
+++ b/src/components/Buidlhub/Registration.scss
@@ -1,101 +1,97 @@
.bhubRegContainer {
+ width: 100% !important;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ align-content: flex-start;
+ align-items: flex-start;
+ padding: 10px;
+
+ .bhubIcon {
width: 100% !important;
display: flex;
+ text-align: left;
flex-direction: column;
justify-content: flex-start;
- align-content: flex-start;
align-items: flex-start;
- padding: 10px;
+ padding: 0 !important;
+ margin-left: -40px !important;
+ }
+ .inputWrapper {
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ align-items: flex-start;
- .bhubIcon {
- width: 100% !important;
- display: flex;
- text-align: left;
- flex-direction: column;
- justify-content: flex-start;
- align-items: flex-start;
- padding: 0 !important;
- margin-left: -40px !important;
+ .emailInput {
+ border-radius: 5px;
+ height: 30px !important;
+ padding: 5px;
+ border: 1px solid #aaa;
+ margin-right: 5px !important;
}
- .inputWrapper {
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- align-items: flex-start;
-
- .emailInput {
- border-radius: 5px;
- height: 30px !important;
- padding: 5px;
- border: 1px solid #aaa;
- margin-right: 5px !important;
- }
-
-
- .sendButtonWrapper {
- height: 30px;
- display: inline-flex;
- justify-content: center;
- align-items: center;
+ .sendButtonWrapper {
+ height: 30px;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
- .sendButton {
- background-color: rgba(104, 155, 214, 1);
- border: 1px solid #333;
- border-radius: 5px;
- color: white;
+ .sendButton {
+ background-color: rgba(104, 155, 214, 1);
+ border: 1px solid #333;
+ border-radius: 5px;
+ color: white;
- &:hover {
- background-color: rgba(3, 118, 255, 1);
- cursor: pointer;
- }
- }
+ &:hover {
+ background-color: rgba(3, 118, 255, 1);
+ cursor: pointer;
+ }
+ }
- .sendButtonDisabled {
- background-color: #ccc;
- border: 1px solid #aaa;
- border-radius: 5px;
- color: #aaa;
- &:hover {
- cursor: default;
- }
- }
+ .sendButtonDisabled {
+ background-color: #ccc;
+ border: 1px solid #aaa;
+ border-radius: 5px;
+ color: #aaa;
+ &:hover {
+ cursor: default;
}
+ }
}
+ }
- .error {
- width: 100% !important;
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- align-items: flex-start;
- color: red;
- font-size: 1rem;
- }
+ .error {
+ width: 100% !important;
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ align-items: flex-start;
+ color: red;
+ font-size: 1rem;
+ }
-
- .success {
- width: 100% !important;
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- align-items: flex-start;
- color: green;
- font-size: 1.3rem;
+ .success {
+ width: 100% !important;
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ align-items: flex-start;
+ color: $accent-3;
+ font-size: 1.3rem;
- .message {
- color: #333;
- font-size: .9rem;
- font-weight: 100;
- padding-left: 20px;
- }
+ .message {
+ color: #333;
+ font-size: 0.9rem;
+ font-weight: 100;
+ padding-left: 20px;
}
+ }
- .description {
-
- font-size: 1rem !important;
- font-weight: 100 !important;
- padding-bottom: 10px;
- }
-}
\ No newline at end of file
+ .description {
+ font-size: 1rem !important;
+ font-weight: 100 !important;
+ padding-bottom: 10px;
+ }
+}
diff --git a/src/components/Dao/Dao.scss b/src/components/Dao/Dao.scss
index caeb6398f..ecb4f1e0a 100644
--- a/src/components/Dao/Dao.scss
+++ b/src/components/Dao/Dao.scss
@@ -103,17 +103,6 @@ button:hover {
}
}
-.proposalHistoryTable {
- width: 100%;
- border-collapse: collapse;
-}
-
-.proposalHistoryTableHeader {
- font-size: 12px;
- font-weight: bold;
- text-align: left;
-}
-
.noticeWrapper {
width: 100%;
position: fixed;
@@ -263,17 +252,6 @@ a {
}
}
-.daoHistoryHeader {
- font-size: 28px;
- color: rgba(104, 155, 214, 1);
- border-bottom: 1px solid rgba(45, 109, 181, 0.2);
- padding-bottom: 5px;
- font-weight: bold;
- margin-bottom: 30px;
- background-color: rgba(229, 235, 242, 1);
- padding-top: 10px;
-}
-
@media only screen and (max-width: 425px) {
.outer {
display: block;
@@ -353,14 +331,6 @@ a {
.membersContainer h2 {
padding-left: 10px;
}
-
- .daoHistoryHeader {
- padding-left: 10px;
- }
-
- .proposalHistoryTableHeader {
- display: none;
- }
}
:global .infinite-scroll-component {
diff --git a/src/components/Dao/DaoHistoryPage.scss b/src/components/Dao/DaoHistoryPage.scss
new file mode 100644
index 000000000..3d6d8ef08
--- /dev/null
+++ b/src/components/Dao/DaoHistoryPage.scss
@@ -0,0 +1,77 @@
+.container {
+ .daoHistoryHeader {
+ font-size: 28px;
+ color: rgba(104, 155, 214, 1);
+ border-bottom: 1px solid rgba(45, 109, 181, 0.2);
+ padding-bottom: 5px;
+ font-weight: bold;
+ margin-bottom: 30px;
+ background-color: rgba(229, 235, 242, 1);
+ padding-top: 10px;
+ }
+
+ .proposalHistoryTable {
+ width: 100%;
+ border-collapse: collapse;
+ }
+
+ .proposalHistoryTableHeader {
+ font-size: 12px;
+ font-weight: bold;
+ text-align: left;
+ }
+
+ .searchBox {
+ margin-bottom: 20px;
+ width: 425px;
+ border-radius: 20px;
+ height: 30px;
+ background: url("/assets/images/Icon/search.svg") $white no-repeat left 6px center;
+ background-size: 18px;
+ padding-left: 30px;
+
+ input:-webkit-autofill {
+ transition: all 5000s ease-in-out 0s;
+ }
+
+ &.filtering {
+ background: url("/assets/images/Icon/buttonLoadingBlue.gif") $white no-repeat left 6px center;
+ }
+
+ input {
+ border: none;
+ font-family: "AccordBold", sans-serif;
+ height: 30px;
+ width: 406px;
+ font-size: 15px;
+ color: #4f6176;
+ }
+
+ input:focus {
+ outline: none;
+ }
+
+ button {
+ height: 26px;
+ display: inline-block;
+ position: relative;
+ top: 2px;
+ border: none;
+ outline: none;
+ background-color: transparent;
+
+ &:hover {
+ cursor: pointer;
+ }
+ }
+ }
+
+ @media only screen and (max-width: 425px) {
+ .daoHistoryHeader {
+ padding-left: 10px;
+ }
+ .proposalHistoryTableHeader {
+ display: none;
+ }
+ }
+}
diff --git a/src/components/Dao/DaoHistoryPage.tsx b/src/components/Dao/DaoHistoryPage.tsx
index 97402686a..17a5b4939 100644
--- a/src/components/Dao/DaoHistoryPage.tsx
+++ b/src/components/Dao/DaoHistoryPage.tsx
@@ -1,4 +1,4 @@
-import { Address, IDAOState, IProposalStage, Proposal, Vote, Scheme, Stake } from "@daostack/arc.js";
+import { Address, IDAOState, Proposal, Vote, Scheme, Stake, DAO } from "@daostack/arc.js";
import { getArc } from "arc";
import Loading from "components/Shared/Loading";
import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription";
@@ -9,10 +9,10 @@ import * as React from "react";
import { BreadcrumbsItem } from "react-breadcrumbs-dynamic";
import InfiniteScroll from "react-infinite-scroll-component";
import { Link, RouteComponentProps } from "react-router-dom";
-import * as Sticky from "react-stickynode";
import { first } from "rxjs/operators";
import ProposalHistoryRow from "../Proposal/ProposalHistoryRow";
-import * as css from "./Dao.scss";
+import * as css from "./DaoHistoryPage.scss";
+import { Observable } from "rxjs";
const PAGE_SIZE = 50;
@@ -21,10 +21,58 @@ interface IExternalProps extends RouteComponentProps{formatTokens(genBalance)}
+ const result = (
+
History
-
-
+
{proposals.length === 0 ?
- This DAO hasn't passed any proposals yet. Checkout the DAO's installed schemes for any open proposals. :
+ this.state.filteredProposalSet ?
+ No proposals found whose title contains the given text. Note the filter is case-sensitive. :
+ {this.props.daoState.name} hasn't created any proposals yet. Go to the DAO's installed plugins to create proposals. :
+
}
@@ -85,6 +157,8 @@ class DaoHistoryPage extends React.Component {
);
+
+ return result;
}
}
@@ -103,11 +177,12 @@ export default withSubscription({
// with all separate queries for votes and stakes and stuff...
let voterClause = "";
let stakerClause = "";
+
if (props.currentAccountAddress) {
voterClause = `(where: { voter: "${props.currentAccountAddress}"})`;
stakerClause = `(where: { staker: "${props.currentAccountAddress}"})`;
-
}
+
const prefetchQuery = gql`
query prefetchProposalDataForDAOHistory {
proposals (
@@ -117,12 +192,6 @@ export default withSubscription({
orderDirection: "desc"
where: {
dao: "${dao.id}"
- stage_in: [
- "${IProposalStage[IProposalStage.ExpiredInQueue]}",
- "${IProposalStage[IProposalStage.Executed]}",
- "${IProposalStage[IProposalStage.Queued]}"
- ]
- closingAt_lte: "${Math.floor(new Date().getTime() / 1000)}"
}
){
...ProposalFields
@@ -139,20 +208,10 @@ export default withSubscription({
${Stake.fragments.StakeFields}
${Scheme.fragments.SchemeFields}
`;
+
await arc.getObservable(prefetchQuery, { subscribe: true }).pipe(first()).toPromise();
- return dao.proposals({
- where: {
- // eslint-disable-next-line @typescript-eslint/camelcase
- stage_in: [IProposalStage.ExpiredInQueue, IProposalStage.Executed, IProposalStage.Queued],
- // eslint-disable-next-line @typescript-eslint/camelcase
- closingAt_lte: Math.floor(new Date().getTime() / 1000),
- },
- orderBy: "closingAt",
- orderDirection: "desc",
- first: PAGE_SIZE,
- skip: 0,
- }, { fetchAllData: true } // get and subscribe to all data, so that subcomponents do nto have to send separate queries
- );
+
+ return proposalsQuery(dao, 0);
},
// used for hacky pagination tracking
@@ -160,18 +219,6 @@ export default withSubscription({
getFetchMoreObservable: (props: IExternalProps, data: SubscriptionData) => {
const dao = props.daoState.dao;
- return dao.proposals({
- where: {
- // eslint-disable-next-line @typescript-eslint/camelcase
- stage_in: [IProposalStage.ExpiredInQueue, IProposalStage.Executed, IProposalStage.Queued],
- // eslint-disable-next-line @typescript-eslint/camelcase
- closingAt_lte: Math.floor(new Date().getTime() / 1000),
- },
- orderBy: "closingAt",
- orderDirection: "desc",
- first: PAGE_SIZE,
- skip: data.length,
- }, { fetchAllData: true } // get and subscribe to all data, so that subcomponents do nto have to send separate queries
- );
+ return proposalsQuery(dao, data.length);
},
});
diff --git a/src/components/Daos/DaosPage.tsx b/src/components/Daos/DaosPage.tsx
index 5e75be5f8..548f28b74 100644
--- a/src/components/Daos/DaosPage.tsx
+++ b/src/components/Daos/DaosPage.tsx
@@ -183,7 +183,9 @@ class DaosPage extends React.Component {
diff --git a/src/components/Proposal/Staking/StakeButtons.tsx b/src/components/Proposal/Staking/StakeButtons.tsx
index 08c8187bc..a1af50126 100644
--- a/src/components/Proposal/Staking/StakeButtons.tsx
+++ b/src/components/Proposal/Staking/StakeButtons.tsx
@@ -28,7 +28,7 @@ interface IExternalProps {
beneficiaryProfile?: IProfileState;
contextMenu?: boolean;
currentAccountAddress?: Address;
- currentAccountGens: BN|null;
+ currentAccountGens: BN | null;
currentAccountGenStakingAllowance: BN;
dao: IDAOState;
expired?: boolean;
@@ -77,7 +77,7 @@ class StakeButtons extends React.Component
- History
-
- History
+
+
+
+
Your DAOs - + {process.env.NETWORK !== "xdai" ? + + : "" }
- You voted
+ You voted
- Vote
+ Vote
- 
-
+
+
For -
-
+
+
Against
@@ -204,18 +204,18 @@ class VoteButtons extends React.Component
- +
+ For -
- +
+ Against
- 
{disabledMessage}
+ {disabledMessage}
}
{disabledMessage}
+ {disabledMessage}
- You voted
+ You voted
- - For
+ - For
- - Against
+ - Against
diff --git a/src/components/Shared/ProposalDescription.tsx b/src/components/Shared/ProposalDescription.tsx
index a7009036a..3f4c197d7 100644
--- a/src/components/Shared/ProposalDescription.tsx
+++ b/src/components/Shared/ProposalDescription.tsx
@@ -58,6 +58,7 @@ export default class ProposalDescription extends React.Component