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.

Sign up for GitHub

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: change wallet into readonly reactive #167

Merged
merged 1 commit into from
Apr 18, 2024
Merged

feat: change wallet into readonly reactive #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions app/pages/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import pkg from '~/package.json'
import { shortenAddress, useVueDapp } from '@vue-dapp/core'
import type { ConnWallet } from '../../packages/core/dist'

const { address, chainId, status, error, disconnect, onConnected, onDisconnected } = useVueDapp()
const { wallet, disconnect, onConnected, onDisconnected } = useVueDapp()
const dappStore = useDappStore()

const ensName = ref('')
Expand All @@ -19,7 +19,7 @@ onDisconnected(() => {
})

function onClickConnectButton() {
if (status.value === 'connected') {
if (wallet.status === 'connected') {
disconnect()
return
}
Expand All @@ -40,20 +40,20 @@ function onClickConnectButton() {
<div class="mt-10 px-10 flex flex-col items-center justify-center gap-3">
<n-button
size="medium"
:loading="status === 'connecting'"
:disabled="status === 'connecting'"
:loading="wallet.status === 'connecting'"
:disabled="wallet.status === 'connecting'"
@click="onClickConnectButton"
>
<p v-if="status === 'idle'">Connect Wallet</p>
<p v-else-if="status === 'connecting'">Connecting...</p>
<p v-if="status === 'connected'">Disconnect</p>
<p v-if="wallet.status === 'idle'">Connect Wallet</p>
<p v-else-if="wallet.status === 'connecting'">Connecting...</p>
<p v-if="wallet.status === 'connected'">Disconnect</p>
</n-button>

<p v-if="error">{{ error }}</p>
<p v-if="wallet.error">{{ wallet.error }}</p>

<div class="text-gray-600 text-sm mt-5">
<p v-if="chainId" class="">Chain ID: {{ chainId }}</p>
<p class="">{{ address && shortenAddress(address) }}</p>
<p v-if="wallet.chainId" class="">Chain ID: {{ wallet.chainId }}</p>
<p class="">{{ wallet.address && shortenAddress(wallet.address) }}</p>
<p>{{ ensName }}</p>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/services/connect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { computed } from 'vue'
import { computed, readonly } from 'vue'
import { useStore } from '../store'
import { ConnectOptions, ConnectorName, RDNS } from '../types'
import { AutoConnectError, ConnectError, ConnectorNotFoundError } from '../errors'
Expand Down Expand Up @@ -123,7 +123,7 @@ export function useConnect(pinia?: any) {
}

return {
wallet: computed(() => walletStore.wallet),
wallet: readonly(walletStore.wallet),

status: computed(() => walletStore.wallet.status),
error: computed(() => walletStore.wallet.error),
Expand Down
12 changes: 6 additions & 6 deletions packages/core/src/services/listeners.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export function useListeners(pinia?: any) {
function onConnected(callback: OnConnectedCB) {
watch(isConnected, (val, oldVal) => {
if (val && !oldVal) {
assertConnected(wallet.value, 'useListeners - onConnected')
callback && callback(toRaw(wallet.value))
assertConnected(wallet, 'useListeners - onConnected')
callback && callback(toRaw(wallet))
}
})
}
Expand All @@ -21,15 +21,15 @@ export function useListeners(pinia?: any) {
// TODO: make sure this works
watch(address, (val, oldVal) => {
if (oldVal && val) {
assertConnected(wallet.value, 'useListeners - onAccountOrChainIdChanged - address')
callback && callback(toRaw(wallet.value))
assertConnected(wallet, 'useListeners - onAccountOrChainIdChanged - address')
callback && callback(toRaw(wallet))
}
})

watch(chainId, (val, oldVal) => {
if (val && oldVal) {
assertConnected(wallet.value, 'useListeners - onAccountOrChainIdChanged - chainId')
callback && callback(toRaw(wallet.value))
assertConnected(wallet, 'useListeners - onAccountOrChainIdChanged - chainId')
callback && callback(toRaw(wallet))
}
})
}
Expand Down
Loading