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.

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

175 Bug fix 'Cannonical token' message is not displayed on “Are you sure?” pop-up #304

Merged
merged 3 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xlabs/portal-bridge-ui",
"version": "0.1.63",
"version": "0.1.64",
"private": true,
"dependencies": {
"@certusone/wormhole-sdk": "^0.9.22",
Expand Down Expand Up @@ -122,7 +122,7 @@
"lint-staged": "^13.2.3",
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.1",
"prettier": "^3.0.1",
"prettier": "^3.0.2",
"process": "^0.11.10",
"punycode": "^2.1.1",
"querystring-es3": "^0.2.1",
Expand Down
5 changes: 2 additions & 3 deletions src/components/Migration/EvmQuickMigrate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,8 @@ function EvmMigrationLineItem({
poolInfo.data.migrator.address,
migrationAmountAbs
);
const transaction = await poolInfo.data.migrator.migrate(
migrationAmountAbs
);
const transaction =
await poolInfo.data.migrator.migrate(migrationAmountAbs);
await transaction.wait();
setTransaction(transaction.hash);
enqueueSnackbar(null, {
Expand Down
10 changes: 4 additions & 6 deletions src/components/SolanaCreateAssociatedAddress.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,8 @@ export function useAssociatedAccountExistsState(
);
const match = associatedAddress.toString() === readableTargetAddress;
if (match) {
const associatedAddressInfo = await connection.getAccountInfo(
associatedAddress
);
const associatedAddressInfo =
await connection.getAccountInfo(associatedAddress);
if (!associatedAddressInfo) {
if (!cancelled) {
setAssociatedAccountExists(false);
Expand Down Expand Up @@ -112,9 +111,8 @@ export default function SolanaCreateAssociatedAddress({
);
const match = associatedAddress.toString() === readableTargetAddress;
if (match) {
const associatedAddressInfo = await connection.getAccountInfo(
associatedAddress
);
const associatedAddressInfo =
await connection.getAccountInfo(associatedAddress);
if (!associatedAddressInfo) {
setIsCreating(true);
const transaction = new Transaction().add(
Expand Down
5 changes: 1 addition & 4 deletions src/components/Transfer/TokenWarning.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,7 @@ export default function TokenWarning({
const showMultiChainWarning =
isMultiChain && isWormholeWrapped && targetChain !== CHAIN_ID_APTOS;
const showCanonicalWarning =
!isMultiChain &&
isWormholeWrapped &&
targetChain !== CHAIN_ID_APTOS &&
showCanonicalTbtcMessage;
!isMultiChain && targetChain !== CHAIN_ID_APTOS && showCanonicalTbtcMessage;
const showWrappedWarning =
!isMultiChain &&
isWormholeWrapped &&
Expand Down
5 changes: 2 additions & 3 deletions src/hooks/useHandleRedeem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,8 @@ async function evm(
signer
);

const estimateGas = await L2WormholeGateway.estimateGas.receiveTbtc(
signedVAA
);
const estimateGas =
await L2WormholeGateway.estimateGas.receiveTbtc(signedVAA);

// We increase the gas limit estimation here by a factor of 10% to account for some faulty public JSON-RPC endpoints.
const gasLimit = estimateGas.mul(1100).div(1000);
Expand Down
Loading