Skip to content

Commit

Permalink
fix typos and unused imports
Browse files Browse the repository at this point in the history
catch if pending transaction fails, to prevent that the page is stuck
  • Loading branch information
petersalomonsen committed Jan 4, 2024
1 parent 5a7ceaa commit 39a70ed
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion dist/index.js

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions src/lib/components/ConfirmTransactions.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,17 @@ export default function ConfirmTransactions(props) {
type: StorageType.SendTransactionWithoutConfirmation,
});

const eglibleForDontAskAgain = transactions.length === 1 && !(transactions[0].deposit && transactions[0].deposit.gt(0));
const eligibleForDontAskAgain = transactions.length === 1 && !(transactions[0].deposit && transactions[0].deposit.gt(0));

useEffect(() => {
(async () => {
if (eglibleForDontAskAgain) {
if (eligibleForDontAskAgain) {
const contractId = transactions[0].contractName;
const isSignedIntoContract = await near.isSignedIntoContract(contractId);

const widgetContractPermission = await getWidgetContractPermission(widgetSrc, contractId);

const dontAskForConfirmation = (isSignedIntoContract && widgetContractPermission && widgetContractPermission[transactions[0].methodName])
? true : false;
const dontAskForConfirmation = !!(isSignedIntoContract && widgetContractPermission && widgetContractPermission[transactions[0].methodName]);

setDontAskForConfirmation(dontAskForConfirmation);

Expand Down Expand Up @@ -139,7 +138,7 @@ export default function ConfirmTransactions(props) {
<Markdown text={jsonMarkdown(transaction.args)} />
</div>
))}
{eglibleForDontAskAgain ?
{eligibleForDontAskAgain ?
<>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" id="dontaskagaincheckbox"
Expand Down Expand Up @@ -198,7 +197,7 @@ export default function ConfirmTransactions(props) {
return;
}
}
const result = await near.sendTransactions(transactions)
const result = await near.sendTransactions(transactions);
setLoading(false);
onHide(result);
}}
Expand Down
3 changes: 1 addition & 2 deletions src/lib/components/Widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import React, {
useContext,
useEffect,
useLayoutEffect,
useState,
createContext
useState
} from "react";
import { useNear } from "../data/near";
import ConfirmTransactions from "./ConfirmTransactions";
Expand Down
6 changes: 5 additions & 1 deletion src/lib/data/near.js
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,11 @@ async function _initNear({
const walletConnection = await createWalletConnectionForContract(_near, pendingTransaction.contractName);
if (walletConnection) {
console.log('sending pending transaction', pendingTransaction);
await sendTransactions(_near, [pendingTransaction]);
try {
await sendTransactions(_near, [pendingTransaction]);
} catch (e) {
console.error('error sending pending transaction', e);
}
sessionStorage.removeItem(PENDING_TRANSACTION_SESSION_STORAGE_KEY);
}
}
Expand Down

0 comments on commit 39a70ed

Please sign in to comment.