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.

Sign up for GitHub

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

Jump to bottom

Support Join and FundingRequest creation in PluginManager #2144

Merged
merged 5 commits into from
Sep 24, 2020
Merged

Support Join and FundingRequest creation in PluginManager #2144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b27023
added support for join and fr on plugin manager ; need to update arc.…
roienatan Sep 13, 2020
f3c3498
Merge branch 'dev-2' into support-join-and-fr-creation
roienatan Sep 13, 2020
e9ea075
Merge branch 'dev-2' into support-join-and-fr-creation
roienatan Sep 14, 2020
5db04a4
Merge branch 'dev-2' into support-join-and-fr-creation
roienatan Sep 23, 2020
d26a291
fix error of property pluginName does not exist on type never
roienatan Sep 23, 2020
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
28 changes: 25 additions & 3 deletions src/components/Proposal/Create/PluginForms/CreatePluginManagerProposal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ export interface IFormValues {
memberReputation: number;
fundingGoal: number;
fundingGoalDeadline: number;
rageQuitEnable: boolean;
};
TokenTrade: {
permissions: IPermissions;
Expand Down Expand Up @@ -244,7 +243,6 @@ const defaultValues: IFormValues = {
memberReputation: 0,
fundingGoal: 0,
fundingGoalDeadline: 0,
rageQuitEnable: true,
},
SchemeRegistrar: {
votingParamsRegister: { ...votingParams },
Expand Down Expand Up @@ -426,8 +424,32 @@ class CreatePluginManagerProposal extends React.Component<IProps, IState> {
voteRemoveParamsHash: values.SchemeRegistrar.votingParamsRemove.voteParamsHash,
};
break;
case "Join":
proposalOptions.add.pluginInitParams = {
daoId: daoId,
votingMachine: votingMachine,
votingParams: gpFormValuesToVotingParams(values.Join.votingParams),
voteOnBehalf: values.Join.votingParams.voteOnBehalf,
voteParamsHash: values.Join.votingParams.voteParamsHash,
fundingToken: values.Join.fundingToken,
minFeeToJoin: values.Join.minFeeToJoin,
memberReputation: values.Join.memberReputation,
fundingGoal: values.Join.fundingGoal,
fundingGoalDeadline: values.Join.fundingGoalDeadline,
};
break;
case "FundingRequest":
proposalOptions.add.pluginInitParams = {
daoId: daoId,
votingMachine: votingMachine,
votingParams: gpFormValuesToVotingParams(values.FundingRequest.votingParams),
voteOnBehalf: values.FundingRequest.votingParams.voteOnBehalf,
voteParamsHash: values.FundingRequest.votingParams.voteParamsHash,
fundingToken: values.FundingRequest.fundingToken,
};
break;
default:
throw Error(`Unimplemented Plugin Manager Plugin Type ${proposalOptions.add.pluginName}`);
throw Error(`Unimplemented Plugin Manager Plugin Type ${(proposalOptions.add as any).pluginName}`);
}

let permissions = 1;
Expand Down
14 changes: 7 additions & 7 deletions src/components/Proposal/Create/PluginForms/PluginInitializeFields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,19 @@ const ContributionRewardExtFields = () => (

const FundingRequest = () => (
<div>
{fieldView("FundingRequest", "Funding Token", "fundingToken")}
{fieldView("FundingRequest", "Funding Token", "fundingToken", (address: string) => validators.address(address, true))}
{GenesisProtocolFields("FundingRequest.votingParams")}
</div>
);

const Join = () => (
<div>
{fieldView("Join", "Funding Token", "fundingToken")}
{fieldView("Join", "Minimum Join Fee", "minFeeToJoin")}
{fieldView("Join", "Initial Reputation", "memberReputation")}
{fieldView("Join", "Funding Goal", "fundingGoal")}
{fieldView("Join", "Deadline", "fundingGoalDeadline")}
{fieldView("Join", "Allow Rage Quit", "rageQuitEnable")}
{fieldView("Join", "Funding Token", "fundingToken", (address: string) => validators.address(address, true))}
{fieldView("Join", "Minimum Join Fee", "minFeeToJoin", validators.validNumber)}
{fieldView("Join", "Initial Reputation", "memberReputation", validators.validNumber)}
{fieldView("Join", "Funding Goal", "fundingGoal", validators.validNumber)}
{fieldView("Join", "Deadline", "fundingGoalDeadline", validators.validNumber)}
{GenesisProtocolFields("Join.votingParams")}
</div>
);

Expand Down