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

Nightly / 4.6-rc1 #2221

Merged
merged 64 commits into from
Jul 7, 2021
Merged

Nightly / 4.6-rc1 #2221

merged 64 commits into from
Jul 7, 2021

Conversation

vsubhuman
Copy link
Contributor

@vsubhuman vsubhuman commented Jul 7, 2021

Last prod: 4.5.7

https://github.com/Emurgo/yoroi-frontend/releases/tag/4.5.7

Main includes after last prod

  1. Hardware wallets support for Catalyst
  2. Ergo p2s and data-inputs, plus latest fixes, plus migration to sigma-rust 13.3
  3. UI improvements

Full PR diff since last prod

yushih and others added 30 commits June 18, 2021 14:12
This reverts commit 491e8a3.

Conflicts:
	packages/yoroi-extension/app/stores/stateless/tokenHelpers.js
Remove the chart legend also every related styling and components
Remove the border-radius styling from the tab button
Display assets under main token amount in tx list
Change the close icon for the verify address dialog
yushih and others added 20 commits July 7, 2021 02:36
(cherry picked from commit 3170960)
[4.5.6] Dates update for Catalyst fund 5
[4.5.6] Ledger support backport
# Conflicts:
#	packages/yoroi-extension/app/components/wallet/voting/Voting.js
#	packages/yoroi-extension/app/containers/wallet/dialogs/voting/RegisterDialogContainer.js
#	packages/yoroi-extension/app/containers/wallet/dialogs/voting/VotingRegistrationDialogContainer.js
[PULL] Release/4.5.6 to develop
@vsubhuman vsubhuman added this to the 4.6.0-rc1 milestone Jul 7, 2021
…6-rc1

# Conflicts:
#	packages/yoroi-extension/package-lock.json
#	packages/yoroi-extension/package.json
@vsubhuman
Copy link
Contributor Author

@vsubhuman vsubhuman merged commit c64a118 into nightly Jul 7, 2021
@vsubhuman vsubhuman deleted the release/nightly/4.6-rc1 branch July 7, 2021 21:03
@vsubhuman vsubhuman self-assigned this Jul 7, 2021
@vsubhuman vsubhuman mentioned this pull request Jul 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants