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

Giveth app #248

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
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
12 changes: 6 additions & 6 deletions src/components/modals/AddProposal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ function AddProposal({ isOpen, handleClose, onClick }: AddProposalProps) {
onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
handleChange(event)
}
placeholder="wxDAI"
placeholder="GIV"
/>
<p className="font-inter text-neon-light pt-3">
How much wxDAI is being governed by Conviction Voting
How much GIV is being governed by Conviction Voting
</p>
<Input
name="commonPool"
Expand All @@ -72,13 +72,13 @@ function AddProposal({ isOpen, handleClose, onClick }: AddProposalProps) {
onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
handleChange(event)
}
placeholder="wxDAI"
placeholder="GIV"
/>
<p className="font-inter text-neon-light pt-3">
How many TEC tokens are Actively Voting in Conviction Voting?
How many GIV are Actively Voting in Conviction Voting?
</p>
<p className="font-inter text-gray-200 text-xs pt-3 pb-1">
Hatchers will have ~2 million TEC tokens they can vote with.
Hatchers will have ~2 million GIV they can vote with.
</p>
<Input
name="effectiveSupply"
Expand All @@ -87,7 +87,7 @@ function AddProposal({ isOpen, handleClose, onClick }: AddProposalProps) {
onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
handleChange(event)
}
placeholder="TEC"
placeholder="GIV"
/>
</div>
</Modal>
Expand Down
12 changes: 6 additions & 6 deletions src/components/tables/ConvictionVoting.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ function ConvictionVotingTable({
<TableHeader
headerText="Proposal"
size="m"
tooltipText="A simluted funding request using Conviction Voting"
tooltipText="A simulated funding request using Conviction Voting"
/>
<TableHeader
headerText="requested amount (wxdai)"
headerText="requested amount (GIV)"
size="l"
tooltipText="The amount of funds being asked for from the Common Pool"
/>
<TableHeader
headerText="common pool (wxdai)"
headerText="common pool (GIV)"
size="l"
tooltipText="The amount of funds currently in the Common Pool"
/>
<TableHeader
headerText="effective supply (tec)"
headerText="effective supply (GIV)"
size="l"
tooltipText="The cumulative total of all TEC tokens staked on all proposals in Conviction Voting"
tooltipText="The cumulative total of all GIV staked on all proposals in Conviction Voting"
/>
<TableHeader
headerText={`min tokens needed to pass in ${
timePeriod || '2 weeks'
} (tec)`}
} (GIV)`}
size="l"
tooltipText="The minimum amount of tokens needed to pass this funding request in the given timeframe"
/>
Expand Down
44 changes: 22 additions & 22 deletions src/pages/learn/3.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,37 @@ function LearnThree() {
<div className="font-inter">
<br />
<p>
As your Commons evolves so should its configuration. Parameters within
the different Commons components will be able to be modified after
they have been implemented. In this module you will need to define the
voting requirements for any proposal to alter the Commons
configuration.
As the GIVeconomy evolves so should its configuration. Parameters
within the GIVgarden will be able to be modified during deployment. In
this module you will need to define the voting requirements for any
proposal to alter the GIVgarden on-chain configuration.
</p>
<br />
<p className="font-bold">Modifying the Commons</p>
<p className="font-bold">Modifying the GIVgarden</p>
<br />
<p>
Tao Voting is the voting process by which the Commons can modify its
economic and governance settings post-upgrade. It is a very powerful
voting application that is capable of performing many high-impact
functions, for example:
Tao Voting is the voting application by which the GIVers can modify
the economic and governance settings of the GIVgarden. It is a very
powerful voting application that is capable of performing many
high-impact Decisions, for example:
</p>
<br />
<ul className="list-disc list-inside">
<li>Mint and burn TEC tokens</li>
<li>Install and remove Applications (Modules) in the Commons</li>
<li>Modify the parameters of all existing Applications (Modules)</li>
<li>Install and remove Aragon Applications</li>
<li>Modify the parameters of all existing Applications</li>
<li>Remove GIV from the Common Pool</li>
</ul>
<br />
<p>
Since there is only one set of voting parameters for all Commons
components, strong thresholds for passing proposals in Tao Voting are
critical to ensure the Commons architecture remains uncompromised.
Since there is only one set of voting parameters for all GIVgarden
components, well-thought out thresholds for passing proposals in Tao
Voting are critical to ensure the GIVgarden architecture remains
uncompromised.
</p>
<br />
<p>
Tao Voting is an upgraded version of Dandelion Voting with familiar
parameters such as <strong>Support Required</strong>,{' '}
Tao Voting is an upgraded version of a normal DAO Voting app with
familiar parameters such as <strong>Support Required</strong>,{' '}
<strong>Minimum Quorum</strong>, <strong>Execution Delay</strong>
and <strong>Vote Duration</strong>.
</p>
Expand All @@ -55,9 +55,9 @@ function LearnThree() {
<p className="font-bold">Delegation</p>
<br />
<p>
TEC Token holders can delegate their Tao Voting powers to another
member who will cast votes on their behalf, these members become
delegates. Delegates can only vote during the{' '}
GIV holders can delegate their Tao Voting powers to another member who
will cast votes on their behalf, these members become delegates.
Delegates can only vote during the{' '}
<strong>Delegate Voting Period</strong>, which is a specified amount
of time at the beginning of the voting process. If a delegate votes
contrary to their delegator the delegator can veto the delegated vote
Expand All @@ -80,7 +80,7 @@ function LearnThree() {
<br />
<p className="font-bold leading-loose">You decide:</p>
<ul className="list-disc list-inside">
<li>Legacy Dandelion Voting settings</li>
<li>Normal DAO Voting settings</li>
<li>The amount of time Delegates are allowed to vote</li>
<li>How long to listen for a change of outcome</li>
<li>The amount of time that can be added for voting</li>
Expand Down
16 changes: 8 additions & 8 deletions src/pages/learn/4.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ function LearnFour() {
<div className="font-inter">
<br />
<p>
Conviction Voting is the governance system in which Commons Members
create proposals to request funds from the Common Pool.
Conviction Voting is the governance system in which GIVers create
proposals to request funds from the Common Pool.
</p>
<br />
<p>
TEC tokens can be staked on these proposals to signal approval of the
GIV can be staked on these proposals to signal approval of the
request. Staked tokens accrue voting power, or Conviction,
continuously over time. The amount of tokens currently voting on all
proposals in Conviction Voting is represented by the term{' '}
Expand All @@ -27,16 +27,16 @@ function LearnFour() {
</p>
<br />
<p>
This is the real power behind the TEC token. TEC holders have a direct
impact on funding Token Engineering by reviewing projects and voting
on which initiatives get funded and how much funding they receive.
This is the real power behind the GIV token. GIVers have a direct
impact on deciding the Future of Giving by reviewing projects and
voting on which initiatives get funded and how much GIV they receive.
</p>
<br />
<p>
The <strong>Spending Limit</strong> sets the maximum percentage of the
Common Pool funds that can be requested by a single proposal. The{' '}
<strong>Minimum Conviction</strong> dictates how many TEC tokens are
needed to pass a proposal, no matter how small the amount requested.
<strong>Minimum Conviction</strong> dictates how many GIV are needed
to pass a proposal, no matter how small the amount requested.
</p>
<br />
<p className="font-bold leading-loose">You decide:</p>
Expand Down