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

UI/bug fix 0.6.1 #65

Merged
merged 4 commits into from
Jul 24, 2022
Merged

UI/bug fix 0.6.1 #65

merged 4 commits into from
Jul 24, 2022

Conversation

mihailpolev
Copy link
Contributor

bug fix 0.6.1

…ix-0.6.1

* 'develop' of github.com:enkryptcom/enKrypt: (25 commits)
  devop: more random fixes
  devop: convert serttings window to events
  chore: cleanup
  chore: remove .DS_Store
  feat:opera support
  devop: buy/deposit buttons
  devop: all evm chains have activity handler
  devop: rivet activity
  devop: activity prep work
  dev: update UI
  fix: proper signertype for hw wallets
  fix: workflow
  fix: workflow
  fix: workflow
  fix: workflow
  fix: tests
  fix: workflow
  devop: add dapp connect
  fix: workflow and #53
  refactor: BaseToken getLatestPrice directly gets token price
  ...

# Conflicts:
#	packages/extension/src/ui/action/views/accounts/components/accounts-list-item.vue
#	packages/extension/src/ui/action/views/network-activity/components/network-activity-action.vue
#	packages/extension/src/ui/action/views/network-activity/index.vue
#	packages/extension/src/ui/action/views/network-assets/index.vue
#	packages/extension/src/ui/action/views/settings-start/index.vue
#	packages/extension/src/ui/action/views/settings/components/settings-button.vue
#	packages/extension/src/ui/action/views/settings/index.vue
@mihailpolev mihailpolev requested a review from kvhnuke July 22, 2022 04:18
@kvhnuke kvhnuke changed the base branch from develop to feat/tx-to-activity July 24, 2022 03:15
@kvhnuke kvhnuke merged commit c090ad9 into feat/tx-to-activity Jul 24, 2022
@kvhnuke kvhnuke deleted the ui/bug-fix-0.6.1 branch July 24, 2022 03:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants