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

Feat/wallet connect phase1 #2337

Merged
merged 6 commits into from
Jul 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 47 additions & 60 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added src/assets/images/wallet-connect-dapps.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Confirm/AddNetwork/AddNetwork.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</v-flex>
</v-layout>
<v-divider class="mx-6"></v-divider>
<v-layout wrap align-center ma-6>
<v-layout wrap align-center pa-6>
<v-flex xs12 mb-2>
<div class="caption mb-2 text_2--text">{{ t('dappProvider.requestFrom') }}</div>

Expand Down
2 changes: 1 addition & 1 deletion src/components/Confirm/ConfirmForm/ConfirmForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
</v-flex>
</v-layout>
<v-layout wrap>
<v-flex xs12 mt-8 mx-6>
<v-flex xs12 my-8 mx-6>
<v-layout mx-n2>
<v-flex xs6 px-2>
<v-btn block text large class="text_2--text" @click="triggerDeny">
Expand Down
2 changes: 1 addition & 1 deletion src/components/Confirm/NetworkSwitch/NetworkSwitch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</v-flex>
</v-layout>
<v-divider class="mx-6"></v-divider>
<v-layout wrap align-center ma-6>
<v-layout wrap align-center pa-6>
<v-flex xs12 mb-2>
<div class="caption mb-2 text_2--text">{{ t('dappProvider.requestFrom') }}</div>

Expand Down
39 changes: 0 additions & 39 deletions src/components/WalletHome/WalletConnectCard/WalletConnectCard.scss

This file was deleted.

66 changes: 0 additions & 66 deletions src/components/WalletHome/WalletConnectCard/WalletConnectCard.vue

This file was deleted.

1 change: 0 additions & 1 deletion src/components/WalletHome/WalletConnectCard/index.js

This file was deleted.

6 changes: 5 additions & 1 deletion src/components/helpers/QuickAddress/QuickAddress.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<template>
<div class="quick-address d-flex align-center">
<div class="ml-auto">
<WalletConnectModal />
</div>
<div class="ml-2">
<ShowToolTip :address="selectedAddress">
<v-btn small class="address-btn" aria-label="Copy Address">
<v-icon left size="9">$vuetify.icons.address</v-icon>
Expand All @@ -22,9 +25,10 @@ import { mapState } from 'vuex'
import { apiStreamSupported, toChecksumAddressByChainId } from '../../../utils/utils'
import ExportQrCode from '../ExportQrCode'
import ShowToolTip from '../ShowToolTip'
import WalletConnectModal from '../WalletConnectModal'

export default {
components: { ExportQrCode, ShowToolTip },
components: { ExportQrCode, ShowToolTip, WalletConnectModal },
computed: {
...mapState({
selectedAddress(state) {
Expand Down
59 changes: 0 additions & 59 deletions src/components/helpers/WalletConnect/WalletConnect.scss

This file was deleted.

Loading