From c8a3fd12b2b4576bc1d24d171f4112fef9c10f1d Mon Sep 17 00:00:00 2001 From: RcleydsonR Date: Tue, 17 Jan 2023 19:32:29 -0300 Subject: [PATCH] Improve code quality by fixing lint issues Co-authored-by: brunoedcf --- src/blockchain/buyerMethods.ts | 7 +---- src/blockchain/events.ts | 13 ++++---- src/blockchain/wallet.ts | 6 ++-- src/components/SearchComponent.vue | 46 ++++++++++++++++++---------- src/utils/networkLiquidity.ts | 34 +++++++++++--------- src/views/HomeView.vue | 18 +++++------ src/views/ManageBidsView.vue | 16 +++++----- src/views/TransactionHistoryView.vue | 7 ++--- 8 files changed, 78 insertions(+), 69 deletions(-) diff --git a/src/blockchain/buyerMethods.ts b/src/blockchain/buyerMethods.ts index 1401706..df22f81 100644 --- a/src/blockchain/buyerMethods.ts +++ b/src/blockchain/buyerMethods.ts @@ -8,7 +8,6 @@ import p2pix from "../utils/smart_contract_files/P2PIX.json"; import { BigNumber, ethers, type Event } from "ethers"; import { formatEther, parseEther } from "ethers/lib/utils"; - // Buyer Flow methods // // Make lock @@ -43,7 +42,6 @@ const releaseLock = async ( e2eId: string, lockId: string ) => { - const mockBacenSigner = new ethers.Wallet( "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" ); @@ -60,7 +58,7 @@ const releaseLock = async ( const messageHashBytes = ethers.utils.arrayify(messageToSign); const flatSig = await mockBacenSigner.signMessage(messageHashBytes); const provider = getProvider(); - + const sig = ethers.utils.splitSignature(flatSig); const signer = provider.getSigner(); @@ -105,9 +103,6 @@ const withdrawDeposit = async (depositId: BigNumber): Promise => { return true; }; - - // Releases lock by specific ID and other additional data - export { cancelDeposit, withdrawDeposit, addLock, releaseLock }; diff --git a/src/blockchain/events.ts b/src/blockchain/events.ts index c63cb12..7ca5680 100644 --- a/src/blockchain/events.ts +++ b/src/blockchain/events.ts @@ -41,13 +41,12 @@ const getNetworksLiquidity = async () => { console.log(depositListMumbai); }; -const getValidDeposits = async ( contract?: Contract ): Promise => { +const getValidDeposits = async (contract?: Contract): Promise => { let p2pContract: Contract; - if (contract){ + if (contract) { p2pContract = contract; - } - else{ + } else { const provider = getProvider(); const signer = provider.getSigner(); @@ -60,7 +59,9 @@ const getValidDeposits = async ( contract?: Contract ): Promise => { const depositList: any[] = await Promise.all( eventsDeposits .map(async (deposit) => { - const mappedDeposit = await p2pContract.mapDeposits(deposit.args?.depositID); + const mappedDeposit = await p2pContract.mapDeposits( + deposit.args?.depositID + ); let validDeposit = {}; if (mappedDeposit.valid) { @@ -69,7 +70,7 @@ const getValidDeposits = async ( contract?: Contract ): Promise => { depositID: deposit.args?.depositID, remaining: formatEther(mappedDeposit.remaining), seller: mappedDeposit.seller, - pixKey: mappedDeposit.pixTarget + pixKey: mappedDeposit.pixTarget, }; } diff --git a/src/blockchain/wallet.ts b/src/blockchain/wallet.ts index 8571d66..e876fba 100644 --- a/src/blockchain/wallet.ts +++ b/src/blockchain/wallet.ts @@ -46,7 +46,6 @@ const listValidDepositTransactionsByWalletAddress = async ( return []; }; - const listAllTransactionByWalletAddress = async ( walletAddress: string ): Promise => { @@ -94,10 +93,9 @@ const listReleaseTransactionByWalletAddress = async ( }); }; - -export { +export { updateWalletStatus, listValidDepositTransactionsByWalletAddress, listAllTransactionByWalletAddress, - listReleaseTransactionByWalletAddress + listReleaseTransactionByWalletAddress, }; diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue index 7b54ef5..595e8bf 100644 --- a/src/components/SearchComponent.vue +++ b/src/components/SearchComponent.vue @@ -11,7 +11,12 @@ import { NetworkEnum } from "@/model/NetworkEnum"; // Store reference const etherStore = useEtherStore(); -const { walletAddress, networkName, depositsValidListGoerli, depositsValidListMumbai } = storeToRefs(etherStore); +const { + walletAddress, + networkName, + depositsValidListGoerli, + depositsValidListMumbai, +} = storeToRefs(etherStore); // Reactive state const tokenValue = ref(0); @@ -33,9 +38,12 @@ const connectAccount = async () => { }; const emitConfirmButton = () => { - const selectedDeposit = networkName.value == NetworkEnum.ethereum ? selectedGoerliDeposit.value : selectedMumbaiDeposit.value; - emit('tokenBuy', selectedDeposit, tokenValue.value) -} + const selectedDeposit = + networkName.value == NetworkEnum.ethereum + ? selectedGoerliDeposit.value + : selectedMumbaiDeposit.value; + emit("tokenBuy", selectedDeposit, tokenValue.value); +}; // Debounce methods const handleInputEvent = (event: any) => { @@ -74,31 +82,37 @@ const verifyLiquidity = () => { return; } - selectedGoerliDeposit.value = verifyNetworkLiquidity(tokenValue.value, walletAddress.value, depositsValidListGoerli.value); - selectedMumbaiDeposit.value = verifyNetworkLiquidity(tokenValue.value, walletAddress.value, depositsValidListMumbai.value); + selectedGoerliDeposit.value = verifyNetworkLiquidity( + tokenValue.value, + walletAddress.value, + depositsValidListGoerli.value + ); + selectedMumbaiDeposit.value = verifyNetworkLiquidity( + tokenValue.value, + walletAddress.value, + depositsValidListMumbai.value + ); - enableOrDisableConfirmButton() - if(selectedGoerliDeposit.value || selectedMumbaiDeposit.value){ + enableOrDisableConfirmButton(); + if (selectedGoerliDeposit.value || selectedMumbaiDeposit.value) { hasLiquidity.value = true; enableWalletButton.value = true; - } - else{ + } else { hasLiquidity.value = false; enableWalletButton.value = true; } }; const enableOrDisableConfirmButton = (): void => { - if(selectedGoerliDeposit.value && networkName.value == NetworkEnum.ethereum) + if (selectedGoerliDeposit.value && networkName.value == NetworkEnum.ethereum) enableConfirmButton.value = true; - if(selectedMumbaiDeposit.value && networkName.value == NetworkEnum.polygon) + if (selectedMumbaiDeposit.value && networkName.value == NetworkEnum.polygon) enableConfirmButton.value = true; - else - enableConfirmButton.value = false; -} + else enableConfirmButton.value = false; +}; watch(networkName, async () => { - enableOrDisableConfirmButton() + enableOrDisableConfirmButton(); }); diff --git a/src/utils/networkLiquidity.ts b/src/utils/networkLiquidity.ts index 6baaf28..439ec3d 100644 --- a/src/utils/networkLiquidity.ts +++ b/src/utils/networkLiquidity.ts @@ -1,17 +1,21 @@ -const verifyNetworkLiquidity = (tokenValue: number, walletAddress: string, validDepositList: any[]) => { - const element = validDepositList.find((element) => { - const remaining = element.remaining; - if ( - tokenValue!! <= remaining && - tokenValue!! != 0 && - element.seller !== walletAddress - ) { - return true; - } - return false; - }); +const verifyNetworkLiquidity = ( + tokenValue: number, + walletAddress: string, + validDepositList: any[] +) => { + const element = validDepositList.find((element) => { + const remaining = element.remaining; + if ( + tokenValue!! <= remaining && + tokenValue!! != 0 && + element.seller !== walletAddress + ) { + return true; + } + return false; + }); - return element -} + return element; +}; -export { verifyNetworkLiquidity } \ No newline at end of file +export { verifyNetworkLiquidity }; diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index b6ab3bc..4a369ef 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -10,7 +10,7 @@ import { storeToRefs } from "pinia"; import { addLock, releaseLock } from "@/blockchain/buyerMethods"; import { updateWalletStatus } from "@/blockchain/wallet"; import { getNetworksLiquidity } from "@/blockchain/events"; -import { listReleaseTransactionByWalletAddress } from "@/blockchain/wallet" +import { listReleaseTransactionByWalletAddress } from "@/blockchain/wallet"; enum Step { Search, @@ -46,7 +46,7 @@ const confirmBuyClick = async (selectedDeposit: any, tokenValue: number) => { lockTransactionHash.value = lock.transactionHash; }) .catch((err) => { - console.log(err) + console.log(err); flowStep.value = Step.Search; }); @@ -75,21 +75,21 @@ const releaseTransaction = async ({ e2eId }: any) => { ); release.wait(); - await listReleaseTransactionByWalletAddress(walletAddress.value.toLowerCase()) - .then((releaseTransactions) => { - if (releaseTransactions) - lastWalletReleaseTransactions.value = releaseTransactions; - }); + await listReleaseTransactionByWalletAddress( + walletAddress.value.toLowerCase() + ).then((releaseTransactions) => { + if (releaseTransactions) + lastWalletReleaseTransactions.value = releaseTransactions; + }); await updateWalletStatus(); loadingRelease.value = false; } }; - onMounted(async () => { await getNetworksLiquidity(); -}) +});