Skip to content

Commit

Permalink
🪢 Merge main into dev (#4026)
Browse files Browse the repository at this point in the history
  • Loading branch information
thesan authored Jan 6, 2023
2 parents 150d4ea + d659bb6 commit 6c60a17
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 4 deletions.
34 changes: 33 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.1.0] - 2023-01-06

### Added
- Description in the forum category headers.
- Creation date/time on forum thread.
- Whitelist on proposal "closed" discussions.
- Invitation lock tooltip.

### Changed
- Renames "Own Stake" to "My Stake".

### Removed
- Language tab from settings.

### Fixed
- The edit membership about section.
- Stake info on announce candidacy sign-in modal.
- Back button on WG openings.
- Set Membership Lead Invitation Quota Proposal preview.
- Blockheight info labels (in the settings).
- Replaced/Removed some more lorem ipsum.
- Better prevent localstorage overwrites from the forum tread watchlist.
- The hire limit on single postion openings.
- The temporary "Insufficient balance to cover fee" message on the vesting claim modal.

## [1.0.1] - 2023-01-05

### Fixed
- Proposal view crashing due to high amounts of JOY

## [1.0.0] - 2022-12-16

### Added
Expand Down Expand Up @@ -40,6 +70,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [0.1.1] - 2022-12-02

[unreleased]: https://github.com/Joystream/pioneer/compare/v1.0.0...HEAD
[unreleased]: https://github.com/Joystream/pioneer/compare/v1.1.0...HEAD
[1.1.0]: https://github.com/Joystream/pioneer/compare/v1.0.1...v1.1.0
[1.0.1]: https://github.com/Joystream/pioneer/compare/v1.0.0...v1.0.1
[1.0.0]: https://github.com/Joystream/pioneer/compare/v0.1.1...v1.0.0
[0.1.1]: https://github.com/Joystream/pioneer/commits/v0.1.1
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@joystream/pioneer",
"version": "1.0.0",
"version": "1.1.0",
"license": "GPL-3.0-only",
"scripts": {
"build": "node --max_old_space_size=4096 ./build.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/app/pages/Settings/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ export const Settings = () => {
)}
<SettingsInformation icon={<WarnedIcon />} title={t('chainInfo')}>
<ColumnGapBlock gap={5}>
<TextMedium lighter>t('rpcBlockheight')</TextMedium>
<TextMedium lighter>{t('rpcBlockheight')}</TextMedium>
<TextMedium lighter>{formatTokenValue(header?.number.toNumber())}</TextMedium>
</ColumnGapBlock>
<ColumnGapBlock gap={5}>
<TextMedium lighter>t('qnBlockheight')</TextMedium>
<TextMedium lighter>{t('qnBlockheight')}</TextMedium>
<TextMedium lighter>{formatTokenValue(queryNodeState?.indexerHead)}</TextMedium>
</ColumnGapBlock>
</SettingsInformation>
Expand Down

2 comments on commit 6c60a17

@vercel
Copy link

@vercel vercel bot commented on 6c60a17 Jan 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

pioneer-2-storybook – ./

pioneer-2-storybook-git-dev-joystream.vercel.app
pioneer-2-storybook.vercel.app
pioneer-2-storybook-joystream.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 6c60a17 Jan 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

pioneer-2 – ./

pioneer-2.vercel.app
pioneer-2-joystream.vercel.app
pioneer-2-git-dev-joystream.vercel.app

Please sign in to comment.