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: show broken tx #1063

Merged
merged 12 commits into from
Jan 30, 2024
Merged

feat: show broken tx #1063

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
51360bc
chore: change versions to work with fuels forc version
matt-user Jan 22, 2024
517649f
chore: debugging
matt-user Jan 23, 2024
1c5c51e
feat: show broken simulated tx
matt-user Jan 23, 2024
badd74b
Merge branch 'master' into matt-user/feat-show-broken-tx
matt-user Jan 23, 2024
4270b79
chore: small changes
matt-user Jan 23, 2024
01652f8
Merge branch 'matt-user/feat-show-broken-tx' of https://github.com/Fu…
matt-user Jan 23, 2024
dc42c5b
chore: changeset
matt-user Jan 23, 2024
5db517d
refactor: component
matt-user Jan 25, 2024
2965d1b
Merge branch 'master' into matt-user/feat-show-broken-tx
matt-user Jan 26, 2024
21754f2
chore: add methods to panic and revert tests
luizstacio Jan 26, 2024
a7bbd7f
Merge branch 'master' into matt-user/feat-show-broken-tx
matt-user Jan 26, 2024
661fd2b
feat: throw error if the simulated transaction will fail
matt-user Jan 29, 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
5 changes: 5 additions & 0 deletions .changeset/twelve-lemons-divide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'fuels-wallet': patch
---

Add an error message for a failed simulated tx
29 changes: 23 additions & 6 deletions packages/app/src/systems/DApp/pages/TransactionRequest/TransactionRequest.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { cssObj } from '@fuel-ui/css';
import { Alert, Button } from '@fuel-ui/react';
import { TransactionStatus } from 'fuels';
import { useAssets } from '~/systems/Asset';
import { Layout, ConnectInfo } from '~/systems/Core';
import { TopBarType } from '~/systems/Core/components/Layout/TopBar';
Expand All @@ -25,12 +26,27 @@ export function TransactionRequest() {
title={ctx.input.title}
headerText="Requesting a transaction from:"
/>
<Alert status="warning" css={styles.alert}>
<Alert.Title>Confirm before approving</Alert.Title>
<Alert.Description>
Carefully check if all the details in your transaction are correct
</Alert.Description>
</Alert>
{txResult?.status === TransactionStatus.failure ? (
<Alert status="error" css={styles.alert}>
<Alert.Title>
Simulating your transaction resulted in an error
</Alert.Title>
<Alert.Description>
{`Carefully check if all the details in your transaction are correct. ${
txResult?.operations.length
? `Operations: ${txResult?.operations}`
: ''
}`}
</Alert.Description>
</Alert>
) : (
<Alert status="warning" css={styles.alert}>
<Alert.Title>Confirm before approving</Alert.Title>
<Alert.Description>
Carefully check if all the details in your transaction are correct
</Alert.Description>
</Alert>
)}
</>
);

Expand Down Expand Up @@ -91,6 +107,7 @@ export function TransactionRequest() {
intent="primary"
onPress={handlers.approve}
isLoading={ctx.isLoading || status('sending')}
isDisabled={txResult?.status === TransactionStatus.failure}
>
Approve
</Button>
Expand Down
11 changes: 11 additions & 0 deletions packages/app/src/systems/Transaction/services/transaction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
hexlify,
processGqlReceipt,
BN,
TransactionStatus,
} from 'fuels';
import { isEth } from '~/systems/Asset/utils/asset';
import { db, uniqueId, WalletLockedCustom } from '~/systems/Core';
Expand Down Expand Up @@ -189,6 +190,16 @@ export class TxService {
maxInputs,
});

// Workaround until https://github.com/FuelLabs/fuels-ts/issues/1674 is fixed
transactionSummary.isStatusFailure = transactionSummary.receipts.some(
(receipt) => {
return receipt.type === 3;
}
);
if (transactionSummary.isStatusFailure) {
transactionSummary.status = TransactionStatus.failure;
}

return transactionSummary;
}

Expand Down
Loading