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

Overlay the original token logo and symbol for bridged tokens #147

Merged
merged 9 commits into from
Nov 6, 2024
Merged
Changes from 1 commit
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
Next Next commit
Rename
  • Loading branch information
Lbqds committed Nov 5, 2024
commit 4ebe86ee8c87efd61e7ec0302a8382bb4353ea5c
2 changes: 1 addition & 1 deletion bridge_ui/src/components/NFTOriginVerifier.tsx
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ import {
getEthereumNFT,
isNFT,
isValidEthereumAddress,
} from "../utils/ethereum";
} from "../utils/evm";
import HeaderText from "./HeaderText";
import KeyAndBalance from "./KeyAndBalance";
import NFTViewer from "./TokenSelectors/NFTViewer";
2 changes: 1 addition & 1 deletion bridge_ui/src/components/Recovery.tsx
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ import ChainSelect from "./ChainSelect";
import KeyAndBalance from "./KeyAndBalance";
import RelaySelector from "./RelaySelector";
import { selectTransferSourceChain, selectTransferTransferTx } from "../store/selectors";
import { getEVMCurrentBlockNumber, isEVMTxConfirmed } from "../utils/ethereum";
import { getEVMCurrentBlockNumber, isEVMTxConfirmed } from "../utils/evm";
import { Wallet, useWallet } from "@alephium/web3-react";
import { useTranslation } from "react-i18next";
import i18n from "../i18n";
2 changes: 1 addition & 1 deletion bridge_ui/src/components/TokenSelectors/EvmTokenPicker.tsx
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import {
getEthereumNFT,
getEthereumToken,
isValidEthereumAddress,
} from "../../utils/ethereum";
} from "../../utils/evm";
import TokenPicker, { BasicAccountRender } from "./TokenPicker";

const isWormholev1 = (provider: any, address: string, chainId: ChainId) => {
2 changes: 1 addition & 1 deletion bridge_ui/src/components/TransactionProgress.tsx
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import { useEthereumProvider } from "../contexts/EthereumProviderContext";
import { Transaction } from "../store/transferSlice";
import { ALEPHIUM_MINIMAL_CONSISTENCY_LEVEL, CLUSTER, CHAINS_BY_ID, SOLANA_HOST } from "../utils/consts";
import SmartBlock from "./SmartBlock";
import { DefaultEVMChainConfirmations, EpochDuration, getEVMCurrentBlockNumber, getEvmJsonRpcProvider } from "../utils/ethereum";
import { DefaultEVMChainConfirmations, EpochDuration, getEVMCurrentBlockNumber, getEvmJsonRpcProvider } from "../utils/evm";
import { useWallet } from "@alephium/web3-react";
import { AlephiumBlockTime } from "../utils/alephium";
import { ethers } from "ethers";
2 changes: 1 addition & 1 deletion bridge_ui/src/components/Transactions/index.tsx
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ import { ethers } from "ethers";
import useSWR from "swr";
import { useSnackbar } from "notistack";
import { PageSwitch, DefaultPageSize } from "./PageSwitch";
import { getEVMCurrentBlockNumber, getEvmJsonRpcProvider, getIsTxsCompletedEvm, isEVMTxConfirmed } from "../../utils/ethereum";
import { getEVMCurrentBlockNumber, getEvmJsonRpcProvider, getIsTxsCompletedEvm, isEVMTxConfirmed } from "../../utils/evm";
import { TransactionTable } from "./TransactionTable";
import useIsWalletReady from "../../hooks/useIsWalletReady";
import { useSelector } from "react-redux";
2 changes: 1 addition & 1 deletion bridge_ui/src/components/Transfer/AddToMetamask.tsx
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ import { getEvmChainId } from "../../utils/consts";
import {
ethTokenToParsedTokenAccount,
getEthereumToken,
} from "../../utils/ethereum";
} from "../../utils/evm";

