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

add error handling on approve #703

Merged
merged 4 commits into from
Sep 18, 2024
Merged

add error handling on approve #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cad0190
wrap onApprove code with try/catch
KannuSingh Sep 10, 2024
e5bb2d4
donot commit middleware
KannuSingh Sep 10, 2024
a0ca11a
Merge branch 'main' into fix-error-handling-on-approve-action
KannuSingh Sep 18, 2024
4755a39
chores: run prettier
KannuSingh Sep 18, 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
437 changes: 260 additions & 177 deletions advanced/wallets/react-wallet-v2/src/utils/MultibridgeUtil.ts
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 19 additions & 13 deletions advanced/wallets/react-wallet-v2/src/views/AuthRequestModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import SettingsStore from '@/store/SettingsStore'
import { eip155Addresses, eip155Wallets } from '@/utils/EIP155WalletUtil'
import { web3wallet } from '@/utils/WalletConnectUtil'
import RequestModal from '../components/RequestModal'
import { styledToast } from '@/utils/HelperUtil'

export default function AuthRequestModal() {
const { account } = useSnapshot(SettingsStore.state)
Expand All @@ -32,19 +33,24 @@ export default function AuthRequestModal() {

// Handle approve action (logic varies based on request method)
const onApprove = useCallback(async () => {
if (request) {
setIsLoadingApprove(true)
const signature = await eip155Wallets[address].signMessage(message)
await web3wallet.respondAuthRequest(
{
id: request.id,
signature: {
s: signature,
t: 'eip191'
}
},
iss
)
try {
if (request) {
setIsLoadingApprove(true)
const signature = await eip155Wallets[address].signMessage(message)
await web3wallet.respondAuthRequest(
{
id: request.id,
signature: {
s: signature,
t: 'eip191'
}
},
iss
)
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
43 changes: 24 additions & 19 deletions advanced/wallets/react-wallet-v2/src/views/SessionAuthenticateModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,26 +92,31 @@ export default function SessionAuthenticateModal() {

// Handle approve action (logic varies based on request method)
const onApprove = useCallback(async () => {
if (messages.length) {
const signedAuths = []
for (const message of messages) {
const signature = await eip155Wallets[address].signMessage(message.message)
const signedCacao = buildAuthObject(
message.authPayload,
{
t: 'eip191',
s: signature
},
message.iss
)
signedAuths.push(signedCacao)
}
try {
if (messages.length) {
const signedAuths = []
for (const message of messages) {
const signature = await eip155Wallets[address].signMessage(message.message)
const signedCacao = buildAuthObject(
message.authPayload,
{
t: 'eip191',
s: signature
},
message.iss
)
signedAuths.push(signedCacao)
}

await web3wallet.engine.signClient.approveSessionAuthenticate({
id: messages[0].id,
auths: signedAuths
})
SettingsStore.setSessions(Object.values(web3wallet.getActiveSessions()))
await web3wallet.engine.signClient.approveSessionAuthenticate({
id: messages[0].id,
auths: signedAuths
})
SettingsStore.setSessions(Object.values(web3wallet.getActiveSessions()))
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
ModalStore.close()
}
}, [address, messages])
Expand Down
15 changes: 7 additions & 8 deletions advanced/wallets/react-wallet-v2/src/views/SessionGrantPermissionsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,18 @@ export default function SessionGrantPermissionsModal() {
console.log({ grantPermissionsRequestParams })
// Handle approve action (logic varies based on request method)
const onApprove = useCallback(async () => {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveEIP7715Request(requestEvent)
try {
try {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveEIP7715Request(requestEvent)
await web3wallet.respondSessionRequest({
topic,
response
})
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
17 changes: 8 additions & 9 deletions advanced/wallets/react-wallet-v2/src/views/SessionProposalModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,9 @@ export default function SessionProposalModal() {

// Hanlde approve action, construct session namespace
const onApprove = useCallback(async () => {
if (proposal && namespaces) {
setIsLoadingApprove(true)
try {
try {
if (proposal && namespaces) {
setIsLoadingApprove(true)
if (reorderedEip155Accounts.length > 0) {
// we should append the smart accounts to the available eip155 accounts
namespaces.eip155.accounts = reorderedEip155Accounts.concat(namespaces.eip155.accounts)
Expand All @@ -284,14 +284,13 @@ export default function SessionProposalModal() {
sessionProperties
})
SettingsStore.setSessions(Object.values(web3wallet.getActiveSessions()))
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
setIsLoadingApprove(false)
ModalStore.close()
}, [namespaces, proposal, reorderedEip155Accounts])

// Hanlde reject action
Expand Down
13 changes: 6 additions & 7 deletions advanced/wallets/react-wallet-v2/src/views/SessionSendCallsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,19 @@ export default function SessionSendCallsModal() {

// Handle approve action
const onApprove = useCallback(async () => {
if (requestEvent && topic) {
setIsLoadingApprove(true)
try {
try {
if (requestEvent && topic) {
setIsLoadingApprove(true)
console.log('Calls approved.')
const response = await approveEIP5792Request(requestEvent)
await web3wallet.respondSessionRequest({
topic,
response
})
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
13 changes: 6 additions & 7 deletions advanced/wallets/react-wallet-v2/src/views/SessionSendTransactionModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,19 +106,18 @@ export default function SessionSendTransactionModal() {

// Handle approve action
const onApprove = useCallback(async () => {
if (requestEvent && topic) {
setIsLoadingApprove(true)
try {
try {
if (requestEvent && topic) {
setIsLoadingApprove(true)
const response = await approveEIP155Request(requestEvent)
await web3wallet.respondSessionRequest({
topic,
response
})
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
15 changes: 7 additions & 8 deletions advanced/wallets/react-wallet-v2/src/views/SessionSignCosmosModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,18 @@ export default function SessionSignCosmosModal() {

// Handle approve action (logic varies based on request method)
const onApprove = useCallback(async () => {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveCosmosRequest(requestEvent)
try {
try {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveCosmosRequest(requestEvent)
await web3wallet.respondSessionRequest({
topic,
response
})
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
15 changes: 8 additions & 7 deletions advanced/wallets/react-wallet-v2/src/views/SessionSignKadenaModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,20 @@ export default function SessionSignKadenaModal() {

// Handle approve action (logic varies based on request method)
const onApprove = useCallback(async () => {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveKadenaRequest(requestEvent)
try {
try {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveKadenaRequest(requestEvent)
await web3wallet.respondSessionRequest({
topic,
response
})
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
ModalStore.close()
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
15 changes: 7 additions & 8 deletions advanced/wallets/react-wallet-v2/src/views/SessionSignModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,18 @@ export default function SessionSignModal() {

// Handle approve action (logic varies based on request method)
const onApprove = useCallback(async () => {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveEIP155Request(requestEvent)
try {
try {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveEIP155Request(requestEvent)
await web3wallet.respondSessionRequest({
topic,
response
})
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
15 changes: 7 additions & 8 deletions advanced/wallets/react-wallet-v2/src/views/SessionSignMultiversxModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,18 @@ export default function SessionSignMultiversxModal() {

// Handle approve action (logic varies based on request method)
const onApprove = useCallback(async () => {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveMultiversxRequest(requestEvent)
try {
try {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveMultiversxRequest(requestEvent)
await web3wallet.respondSessionRequest({
topic,
response
})
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
15 changes: 7 additions & 8 deletions advanced/wallets/react-wallet-v2/src/views/SessionSignNearModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,19 +142,18 @@ export default function SessionSignNearModal() {

// Handle approve action (logic varies based on request method)
const onApprove = useCallback(async () => {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveNearRequest(requestEvent)
try {
try {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveNearRequest(requestEvent)
await web3wallet.respondSessionRequest({
topic,
response
})
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
15 changes: 7 additions & 8 deletions advanced/wallets/react-wallet-v2/src/views/SessionSignPolkadotModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,18 @@ export default function SessionSignPolkadotModal() {

// Handle approve action (logic varies based on request method)
const onApprove = useCallback(async () => {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approvePolkadotRequest(requestEvent)
try {
try {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approvePolkadotRequest(requestEvent)
await web3wallet.respondSessionRequest({
topic,
response
})
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
15 changes: 7 additions & 8 deletions advanced/wallets/react-wallet-v2/src/views/SessionSignSolanaModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,18 @@ export default function SessionSignSolanaModal() {

// Handle approve action (logic varies based on request method)
const onApprove = useCallback(async () => {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveSolanaRequest(requestEvent)
try {
try {
if (requestEvent) {
setIsLoadingApprove(true)
const response = await approveSolanaRequest(requestEvent)
await web3wallet.respondSessionRequest({
topic,
response
})
} catch (e) {
setIsLoadingApprove(false)
styledToast((e as Error).message, 'error')
return
}
} catch (e) {
styledToast((e as Error).message, 'error')
} finally {
setIsLoadingApprove(false)
ModalStore.close()
}
Expand Down
Loading