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

Jump to bottom

feat(core): switching networks #187

Merged
merged 12 commits into from
Jun 19, 2024
Merged

feat(core): switching networks #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2e1d582
feat(react): set algodClient to a useState variable
drichar Jun 18, 2024
97b8772
feat(vue): reactive algodClient
drichar Jun 18, 2024
919b4cc
feat(solid): reactive algodClient
drichar Jun 18, 2024
141f68c
fix(solid): algodClient type
drichar Jun 18, 2024
155e2f8
fix(vue): ensure algodClient is a defined computed value
drichar Jun 18, 2024
0dbcf99
fix(solid): fixes activeNetwork reactivity
drichar Jun 18, 2024
7c752e6
feat: add network switcher to example apps
drichar Jun 18, 2024
4199a5f
fix: "Set Active" button visibility in SolidJS example
drichar Jun 18, 2024
486c892
feat: disconnect all wallets when switching networks
drichar Jun 18, 2024
cae7dfd
test: add/update tests for new setActiveNetwork logic
drichar Jun 18, 2024
527f48d
test: fix failing tests
drichar Jun 19, 2024
56f7528
refactor(solid): combine into one file
drichar Jun 19, 2024
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
30 changes: 30 additions & 0 deletions examples/nextjs/src/app/Connect.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
.networkGroup {
display: flex;
flex-direction: column;
align-items: center;
gap: 1em;
margin: 2em;
padding: 2em;
background-color: light-dark(rgba(0, 0, 0, 0.025), rgba(255, 255, 255, 0.025));
border-color: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1));
border-style: solid;
border-width: 1px;
border-radius: 8px;
}

.networkGroup h4 {
margin: 0;
}

.networkGroup .activeNetwork {
text-transform: capitalize;
}

.networkButtons {
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
gap: 0.5em;
}