const useStyles = makeStyles((theme) => ({
addButton: {
2 changes: 1 addition & 1 deletion bridge_ui/src/hooks/useAllowance.ts
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ import { useEthereumProvider } from "../contexts/EthereumProviderContext";
import { selectTransferIsApproving } from "../store/selectors";
import { setIsApproving, setIsWalletApproved } from "../store/transferSlice";
import { getTokenBridgeAddressForChain } from "../utils/consts";
import { approveEthWithoutWait } from "../utils/ethereum";
import { approveEthWithoutWait } from "../utils/evm";

export default function useAllowance(
chainId: ChainId,
2 changes: 1 addition & 1 deletion bridge_ui/src/hooks/useCheckIfWormholeWrapped.ts
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ import { Algodv2 } from "algosdk";
import { errorDataWrapper, fetchDataWrapper, receiveDataWrapper } from "../store/helpers";
import { useWallet } from "@alephium/web3-react";
import { useTranslation } from "react-i18next";
import { getEvmJsonRpcProvider } from "../utils/ethereum";
import { getEvmJsonRpcProvider } from "../utils/evm";

export interface StateSafeWormholeWrappedInfo {
isWrapped: boolean;
2 changes: 1 addition & 1 deletion bridge_ui/src/hooks/useGetSourceParsedTokenAccounts.tsx
Original file line number Diff line number Diff line change
@@ -128,7 +128,7 @@ import { ALPH_TOKEN_ID, NodeProvider } from "@alephium/web3";
import { getAvailableBalances, getAlephiumTokenLogoURI } from "../utils/alephium";
import { getRegisteredTokens } from "../utils/tokens";
import { useWallet } from "@alephium/web3-react";
import { getETHTokenLogoURI } from "../utils/ethereum";
import { getETHTokenLogoURI } from "../utils/evm";
import { Alert } from "@material-ui/lab";
import parseError from "../utils/parseError";
import i18n from "../i18n";
2 changes: 1 addition & 1 deletion bridge_ui/src/hooks/useHandleAttest.tsx
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ import { getSignedVAAWithRetry } from "../utils/getSignedVAAWithRetry";
import parseError from "../utils/parseError";
import { signSendAndConfirm } from "../utils/solana";
import { postWithFees, waitForTerraExecution } from "../utils/terra";
import { attestFromEthWithoutWait, waitEVMTxConfirmed, checkETHToken } from "../utils/ethereum";
import { attestFromEthWithoutWait, waitEVMTxConfirmed, checkETHToken } from "../utils/evm";
import { useWallet, Wallet as AlephiumWallet } from "@alephium/web3-react";
import i18n from "../i18n";

2 changes: 1 addition & 1 deletion bridge_ui/src/hooks/useHandleCreateWrapped.tsx
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ import { signSendAndConfirm } from "../utils/solana";
import { postWithFees } from "../utils/terra";
import { waitALPHTxConfirmed } from "../utils/alephium";
import useAttestSignedVAA from "./useAttestSignedVAA";
import { createWrappedOnEthWithoutWait, updateWrappedOnEthWithoutWait } from "../utils/ethereum";
import { createWrappedOnEthWithoutWait, updateWrappedOnEthWithoutWait } from "../utils/evm";
import { useWallet, Wallet as AlephiumWallet } from "@alephium/web3-react";
import { MINIMAL_CONTRACT_DEPOSIT } from "@alephium/web3";
import i18n from "../i18n";
2 changes: 1 addition & 1 deletion bridge_ui/src/hooks/useHandleRedeem.tsx
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ import { signSendAndConfirm } from "../utils/solana";
import { postWithFees } from "../utils/terra";
import { getEmitterChainId, waitALPHTxConfirmed } from "../utils/alephium";
import useTransferSignedVAA from "./useTransferSignedVAA";
import { redeemOnEthNativeWithoutWait, redeemOnEthWithoutWait } from "../utils/ethereum";
import { redeemOnEthNativeWithoutWait, redeemOnEthWithoutWait } from "../utils/evm";
import { useWallet, Wallet as AlephiumWallet } from "@alephium/web3-react";
import { SignerProvider } from "@alephium/web3";
import i18n from "../i18n";
2 changes: 1 addition & 1 deletion bridge_ui/src/hooks/useHandleTransfer.tsx
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ import { postWithFees, waitForTerraExecution } from "../utils/terra";
import useTransferTargetAddressHex from "./useTransferTargetAddress";
import { validateAlephiumRecipientAddress, waitALPHTxConfirmed, waitTxConfirmedAndGetTxInfo } from "../utils/alephium";
import { ExecuteScriptResult } from "@alephium/web3";
import { transferFromEthNativeWithoutWait, transferFromEthWithoutWait, waitEVMTxConfirmed } from "../utils/ethereum";
import { transferFromEthNativeWithoutWait, transferFromEthWithoutWait, waitEVMTxConfirmed } from "../utils/evm";
import { useWallet, Wallet as AlephiumWallet } from "@alephium/web3-react";
import i18n from "../i18n";

File renamed without changes.