Skip to content

Commit

Permalink
Merge branch 'main' into deepaksing/issue13339
Browse files Browse the repository at this point in the history
  • Loading branch information
dionysuzx authored Apr 25, 2023
2 parents d9cda84 + 2986f10 commit 4cefd72
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 36 deletions.
1 change: 1 addition & 0 deletions .github/workflows/lint-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
repo
branding
bridge-ui
deps
eventindexer
protocol
relayer
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ jobs:
- uses: google-github-actions/release-please-action@v3
with:
command: manifest
skip-labeling: true
2 changes: 1 addition & 1 deletion packages/bridge-ui/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default {
global: {
statements: 95,
branches: 85, // TODO: increase to 90
functions: 93,
functions: 94,
lines: 95,
},
},
Expand Down
26 changes: 7 additions & 19 deletions packages/bridge-ui/src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,19 @@
import { MetaMaskConnector } from '@wagmi/core/connectors/metaMask';
import { setupI18n } from './i18n';
import { transactioner, transactions } from './store/transactions';
import { transactions } from './store/transactions';
import Navbar from './components/Navbar.svelte';
import Toast, { successToast } from './components/Toast.svelte';
import { signer } from './store/signer';
import type { BridgeTransaction, Transactioner } from './domain/transactions';
import type { BridgeTransaction } from './domain/transactions';
import { wagmiClient } from './store/wagmi';
setupI18n({ withLocale: 'en' });
import SwitchEthereumChainModal from './components/modals/SwitchEthereumChainModal.svelte';
import { ethers } from 'ethers';
import { StorageService } from './storage/StorageService';
import { MessageStatus } from './domain/message';
import BridgeABI from './constants/abi/Bridge';
import type { TokenService } from './domain/token';
import { CustomTokenService } from './storage/CustomTokenService';
import { userTokens, tokenService } from './store/userToken';
import { userTokens } from './store/userToken';
import { RelayerAPIService } from './relayer-api/RelayerAPIService';
import {
DEFAULT_PAGE,
Expand All @@ -39,6 +36,7 @@
import { providers } from './provider/providers';
import { RELAYER_URL } from './constants/envVars';
import Router from './components/Router.svelte';
import { storageService, tokenService } from './storage/services';
const { chains: wagmiChains, provider } = configureChains(
[mainnetWagmiChain, taikoWagmiChain],
Expand Down Expand Up @@ -74,21 +72,11 @@
],
});
const storageTransactioner: Transactioner = new StorageService(
window.localStorage,
providers,
);
const relayerApiService: RelayerAPI = new RelayerAPIService(
RELAYER_URL,
providers,
);
const tokenStore: TokenService = new CustomTokenService(window.localStorage);
tokenService.set(tokenStore);
transactioner.set(storageTransactioner);
relayerApi.set(relayerApiService);
signer.subscribe(async (store) => {
Expand All @@ -106,7 +94,7 @@
const blockInfoMap = await $relayerApi.getBlockInfo();
relayerBlockInfoMap.set(blockInfoMap);
const txs = await $transactioner.getAllByAddress(userAddress);
const txs = await storageService.getAllByAddress(userAddress);
const hashToApiTxsMap = new Map(
apiTxs.map((tx) => {
return [tx.hash.toLowerCase(), 1];
Expand All @@ -117,11 +105,11 @@
return !hashToApiTxsMap.has(tx.hash.toLowerCase());
});
$transactioner.updateStorageByAddress(userAddress, updatedStorageTxs);
storageService.updateStorageByAddress(userAddress, updatedStorageTxs);
transactions.set([...updatedStorageTxs, ...apiTxs]);
const tokens = $tokenService.getTokens(userAddress);
const tokens = tokenService.getTokens(userAddress);
userTokens.set(tokens);
}
});
Expand Down
5 changes: 3 additions & 2 deletions packages/bridge-ui/src/components/buttons/Connect.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
import MetaMask from '../icons/MetaMask.svelte';
import WalletConnect from '../icons/WalletConnect.svelte';
import CoinbaseWallet from '../icons/CoinbaseWallet.svelte';
import { transactioner, transactions } from '../../store/transactions';
import { transactions } from '../../store/transactions';
import { mainnetChain, taikoChain } from '../../chain/chains';
import { errorToast, successToast } from '../Toast.svelte';
import { storageService } from '../../storage/services';
export let isConnectWalletModalOpen = false;
Expand Down Expand Up @@ -60,7 +61,7 @@
const wagmiSigner = await setSigner();
if (wagmiSigner) {
const signerAddress = await wagmiSigner.getAddress();
const signerTransactions = await $transactioner.getAllByAddress(
const signerTransactions = await storageService.getAllByAddress(
signerAddress,
);
transactions.set(signerTransactions);
Expand Down
5 changes: 3 additions & 2 deletions packages/bridge-ui/src/components/buttons/SelectToken.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
import { ethers } from 'ethers';
import ERC20_ABI from '../../constants/abi/ERC20';
import { signer } from '../../store/signer';
import { userTokens, tokenService } from '../../store/userToken';
import { userTokens } from '../../store/userToken';
import { fromChain, toChain } from '../../store/chain';
import Erc20 from '../icons/ERC20.svelte';
import AddCustomErc20 from '../form/AddCustomERC20.svelte';
import { ETHToken, tokens } from '../../token/tokens';
import { errorToast, successToast } from '../Toast.svelte';
import { tokenService } from '../../storage/services';
let dropdownElement: HTMLDivElement;
let showAddressField = false;
Expand Down Expand Up @@ -84,7 +85,7 @@
logoComponent: null,
} as Token;
const updateTokensList = $tokenService.storeToken(token, userAddress);
const updateTokensList = tokenService.storeToken(token, userAddress);
select(token);
Expand Down
5 changes: 3 additions & 2 deletions packages/bridge-ui/src/components/form/AddCustomERC20.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
import type { Token, TokenDetails } from '../../domain/token';
import { signer } from '../../store/signer';
import { token as tokenStore } from '../../store/token';
import { userTokens, tokenService } from '../../store/userToken';
import { userTokens } from '../../store/userToken';
import Erc20 from '../icons/ERC20.svelte';
import Modal from '../modals/Modal.svelte';
import { LottiePlayer } from '@lottiefiles/svelte-lottie-player';
import { ethers } from 'ethers';
import ERC20 from '../../constants/abi/ERC20';
import { ETHToken } from '../../token/tokens';
import { errorToast } from '../Toast.svelte';
import { tokenService } from '../../storage/services';
export let showAddressField: boolean = false;
export let addERC20: (event: SubmitEvent) => Promise<void>;
Expand All @@ -26,7 +27,7 @@
async function remove(token) {
const address = await $signer.getAddress();
const updatedTokensList = $tokenService.removeToken(token, address);
const updatedTokensList = tokenService.removeToken(token, address);
userTokens.set(updatedTokensList);
tokenStore.set(ETHToken);
}
Expand Down
8 changes: 4 additions & 4 deletions packages/bridge-ui/src/components/form/BridgeForm.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import { truncateString } from '../../utils/truncateString';
import {
pendingTransactions,
transactioner,
transactions as transactionsStore,
} from '../../store/transactions';
import Memo from './Memo.svelte';
Expand All @@ -39,6 +38,7 @@
import { isOnCorrectChain } from '../../utils/isOnCorrectChain';
import { ProcessingFeeMethod } from '../../domain/fee';
import Button from '../buttons/Button.svelte';
import { storageService } from '../../storage/services';
let amount: string;
let amountInput: HTMLInputElement;
Expand Down Expand Up @@ -279,7 +279,7 @@
tx.chainId = $fromChain.id;
const userAddress = await $signer.getAddress();
let transactions: BridgeTransaction[] =
await $transactioner.getAllByAddress(userAddress);
await storageService.getAllByAddress(userAddress);
let bridgeTransaction: BridgeTransaction = {
fromChainId: $fromChain.id,
Expand All @@ -297,12 +297,12 @@
transactions.push(bridgeTransaction);
}
$transactioner.updateStorageByAddress(userAddress, transactions);
storageService.updateStorageByAddress(userAddress, transactions);
const allTransactions = $transactionsStore;
// get full BridgeTransaction object
bridgeTransaction = await $transactioner.getTransactionByHash(
bridgeTransaction = await storageService.getTransactionByHash(
userAddress,
tx.hash,
);
Expand Down
7 changes: 7 additions & 0 deletions packages/bridge-ui/src/storage/services.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { providers } from '../provider/providers';
import { CustomTokenService } from './CustomTokenService';
import { StorageService } from './StorageService';

export const storageService = new StorageService(localStorage, providers);

export const tokenService = new CustomTokenService(localStorage);
3 changes: 1 addition & 2 deletions packages/bridge-ui/src/store/transactions.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { writable } from 'svelte/store';
import type { Signer, Transaction, ethers } from 'ethers';
import type { BridgeTransaction, Transactioner } from '../domain/transactions';
import type { BridgeTransaction } from '../domain/transactions';
import { Deferred } from '../utils/Deferred';

export const transactions = writable<BridgeTransaction[]>([]);
export const transactioner = writable<Transactioner>();

// Custom store: pendingTransactions
const { subscribe, set, update } = writable<Transaction[]>([]);
Expand Down
6 changes: 2 additions & 4 deletions packages/bridge-ui/src/store/userToken.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import type { Token, TokenService } from '../domain/token';
import type { Token } from '../domain/token';
import { writable } from 'svelte/store';

const tokenService = writable<TokenService>();
const userTokens = writable<Token[]>([]);
export { tokenService, userTokens };
export const userTokens = writable<Token[]>([]);

0 comments on commit 4cefd72

Please sign in to comment.