diff --git a/.gitignore b/.gitignore index 6b34d3516..b6b970499 100644 --- a/.gitignore +++ b/.gitignore @@ -48,12 +48,12 @@ cypress.env.json # Next.js .next -#cypress +# cypress /apps/**/cypress/reports/ /apps/**/cypress/downloads/ /apps/**/fixtures/wallet/node** -#console-test +# apps/trading/e2e __pycache__/ apps/trading/e2e/logs/ apps/trading/e2e/.pytest_cache/ diff --git a/.prettierignore b/.prettierignore index 2b04963a2..296f30097 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,6 +1,7 @@ # Add files here to ignore them from prettier formatting /dist +/dist-result /coverage __generated__ __generated___ @@ -13,3 +14,10 @@ apps/static/src/assets/testnet-tranches.json /apps/**/cypress/downloads/ /.nx/cache + +# apps/trading/e2e +__pycache__/ +apps/trading/e2e/logs/ +apps/trading/e2e/.pytest_cache/ +apps/trading/e2e/traces/ +.pytest_cache/ diff --git a/apps/trading/components/fees-container/fees-container.tsx b/apps/trading/components/fees-container/fees-container.tsx index 1cce83fe4..0347afc21 100644 --- a/apps/trading/components/fees-container/fees-container.tsx +++ b/apps/trading/components/fees-container/fees-container.tsx @@ -55,7 +55,7 @@ export const FeesContainer = () => { const { volumeDiscount, volumeTierIndex, volumeInWindow, volumeTiers } = useVolumeStats( feesData?.volumeDiscountStats, - programData?.currentVolumeDiscountProgram, + programData?.currentVolumeDiscountProgram ); const { @@ -72,7 +72,7 @@ export const FeesContainer = () => { programData?.currentReferralProgram, feesData?.epoch, feesData?.referrer, - feesData?.referee, + feesData?.referee ); const loading = paramsLoading || feesLoading || programLoading; @@ -80,7 +80,7 @@ export const FeesContainer = () => { const isReferralProgramRunning = Boolean(programData?.currentReferralProgram); const isVolumeDiscountProgramRunning = Boolean( - programData?.currentVolumeDiscountProgram, + programData?.currentVolumeDiscountProgram ); return ( @@ -212,12 +212,12 @@ export const TradingFees = ({ const maxLiq = maxBy(markets, (m) => Number(m.fees.factors.liquidityFee)); const total = new BigNumber(params.market_fee_factors_makerFee).plus( - new BigNumber(params.market_fee_factors_infrastructureFee), + new BigNumber(params.market_fee_factors_infrastructureFee) ); const adjustedTotal = getAdjustedFee( [total], - [referralDiscountBigNum, volumeDiscountBigNum], + [referralDiscountBigNum, volumeDiscountBigNum] ); let minTotal; @@ -235,12 +235,12 @@ export const TradingFees = ({ minAdjustedTotal = getAdjustedFee( [total, minLiqFee], - [referralDiscountBigNum, volumeDiscountBigNum], + [referralDiscountBigNum, volumeDiscountBigNum] ); maxAdjustedTotal = getAdjustedFee( [total, maxLiqFee], - [referralDiscountBigNum, volumeDiscountBigNum], + [referralDiscountBigNum, volumeDiscountBigNum] ); } @@ -250,7 +250,7 @@ export const TradingFees = ({
{minAdjustedTotal !== undefined && maxAdjustedTotal !== undefined ? `${formatPercentage(minAdjustedTotal)}%-${formatPercentage( - maxAdjustedTotal, + maxAdjustedTotal )}%` : `${formatPercentage(adjustedTotal)}%`}
@@ -260,7 +260,7 @@ export const TradingFees = ({