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

Simple Decisions #3704

Merged
merged 153 commits into from
Oct 19, 2022
Merged
Changes from 1 commit
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
5358583
feat:add nav entry `defineMessages` to create feature branch
danbr Aug 2, 2022
d2a76ed
Feat: add decisions page to routes & layouts
chinins Aug 2, 2022
8164da9
Feat: add `newItemButton` instead of `showActions` in ColonyHomeLayout
chinins Aug 3, 2022
698ed70
Feat: add `NewDecision` button & dialog
chinins Aug 3, 2022
a9c5ade
Feat: add ColonyDecisions page hmtl & css
chinins Aug 3, 2022
4bf904d
Feat: add data placeholder to `COlonyDecisions`
chinins Aug 3, 2022
826ff0d
Refactor: update transaltion ids in Decisions constants
chinins Aug 8, 2022
b9cce71
Feat: add support for decisions to `ActionsListItem`
chinins Aug 9, 2022
8f85241
Feat: add filtering by domain to `Decisions` page
chinins Aug 9, 2022
a00f744
Feat: add sorting to `Decisions` page
chinins Aug 9, 2022
f0f3a6a
Feat: add pagination to `Decisions` page
chinins Aug 9, 2022
b91dae2
Feat: add a check for voting reputation extension to decisions page
chinins Aug 12, 2022
49fdb00
Refactor: fix sorting in paginatedDecisions
chinins Aug 12, 2022
7b6eb6b
Add: new decision dialog form
willm30 Aug 5, 2022
e176ea9
Add: active state on icons
willm30 Aug 10, 2022
b80fef1
Feat: initial setup for decision preview page
Julianahlk Aug 4, 2022
15fc4dc
Feat: add buttons and styling
Julianahlk Aug 8, 2022
e4a477b
Feat: create details widget for decisions
Julianahlk Aug 10, 2022
72a5ce7
Feat: add mock data
Julianahlk Aug 13, 2022
07ca512
Refactor: use loggedin user data
Julianahlk Aug 15, 2022
789fa74
Refactor: create separate UserWidget component
Julianahlk Aug 15, 2022
0e2a3e8
Refactor: data tweaks
Julianahlk Aug 15, 2022
4f874b6
Refactor: add bottom border to description
Julianahlk Aug 16, 2022
1452e80
Refactor: update styles
Julianahlk Aug 17, 2022
ec28827
Refactor: changes for PR review comments
Julianahlk Aug 17, 2022
0cf4e1c
Refactor: add missing type for icons map
Julianahlk Aug 17, 2022
8a89b43
Refactor: delete unused DetailsWidget
Julianahlk Aug 17, 2022
14b20bf
Refactor: updates for review comments
Julianahlk Aug 18, 2022
bf1f260
Refactor: add emoji for decisions
Julianahlk Aug 18, 2022
4716703
Refactor: add page title in useTitle hook & move DecisionsPreview com…
Julianahlk Aug 18, 2022
65c934d
Add: Edit Decision Modal
willm30 Aug 21, 2022
9213878
Feat: change decision preview route to wallet requied
chinins Aug 23, 2022
2fc9ac4
Feat: add localStorage to new decision & fix domain id logic
chinins Aug 17, 2022
4586671
Refactor: update decision preview based on rebase
chinins Aug 23, 2022
f489f98
Refactor: updates based on the rebase
chinins Aug 26, 2022
5fcbfa9
Refactor: add `name` prop to `RichTextEditor`
chinins Aug 26, 2022
aa462a1
Refactor: update form fields names
chinins Aug 26, 2022
5f3a09f
Chore: add `html-react-parser`
chinins Aug 27, 2022
ad807c0
Feat: add html parsing to `DecisionPreview`
chinins Aug 27, 2022
0984027
Styles: add paragraph bottom margin to the description
chinins Aug 27, 2022
e0c7722
Feat: add no decision state to DecisionPreview
chinins Aug 27, 2022
9e08a04
Refactor: fix domain preselection in DecisionDialog
chinins Sep 1, 2022
5684405
Refactor: update the history location in `DecisionDialog`
chinins Sep 1, 2022
e03c640
Refactor: add comment about moving clearing local storage
chinins Sep 1, 2022
efbdb01
Chore:Use new ColonyClient which supports contract updates
danbr Aug 24, 2022
20fb890
rebase:corrections
danbr Aug 24, 2022
2a7ef46
feat:use upgraded contract that supports NO_ACTION (0x12345678), used…
danbr Aug 24, 2022
bb300d6
fix:merge updates
danbr Aug 24, 2022
57ef580
rebase:corrections
danbr Aug 24, 2022
5a935d8
feat:update Action form
danbr Aug 25, 2022
044d50f
feat:remove `ColonyActions.Decision`, instead use`ColonyMotions.Creat…
danbr Aug 30, 2022
7e64878
fix:rename `DecisionPreview`
danbr Sep 2, 2022
719b5e5
feat:refactor local storage of decisions
danbr Sep 4, 2022
c81c249
fix:clean up code
danbr Sep 4, 2022
b1ca897
rebase:corrections
danbr Aug 24, 2022
7516aa7
fix:merge updates
danbr Aug 24, 2022
a2b6ed4
rebase:corrections
danbr Aug 24, 2022
fd22f6d
fix:rebase
danbr Aug 24, 2022
9f57eac
fix:rebase
danbr Aug 24, 2022
8a16486
feat:add decision details into page feed
danbr Aug 25, 2022
a168f1b
rebase:corrections
danbr Aug 26, 2022
be339e4
feat:dont show banner for Decision
danbr Aug 31, 2022
058abb6
fix:clean up rebase
danbr Sep 4, 2022
7443cdc
feat:add parser to decision desciption
danbr Sep 4, 2022
ac5c7f3
fix:removed but missed in rebase
danbr Sep 7, 2022
3bfba93
fix:add dependences when checking banner
danbr Sep 8, 2022
4531ebd
Feat: add `RichTextEditor` to `RaiseObjectionDialogForm`
Julianahlk Aug 22, 2022
c6827aa
Refactor: add disabled prop to RichTextEditor
Julianahlk Aug 23, 2022
e1a71a2
Refactor: move editor definition to staking widget
Julianahlk Aug 23, 2022
948159d
Feat: add tooltip for the `StakingSlider`
Julianahlk Aug 23, 2022
77e9651
Feat: add `RichTextEditor` to `RaiseObjectionDialogForm`
Julianahlk Aug 22, 2022
fb54c02
Refactor: move editor definition to staking widget
Julianahlk Aug 23, 2022
698256e
Refactor: add form field prop for RichTextEditor
Julianahlk Aug 25, 2022
2f47aa6
Refactor: removed the annotation validation
Julianahlk Aug 29, 2022
33c245c
Refactor: add html react parser
Julianahlk Aug 29, 2022
1f16631
Refactor: remove render in falsy case & add index.ts
Julianahlk Aug 31, 2022
03ed5a3
Refactor: fix StakingSlider ids and displayName
Julianahlk Aug 31, 2022
43cdc0e
Refactor: change limit variable
Julianahlk Aug 31, 2022
fd8f29c
Refactor: fix cursor arrow pointer
Julianahlk Sep 1, 2022
3bd333b
Refactor: move editor to RaiseObjectionDialog
Julianahlk Sep 2, 2022
0a205e0
Feat: add `isDecision` prop & logic to raise objeciton dialog
chinins Sep 4, 2022
05638a8
Refactor: add divider and style adjustments
Julianahlk Sep 7, 2022
729eaaf
Refactor: pass prop for isDecision
Julianahlk Sep 8, 2022
337aec9
Replace motions resolver action name strings with an enum
jakubcolony Sep 9, 2022
189e888
Fix: Tidy up Install Governance Extension message
jakubcolony Sep 16, 2022
b909f2f
feat:`subscription` add where arg to find decisions from motions
danbr Sep 5, 2022
490fc94
feat:remove decisions from `ActionsList`
danbr Sep 5, 2022
541d6f9
feat:update subcription to call query to get annotationHash
danbr Sep 6, 2022
85d01f6
feat:display decision title in actionlistitems
danbr Sep 6, 2022
94543f9
feat:add loading decisions spinner
danbr Sep 9, 2022
48bdf78
fix:capture decision from listview & defaultMotion
danbr Sep 9, 2022
8f71181
fix:clean up interfaces
danbr Sep 9, 2022
f1d5923
fix:check for Decision before, extension
danbr Sep 15, 2022
ad638bf
fix:format of .graphgl file
danbr Sep 15, 2022
19e724e
fix:show all Decisions in List, this removes < 10% staked check
danbr Sep 15, 2022
8854a1e
fix:show loading msg before empty decision msg
danbr Sep 16, 2022
d2e45c1
fix:update styling name for empty Decisionlist
danbr Sep 17, 2022
bbaaf4b
fix:check for Decision before, extension
danbr Sep 15, 2022
7ded145
Feat: add decisions page route & its integration
chinins Sep 16, 2022
ef8d55d
Chore: update `ColonyDecisions` to fix rebase
chinins Sep 20, 2022
09e955f
Chore: update `ColonyDecisions` to fix rebase
chinins Sep 20, 2022
9e250db
fix:check for Decision before, extension
danbr Sep 15, 2022
37a5417
Feat: add `ConfirmDeleteDialog`
chinins Sep 8, 2022
59d16c1
Refactor: fix typo in `StakingValidationError`
chinins Sep 8, 2022
bb152a6
Feat: add close to `ConfirmDeleteDialog`
chinins Sep 8, 2022
8256165
Feat: add `ConfirmDeleteDialog` to `PreviewDialog`
chinins Sep 8, 2022
a4df8b2
Feat: add userAddress to draft decision local storage
chinins Sep 8, 2022
1c0e5f0
Feat: add `DraftDecisionItem` to `ColonyDecisions`
chinins Sep 8, 2022
a7d94eb
Feat: add draft decision support to ActionsListItem
chinins Sep 13, 2022
ac057cf
Refactor: update DecisionDialog props & functionality
chinins Sep 13, 2022
6462bd7
Feat: add full UI & functionality to DraftDecisionListItem
chinins Sep 13, 2022
a8c62c3
Feat: add `RemoveDraftDecisionDialog`
chinins Sep 14, 2022
a2edf17
Feat: open dialog conditionally in `ColonyNewDecision`
chinins Sep 14, 2022
3dc099d
Feat: update props in `RemoveDraftDecisionDialog` to fix context problem
chinins Sep 15, 2022
9a3a213
Refactor: fix keys for remove dialogs
chinins Sep 15, 2022
89b359f
Feat: update `ActionsListItem` to accommodate draft decision types
chinins Sep 15, 2022
3712710
Feat: add draft to no decisions state
chinins Sep 15, 2022
a579d7f
Feat: add draft to no decisions state
chinins Sep 15, 2022
d49a350
Refactor: remove `isNewDecision` prop from `DecisionDialog`
chinins Sep 15, 2022
e5b2544
Refactor: fix types in `createDecisionMotion`
chinins Sep 15, 2022
c9697aa
Feat: combine draft decision state for the item to be deleted in the UI
chinins Sep 15, 2022
cc2bc58
Styles: change delete/edit button styles on decision preview page
chinins Sep 16, 2022
0f266e3
Chore: update `ColonyDecisions` to fix rebase
chinins Sep 20, 2022
5800b70
Feat: change button positioning in `DraftDecisionItem`
chinins Sep 20, 2022
56cc62f
feat:add support for Decision objections
danbr Sep 19, 2022
7c870f8
Refactor: add try-catch to `annotationHash` resolver
chinins Sep 21, 2022
a146aa1
Add time and tags to objection section
jakubcolony Sep 21, 2022
dafe7a1
Refactor: update the team id passed to decision dialog form
chinins Sep 21, 2022
cd0a87a
Refactor: update decisions page wrapper prop to fix team selector bug
chinins Sep 21, 2022
650893c
Refactor: update decisions page wrapper props
chinins Sep 22, 2022
2260661
fix:correct rebase, stakingslider not picked up
danbr Sep 27, 2022
92ee115
Refactor: Move DefaultMotion content into separate component
jakubcolony Sep 22, 2022
8e7d2c4
Feat: add V2 metadata support for decisions
chinins Sep 28, 2022
7915a5d
Chore: update `@colony/colony-event-metadata-parser` version
chinins Sep 28, 2022
dcb2816
Feat: add `getAnnotationMsgFromResponse` for objection
chinins Sep 28, 2022
4ba82fb
Feat: add passed domainId to create decision motion saga
chinins Sep 26, 2022
d929b49
Feat: add reputation check & copy to `DecisionDialog`
chinins Sep 26, 2022
83a7045
Feat: disable DecionDialog fields when no reputation
chinins Sep 26, 2022
344a57f
Feat: link to new colonyNetwork version
chinins Sep 26, 2022
2e6c790
Feat: update colonynetwork commit
chinins Oct 3, 2022
0ea19da
Feat: update `subgraph` commit
chinins Oct 3, 2022
f5cffb7
Chore: update package.json
chinins Oct 3, 2022
1efc8f0
Feat: add motion domain in the details widget for decisions
chinins Oct 3, 2022
3cf8e7e
fix:add support to disable Decision editor
danbr Oct 4, 2022
c669de3
Refactor: fix displayed decision & objeciton initiator
chinins Oct 10, 2022
10e0c3a
fix:Replace type to `Decision`
danbr Oct 10, 2022
5dbccdc
fix:add staking banner, include >10% in decision list
danbr Oct 10, 2022
554c989
fix:replace Type with "Decision"
danbr Oct 10, 2022
1c522f3
Refactor: update draft decision localStorage logic
chinins Oct 13, 2022
969743a
fix:set `<H3>` as medium size for Decision description heading format…
danbr Oct 13, 2022
7b135da
fix:add space before `create new Decision` button
danbr Oct 13, 2022
3a213e4
Refactor: update version destructuring in `Extensions`
chinins Oct 18, 2022
feecc43
Refactor: remove logs & add alloed extensions filter
chinins Oct 18, 2022
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
Prev Previous commit
Next Next commit
fix:correct rebase, stakingslider not picked up
  • Loading branch information
danbr committed Oct 19, 2022

Unverified

This user has not yet uploaded their public signing key.
commit 2260661b57bb99c841132678322770c554b51ecf
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ import Slider, { Appearance } from '~core/Slider';
import { Tooltip } from '~core/Popover';
import Numeral from '~core/Numeral';
import StakingValidationError from '~dashboard/ActionsPage/StakingValidationError';
import QuestionMarkTooltip from '~core/QuestionMarkTooltip';

import { Colony, useLoggedInUser } from '~data/index';
import { getFormattedTokenValue } from '~utils/tokens';
@@ -37,31 +36,31 @@ interface Props extends StakingAmounts {
totalPercentage?: number;
}

const displayName = 'dashboard.ActionsPage.StakingWidget.StakingSlider';
const displayName = 'StakingSlider';

const MSG = defineMessages({
titleStake: {
id: 'dashboard.ActionsPage.StakingWidget.StakingSlider.title',
id: 'dashboard.ActionsPage.StakingSlider.title',
defaultMessage: `Select the amount to back the motion`,
},
titleObject: {
id: 'dashboard.ActionsPage.StakingWidget.StakingSlider.title',
id: 'dashboard.ActionsPage.StakingSlider.title',
defaultMessage: `Select the amount to stake the objection`,
},
descriptionStake: {
id: 'dashboard.ActionsPage.StakingWidget.StakingSlider.description',
id: 'dashboard.ActionsPage.StakingSlider.description',
defaultMessage: `Stake is returned if the motion passes. If there is a dispute, and the motion loses, part or all of your stake will be lost.`,
},
descriptionObject: {
id: 'dashboard.ActionsPage.StakingWidget.StakingSlider.description',
id: 'dashboard.ActionsPage.StakingSlider.description',
defaultMessage: `Stake will be returned if the objection succeeds. If the objection fails, part or all of your stake will be lost.`,
},
loading: {
id: 'dashboard.ActionsPage.StakingWidget.StakingSlider.loading',
id: 'dashboard.ActionsPage.StakingSlider.loading',
defaultMessage: 'Loading staking values ...',
},
minimumAmount: {
id: 'dashboard.ActionsPage.StakingWidget.StakingSlider.minimumAmount',
id: 'dashboard.ActionsPage.StakingSlider.minimumAmount',
defaultMessage: 'at least {minStake}',
},
tooltip: {
@@ -175,14 +174,6 @@ const StakingSlider = ({
className={styles.title}
appearance={{ size: 'normal', theme: 'dark', margin: 'none' }}
/>
<QuestionMarkTooltip
tooltipText={MSG.stakingToolTip}
className={styles.questionMarkIcon}
tooltipClassName={styles.tooltip}
tooltipPopperOptions={{
placement: 'top-end',
}}
/>
</div>
<p className={styles.description}>
<FormattedMessage