Skip to content

UI: 🎨 updates#22

Merged
kvhnuke merged 178 commits into
developfrom
ui/updates
Jul 6, 2022
Merged

UI: 🎨 updates#22
kvhnuke merged 178 commits into
developfrom
ui/updates

Conversation

@kvhnuke

@kvhnuke kvhnuke commented May 17, 2022

Copy link
Copy Markdown
Contributor

This contains lot of UI changes made over past month

mihailpolev and others added 20 commits April 1, 2022 22:26
…send-transaction

* 'develop' of github.com:enkryptcom/enKrypt:
  devop: 🔧 tweaks
  devop: 🔧 show real networks
  devop: 🔧 fix network gradient changes
  devop: 🔧 configure wip
  fix: 🐛 warnings
  fix: 🐛 lint and types
  devop: 🔧 upgrade @polkadot-js libs

# Conflicts:
#	packages/extension/src/ui/action/App.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/network-dapps/index.vue
#	packages/extension/src/ui/action/views/network-nfts/index.vue
…send-transaction

* 'develop' of github.com:enkryptcom/enKrypt:
  devop: 🔧 change network event
  devop: 🔧 address change notif works
  devop: 🔧 new changes
  fix: 🐛 yarn.lock
  devop: 🔧 real accounts and real balances
  devop: 🔧 display proper address
  devop: 🔧 show real addresses and currency name

# Conflicts:
#	packages/extension/src/ui/action/App.vue
…ypt into feature/ui-updates

* 'feature/send-transaction' of github.com:enkryptcom/enKrypt:
  devop: 🔧 Send Transaction develop
  devop: 🔧 Send Transaction develop
  devop: 🔧 Send Transaction develop
  devop: 🔧 Send Transaction develop
…pt into feature/ui-updates

* 'feature/add-account-dev' of github.com:enkryptcom/enKrypt:
  fix: 🐛 add Roboto font
  devop: 🔧 create Add Account view
…ypt into feature/ui-updates

* 'feature/sign-message-dev' of github.com:enkryptcom/enKrypt:
  devop: 🔧 create Sign message an Update metadata screen fix: 🐛 fix NFTs layout
…pt into feature/ui-updates

* 'feature/lock-screen-dev' of github.com:enkryptcom/enKrypt:
  devop: 🔧 create Lock screen

# Conflicts:
#	packages/extension/src/ui/action/components/base-button/index.vue
#	packages/extension/src/ui/action/router/index.ts
…to feature/swap

* 'feature/ui-updates' of github.com:enkryptcom/enKrypt:
  devop: 🔧 fix and update UI to actual design
  devop: 🔧 create Sign message an Update metadata screen fix: 🐛 fix NFTs layout
  devop: 🔧 Send Transaction develop
  devop: 🔧 Send Transaction develop
  devop: 🔧 Send Transaction develop
  devop: 🔧 Send Transaction develop

# Conflicts:
#	packages/extension/src/ui/action/components/app-menu/components/app-menu-item.vue
#	packages/extension/src/ui/action/components/base-search/index.vue
#	packages/extension/src/ui/action/components/phrase-checkbox/index.vue
#	packages/extension/src/ui/action/types/mock.ts
#	packages/extension/src/ui/action/views/network-activity/components/network-activity-action.vue
@kvhnuke kvhnuke mentioned this pull request May 17, 2022
@kvhnuke kvhnuke mentioned this pull request May 17, 2022
This was referenced May 17, 2022
@kvhnuke kvhnuke merged commit 5a6a506 into develop Jul 6, 2022
@kvhnuke kvhnuke deleted the ui/updates branch July 6, 2022 20:15
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.

4 participants