Skip to content

Feature/UI updates#12

Closed
mihailpolev wants to merge 12 commits into
mainfrom
feature/ui-updates
Closed

Feature/UI updates#12
mihailpolev wants to merge 12 commits into
mainfrom
feature/ui-updates

Conversation

@mihailpolev
Copy link
Copy Markdown
Contributor

fix and update UI to actual design

mihailpolev and others added 12 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
@mihailpolev mihailpolev requested a review from kvhnuke April 25, 2022 15:42
@kvhnuke kvhnuke changed the base branch from develop to feature/send-transaction April 26, 2022 22:03
@kvhnuke kvhnuke changed the base branch from feature/send-transaction to develop April 26, 2022 22:03
@kvhnuke kvhnuke changed the base branch from develop to feature/sign-message-dev April 26, 2022 22:22
Base automatically changed from feature/sign-message-dev to develop April 27, 2022 17:50
Base automatically changed from develop to main April 29, 2022 18:46
@kvhnuke
Copy link
Copy Markdown
Contributor

kvhnuke commented May 17, 2022

merged to #22

@kvhnuke kvhnuke closed this May 17, 2022
@kvhnuke kvhnuke deleted the feature/ui-updates branch June 27, 2024 19:05
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