.walletGroup {
display: flex;
flex-direction: column;
Expand Down
40 changes: 38 additions & 2 deletions examples/nextjs/src/app/Connect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
'use client'

import { WalletId, useWallet, type Wallet } from '@txnlab/use-wallet-react'
import { NetworkId, WalletId, useWallet, type Wallet } from '@txnlab/use-wallet-react'
import algosdk from 'algosdk'
import * as React from 'react'
import styles from './Connect.module.css'

export function Connect() {
const { algodClient, activeAddress, transactionSigner, wallets } = useWallet()
const {
algodClient,
activeAddress,
activeNetwork,
setActiveNetwork,
transactionSigner,
wallets
} = useWallet()

const [isSending, setIsSending] = React.useState(false)
const [magicEmail, setMagicEmail] = React.useState('')
Expand Down Expand Up @@ -73,6 +80,35 @@ export function Connect() {

return (
<div>
<div className={styles.networkGroup}>
<h4>
Current Network: <span className={styles.activeNetwork}>{activeNetwork}</span>
</h4>
<div className={styles.networkButtons}>
<button
type="button"
onClick={() => setActiveNetwork(NetworkId.BETANET)}
disabled={activeNetwork === NetworkId.BETANET}
>
Set to Betanet
</button>
<button
type="button"
onClick={() => setActiveNetwork(NetworkId.TESTNET)}
disabled={activeNetwork === NetworkId.TESTNET}
>
Set to Testnet
</button>
<button
type="button"
onClick={() => setActiveNetwork(NetworkId.MAINNET)}
disabled={activeNetwork === NetworkId.MAINNET}
>
Set to Mainnet
</button>
</div>
</div>

{wallets.map((wallet) => (
<div key={wallet.id} className={styles.walletGroup}>
<h4 className={styles.walletName} data-active={wallet.isActive}>
Expand Down
78 changes: 74 additions & 4 deletions examples/nuxt/components/Connect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<script setup lang="ts">
import { WalletId, useWallet, type Wallet } from '@txnlab/use-wallet-vue'
import { NetworkId, WalletId, useWallet, type Wallet } from '@txnlab/use-wallet-vue'
import algosdk from 'algosdk'
import { ref } from 'vue'

const { algodClient, transactionSigner, wallets: walletsRef } = useWallet()
const {
algodClient,
activeNetwork,
setActiveNetwork,
transactionSigner,
wallets: walletsRef
} = useWallet()
const wallets = computed(() => walletsRef.value)
const isSending = ref(false)
const magicEmail = ref('')
Expand Down Expand Up @@ -35,7 +41,7 @@ const sendTransaction = async (wallet: Wallet) => {

try {
const atc = new algosdk.AtomicTransactionComposer()
const suggestedParams = await algodClient.getTransactionParams().do()
const suggestedParams = await algodClient.value.getTransactionParams().do()

const transaction = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
from: wallet.activeAccount.address,
Expand All @@ -48,7 +54,7 @@ const sendTransaction = async (wallet: Wallet) => {

console.info(`[App] Sending transaction...`, transaction)

const result = await atc.execute(algodClient, 4)
const result = await atc.execute(algodClient.value, 4)

console.info(`[App] ✅ Successfully sent transaction!`, {
confirmedRound: result.confirmedRound,
Expand All @@ -64,6 +70,35 @@ const sendTransaction = async (wallet: Wallet) => {

<template>
<section>
<div className="network-group">
<h4>
Current Network: <span className="active-network">{{ activeNetwork }}</span>
</h4>
<div className="network-buttons">
<button
type="button"
@click="() => setActiveNetwork(NetworkId.BETANET)"
:disabled="activeNetwork === NetworkId.BETANET"
>
Set to Betanet
</button>
<button
type="button"
@click="() => setActiveNetwork(NetworkId.TESTNET)"
:disabled="activeNetwork === NetworkId.TESTNET"
>
Set to Testnet
</button>
<button
type="button"
@click="() => setActiveNetwork(NetworkId.MAINNET)"
:disabled="activeNetwork === NetworkId.MAINNET"
>
Set to Mainnet
</button>
</div>
</div>

<div v-for="wallet in wallets" :key="wallet.id" class="wallet-group">
<h4 :data-active="wallet.isActive">
{{ wallet.metadata.name }}
Expand Down Expand Up @@ -123,6 +158,36 @@ section {
line-height: 1.5;
}

.network-group {
display: flex;
flex-direction: column;
align-items: center;
gap: 1em;
margin: 2em;
padding: 2em;
background-color: rgba(255, 255, 255, 0.025);
border-color: rgba(255, 255, 255, 0.1);
border-style: solid;
border-width: 1px;
border-radius: 8px;
}

.network-group h4 {
margin: 0;
}

.network-group .active-network {
text-transform: capitalize;
}

.network-buttons {
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
gap: 0.5em;
}

.wallet-group {
display: flex;
flex-direction: column;
Expand Down Expand Up @@ -249,5 +314,10 @@ select {
opacity: 0.75;
color: rgba(16, 16, 16, 0.3);
}

.network-group {
background-color: rgba(0, 0, 0, 0.025);
border-color: rgba(0, 0, 0, 0.1);
}
}
</style>
30 changes: 30 additions & 0 deletions examples/react-ts/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,36 @@
filter: drop-shadow(0 0 2em #61dafbaa);
}

.network-group {
display: flex;
flex-direction: column;
align-items: center;
gap: 1em;
margin: 2em;
padding: 2em;
background-color: light-dark(rgba(0, 0, 0, 0.025), rgba(255, 255, 255, 0.025));
border-color: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1));
border-style: solid;
border-width: 1px;
border-radius: 8px;
}

.network-group h4 {
margin: 0;
}

.network-group .active-network {
text-transform: capitalize;
}

.network-buttons {
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
gap: 0.5em;
}

.wallet-group {
display: flex;
flex-direction: column;
Expand Down
40 changes: 38 additions & 2 deletions examples/react-ts/src/Connect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import { WalletId, useWallet, type Wallet } from '@txnlab/use-wallet-react'
import { NetworkId, WalletId, useWallet, type Wallet } from '@txnlab/use-wallet-react'
import algosdk from 'algosdk'
import * as React from 'react'

export function Connect() {
const { algodClient, activeAddress, transactionSigner, wallets } = useWallet()
const {
algodClient,
activeAddress,
activeNetwork,
setActiveNetwork,
transactionSigner,
wallets
} = useWallet()

const [isSending, setIsSending] = React.useState(false)
const [magicEmail, setMagicEmail] = React.useState('')
Expand Down Expand Up @@ -70,6 +77,35 @@ export function Connect() {

return (
<div>
<div className="network-group">
<h4>
Current Network: <span className="active-network">{activeNetwork}</span>
</h4>
<div className="network-buttons">
<button
type="button"
onClick={() => setActiveNetwork(NetworkId.BETANET)}
disabled={activeNetwork === NetworkId.BETANET}
>
Set to Betanet
</button>
<button
type="button"
onClick={() => setActiveNetwork(NetworkId.TESTNET)}
disabled={activeNetwork === NetworkId.TESTNET}
>
Set to Testnet
</button>
<button
type="button"
onClick={() => setActiveNetwork(NetworkId.MAINNET)}
disabled={activeNetwork === NetworkId.MAINNET}
>
Set to Mainnet
</button>
</div>
</div>

{wallets.map((wallet) => (
<div key={wallet.id} className="wallet-group">
<h4>
Expand Down
30 changes: 30 additions & 0 deletions examples/solid-ts/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,36 @@
filter: drop-shadow(0 0 2em #61dafbaa);
}

.network-group {
display: flex;
flex-direction: column;
align-items: center;
gap: 1em;
margin: 2em;
padding: 2em;
background-color: light-dark(rgba(0, 0, 0, 0.025), rgba(255, 255, 255, 0.025));
border-color: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1));
border-style: solid;
border-width: 1px;
border-radius: 8px;
}

.network-group h4 {
margin: 0;
}

.network-group .active-network {
text-transform: capitalize;
}

.network-buttons {
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
gap: 0.5em;
}

.wallet-group {
display: flex;
flex-direction: column;
Expand Down
Loading