Skip to content

Commit

Permalink
Swap positions of submit and preview in proposal form. (#477)
Browse files Browse the repository at this point in the history
* Merge development into main! (#473)

* Add utils package

* newline at the end of tsconfig.json

* remove debugging console.log

* Crispier toasts (#442)

* Increased duration toasts display on screen.

* Display notifications above suspense loader.

* Fixed vscode eslint fixing incorrect rules, and reformatted.

* Display executed proposal TX hashes with link to Mintscan (#441)

* Display executed proposal TX hash in sidebar.

* Added link to executed proposal TX on mintscan.

* Improved user messages about tx hash.

* Made TX hash loadable in case the query takes some time.

* Only add link to proposal tx hash if NEXT_PUBLIC_CHAIN_TXN_URL_PREFIX present.

* Formatted.

* Generalized copy to clipboard message.

* Improve proposal template UX (#440)

* Preview proposal message JSON when creating. Renamed messages to actions on proposal create page.

* Recognize and display message templates on existing proposals.

* Fixed spend cosmos msg detection.

* Formatted.

* PR fixes.

* Fixed prettier lint error.

* Update packages/utils/package.json

Co-authored-by: Noah Saso <noahsaso@gmail.com>

* Add check for connected wallet (#452)

* Show second by second countdown when unstaking. (#456)

* Icons package (#428)

* Init 'icons' package.

* Add init assets to 'icons' package.

* Use Wallet from @dao-dao/icons.

* Added "Add Token" Button (#458)

* Added "Add Token" Button

* Use "addTokenCallback" in "StarButton"

* Moved "Add Token" inside "DaoTreasury"

* Fix formatting issue in Button.tsx. (#461)

* Disable check for staked balance at proposal creation time. (#464)

Currently there is an issue with querying past chain state from before
the chain halted. This makes voting on proposals created before the
chain halt not possible as that check requires those queries to work.

This removes that check for now. Next week, once those proposals have
cleared we can re enable it.

* Allow voting abstain on proposals. (#454)

* Use version number from package.json. (#455)

* Migrate away from Daisy UI and bring design closer to spec. (#457)

* WIP - migrate away from Daisy UI.

* Use text sizes from spec in pages covered so far.

Have mostly completed:

- /starred
- DAO homepage
- staking modal
- nav bar

* Proposal view working and new proposal template selection modal.

* WIP - proposal voting page.

* Update ProposalDetails and allow voting.

* Add proposal execute button.

* Add loading state to button.

* Update multisig page visuals.

* Fix build errors.

* Updated DAO create page.

* DAO create page visual improvements.

* Update Multisig create page.

* Remove unused component files.

* Checkpoint don't commit this Zeke.

* Added weeks and days to seconds formatter.

* Add Token image field and update most templates.

* Prompt to stake if no voting power for voting.

* Accent DAO / Multisig page with average color of logo (#460)

* Use average color from DAO's logo as accent color.

* Added colorization to multisig page.

* Ran next formatter.

* Fixed yarn lock URLs.

* Failsafe and load page if client fails to connect when averaging color.

* Address feedback from Sager.

* Add label to DAO / Multisig name field (#470)

* WIP - migrate away from Daisy UI.

* Use text sizes from spec in pages covered so far.

Have mostly completed:

- /starred
- DAO homepage
- staking modal
- nav bar

* Proposal view working and new proposal template selection modal.

* WIP - proposal voting page.

* Update ProposalDetails and allow voting.

* Add proposal execute button.

* Add loading state to button.

* Update multisig page visuals.

* Fix build errors.

* Updated DAO create page.

* DAO create page visual improvements.

* Update Multisig create page.

* Remove unused component files.

* Checkpoint don't commit this Zeke.

* Added weeks and days to seconds formatter.

* Add Token image field and update most templates.

* Prompt to stake if no voting power for voting.

* Address feedback from Sager.

* Accent DAO / Multisig page with average color of logo (#460)

* Use average color from DAO's logo as accent color.

* Added colorization to multisig page.

* Ran next formatter.

* Fixed yarn lock URLs.

* Failsafe and load page if client fails to connect when averaging color.

* Add label to DAO / Multisig name field (#470)

* Misc fixes.

* Swap to a tooltip library that actually works.

* Marketing token image & ensure sufficent contrast in accent color.

* Prompt to configure keplr if installed but not configured.

* Don't perform accent color check in useEffect.

Pls vercel.

* Final fixups from testing.

* Feedback from elgorithm.

* Correctly center background token images.

Co-authored-by: Noah Saso <noahsaso@gmail.com>
Co-authored-by: Jake Hartnell <Jake.Hartnell@gmail.com>

Co-authored-by: Sagar Saija <sagarsaija@yahoo.com>
Co-authored-by: Noah Saso <noahsaso@gmail.com>
Co-authored-by: Jake Hartnell <Jake.Hartnell@gmail.com>
Co-authored-by: Joshua Van Deren <livetoscout@gmail.com>
Co-authored-by: ebaker <430383+ebaker@users.noreply.github.com>

* Add missing daotoken image. (#474)

* Swap positions of submit and preview in proposal form.

Resolves #475

* fixup! correctly line wrap.

Co-authored-by: Sagar Saija <sagarsaija@yahoo.com>
Co-authored-by: Noah Saso <noahsaso@gmail.com>
Co-authored-by: Jake Hartnell <Jake.Hartnell@gmail.com>
Co-authored-by: Joshua Van Deren <livetoscout@gmail.com>
Co-authored-by: ebaker <430383+ebaker@users.noreply.github.com>
  • Loading branch information
6 people authored Apr 14, 2022
1 parent a5a816f commit 0095a35
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions apps/dapp/components/ProposalForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,14 @@ export function ProposalForm({
</div>
</div>
<div className="mt-4 flex justify-end gap-2">
<Tooltip
label={!wallet ? 'Connect your wallet to submit' : undefined}
>
<Button type="submit" loading={loading}>
Publish{' '}
<SvgAirplane color="currentColor" width="14px" height="14px" />
</Button>
</Tooltip>
<Button
type="button"
variant="secondary"
Expand All @@ -234,14 +242,6 @@ export function ProposalForm({
</>
)}
</Button>
<Tooltip
label={!wallet ? 'Connect your wallet to submit' : undefined}
>
<Button type="submit" loading={loading}>
Publish{' '}
<SvgAirplane color="currentColor" width="14px" height="14px" />
</Button>
</Tooltip>
</div>
</form>
</FormProvider>
Expand Down
Binary file added apps/dapp/public/daotoken.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0095a35

Please sign in to comment.