From c5d9fcc7e4cab8a9bac29096b26ece77af4c5d7d Mon Sep 17 00:00:00 2001 From: Bruno Confortin Date: Mon, 29 Mar 2021 13:37:42 -0300 Subject: [PATCH 1/7] Removed unused consts --- .../augur-simplified/src/modules/constants.ts | 62 +------------------ 1 file changed, 2 insertions(+), 60 deletions(-) diff --git a/packages/augur-simplified/src/modules/constants.ts b/packages/augur-simplified/src/modules/constants.ts index 06c63753801..beff7122130 100644 --- a/packages/augur-simplified/src/modules/constants.ts +++ b/packages/augur-simplified/src/modules/constants.ts @@ -1,15 +1,6 @@ import { MarketTypeName } from '@augurproject/sdk-lite'; -import { Icons, createBigNumber } from '@augurproject/augur-comps'; -const { - EthIcon, - UsdIcon, - CryptoIcon, - EntertainmentIcon, - FinanceIcon, - MedicalIcon, - PoliticsIcon, - SportsIcon, -} = Icons; +import { createBigNumber } from '@augurproject/augur-comps'; + // # Market Types export const YES_NO = MarketTypeName.YesNo; export const CATEGORICAL = MarketTypeName.Categorical; @@ -20,16 +11,6 @@ export const MARKET = 'market'; export const MARKETS = 'markets'; export const PORTFOLIO = 'portfolio'; -export const YES_NO_OUTCOMES_NAMES = ['Invalid', 'No', 'Yes']; -// QUERY_PARAMS -export const MARKET_ID_PARAM_NAME = 'id'; -export const AFFILIATE_NAME = 'r'; -export const THEME_NAME = 't'; - -export const OUTCOME_YES_NAME = 'Yes'; -export const OUTCOME_NO_NAME = 'No'; -export const OUTCOME_INVALID_NAME = 'Invalid'; - // Directions export const BUY = 'buy'; export const SELL = 'sell'; @@ -37,7 +18,6 @@ export const SELL = 'sell'; export const ADD_LIQUIDITY = 'add liquidity'; export const ETHER = createBigNumber(10).pow(18); -export const GWEI_CONVERSION = 1000000000; export const TEN = createBigNumber(10, 10); export const ZERO = createBigNumber(0); export const ONE = createBigNumber(1); @@ -46,10 +26,6 @@ export const THOUSAND = createBigNumber(1000); export const MILLION = THOUSAND.times(THOUSAND); export const BILLION = MILLION.times(THOUSAND); export const TRILLION = BILLION.times(THOUSAND); -export const DAYS_IN_YEAR = createBigNumber(365); -export const SEC_IN_DAY = createBigNumber(86400); -export const PORTION_OF_INVALID_POOL_SELL = createBigNumber(0.5); -export const PORTION_OF_CASH_INVALID_POOL = createBigNumber(0.1); // # Asset Types export const ETH = 'ETH'; @@ -60,12 +36,6 @@ export const USDC = 'USDC'; export const SHARES = 'SHARES'; export const ALL_CURRENCIES = 'All Currencies'; -export const CASH_LABEL_FORMATS = { - ETH: { symbol: 'Ξ', prepend: true, displayDecimals: 4, icon: EthIcon }, - USDC: { symbol: '$', prepend: true, displayDecimals: 2, icon: UsdIcon }, - SHARES: { symbol: '', prepend: true, displayDecimals: 4, icon: null }, -}; - // Portfolio table views export const POSITIONS = 'positions'; export const LIQUIDITY = 'liquidity'; @@ -85,50 +55,22 @@ export const ALL_MARKETS = 'all markets'; // sub categories export const COVID = 'covid-19'; -export const ELECTORAL_COLLEGE = 'electoral college'; -export const FEDERAL_FUNDS = 'federal funds'; export const REPUSD = 'REP USD'; -export const PRESIDENTIAL_ELECTION = 'electoral college'; - -export const POPULAR_CATEGORIES_ICONS = { - [MEDICAL]: MedicalIcon, - [POLITICS]: PoliticsIcon, - [CRYPTO]: CryptoIcon, - [FINANCE]: FinanceIcon, - [SPORTS]: SportsIcon, - [ENTERTAINMENT]: EntertainmentIcon, -}; // side bar types export const NAVIGATION = 'NAVIGATION'; export const FILTERS = 'FILTERS'; -export const SIDEBAR_TYPES = { - [NAVIGATION]: NAVIGATION, - [FILTERS]: FILTERS, -}; - // transaction types export const ALL = 'all'; -export const SWAP = 'swap'; export const ADD = 'add'; export const REMOVE = 'remove'; -export const INVALID_OUTCOME_ID = 0; -export const NO_OUTCOME_ID = 1; -export const YES_OUTCOME_ID = 2; - export const OPEN = 'Open'; export const IN_SETTLEMENT = 'In settlement'; export const RESOLVED = 'Resolved'; -export const INSUFFICIENT_LIQUIDITY = 'Insufficent Liquidity'; -export const INSUFFICIENT_BALANCE = 'Insufficent Balance'; -export const OVER_SLIPPAGE = 'Over Slippage Tolerance'; export const ENTER_AMOUNT = 'Enter Amount'; -export const ERROR_AMOUNT = 'Amount is not valid'; -export const CONNECT_ACCOUNT = 'Connect Account'; -export const SET_PRICES = 'Set Prices'; export const SETTINGS_SLIPPAGE = '2'; // graph market status From 781e06260c969dac8c2bfc57abe49384c84ac7e1 Mon Sep 17 00:00:00 2001 From: Bruno Confortin Date: Mon, 29 Mar 2021 13:38:01 -0300 Subject: [PATCH 2/7] Removed unused store consts --- .../src/modules/stores/constants.ts | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/packages/augur-simplified/src/modules/stores/constants.ts b/packages/augur-simplified/src/modules/stores/constants.ts index 5d4fcdb26bc..9b27113bf10 100644 --- a/packages/augur-simplified/src/modules/stores/constants.ts +++ b/packages/augur-simplified/src/modules/stores/constants.ts @@ -36,19 +36,3 @@ export const SIMPLIFIED_ACTIONS = { UPDATE_MARKETS_VIEW_SETTINGS: 'UPDATE_MARKETS_VIEW_SETTINGS', UPDATE_SETTINGS: 'UPDATE_SETTINGS', }; - -export const NETWORK_NAMES = { - 1: 'Mainnet', - 3: 'Ropsten', - 4: 'Rinkeby', - 5: 'Goerli', - 42: 'Kovan' -}; - -export const NETWORK_BLOCK_REFRESH_TIME = { - 1: 15000, - 3: 5000, - 4: 5000, - 5: 5000, - 42: 5000, -}; From 58bb44b44a6776903e9ef621e9717462ce0253e3 Mon Sep 17 00:00:00 2001 From: Bruno Confortin Date: Mon, 29 Mar 2021 13:38:14 -0300 Subject: [PATCH 3/7] Removed unused types --- .../augur-simplified/src/modules/types.ts | 149 ++---------------- 1 file changed, 11 insertions(+), 138 deletions(-) diff --git a/packages/augur-simplified/src/modules/types.ts b/packages/augur-simplified/src/modules/types.ts index fa762224f65..fcabd42e1fb 100644 --- a/packages/augur-simplified/src/modules/types.ts +++ b/packages/augur-simplified/src/modules/types.ts @@ -18,18 +18,13 @@ import type { BigNumber } from 'bignumber.js'; import type { Template } from '@augurproject/templates'; import { JsonRpcProvider } from 'ethers/providers'; -export enum SizeTypes { - SMALL = 'small', - NORMAL = 'normal', - LARGE = 'large', -} - export const TransactionTypes = { ENTER: 'ENTER', EXIT: 'EXIT', ADD_LIQUIDITY: 'ADD_LIQUIDITY', REMOVE_LIQUIDITY: 'REMOVE_LIQUIDITY', }; + export interface TextLink { text: string; link?: string; @@ -37,11 +32,6 @@ export interface TextLink { lighten?: boolean; } -export interface TextObject { - title: string; - subheader: TextLink[]; -} - export interface Alert { id: string; uniqueId: string; @@ -313,11 +303,6 @@ export interface Universe extends Getters.Universe.UniverseDetails { maxMarketEndTime?: number; } -export interface UserReports { - markets?: { - [universeId: string]: string; - }; -} export interface FormattedNumber { fullPrecision: number | string; roundedValue: number | string; @@ -332,21 +317,6 @@ export interface FormattedNumber { percent: number | string; } -export interface FormattedNumberOptions { - decimals?: number; - decimalsRounded?: number; - denomination?: Function; - roundUp?: boolean; - roundDown?: boolean; - positiveSign?: boolean; - zeroStyled?: boolean; - minimized?: boolean; - blankZero?: boolean; - bigUnitPostfix?: boolean; - removeComma?: boolean; - precisionFullLabel?: boolean; -} - export interface CreateMarketData { id?: string; txParams: TransactionMetadataParams; @@ -372,6 +342,7 @@ export interface PendingQueue { }; }; } + export interface PendingOrdersType { [marketId: string]: UIOrder[]; } @@ -383,15 +354,11 @@ export interface QuantityOrderBookOrder extends MarketOrderBookOrder { price: string; cumulativeShares: string; } -export interface QuantityOutcomeOrderBook { - spread: string | BigNumber | null; - bids: QuantityOrderBookOrder[]; - asks: QuantityOrderBookOrder[]; -} export interface OutcomeTestTradingOrder { [outcomeId: number]: TestTradingOrder[]; } + export interface TestTradingOrder { disappear: boolean; avgPrice: FormattedNumber; @@ -409,14 +376,13 @@ export interface TestTradingOrder { type: string; unmatchedShares: FormattedNumber; } -export interface OrderBooks { - [marketId: string]: MarketOrderBook; -} + export interface IndividualOutcomeOrderBook { spread: string | BigNumber | null; bids: MarketOrderBookOrder[]; asks: MarketOrderBookOrder[]; } + export interface MyPositionsSummary { currentValue: FormattedNumber; totalPercent: FormattedNumber; @@ -542,6 +508,7 @@ export interface DateTimeComponents { offset: number; timezone: string; } + export interface NewMarket { uniqueId: string; isValid: boolean; @@ -689,21 +656,11 @@ export interface ReportingListState { isLoading: boolean; }; } + export interface FilledOrders { [account: string]: MarketTradingHistory; } -export interface OpenOrders { - [account: string]: Orders; -} - -export interface GasPriceInfo { - average: number; - fast: number; - safeLow: number; - userDefinedGasPrice: number; -} - export enum INVALID_OPTIONS { Show = 'show', Hide = 'hide', @@ -738,14 +695,6 @@ export interface Category { tags: Array; } -export interface Blockchain { - currentBlockNumber: number; - lastSyncedBlockNumber: number; - blocksBehindCurrent: number; - percentSynced: string; - currentAugurTimestamp: number; -} - export interface AppStatus { isHelpMenuOpen: boolean; ethToDaiRate: FormattedNumber; @@ -827,63 +776,12 @@ export interface Web3 { currentProvider: any; } -export interface WindowApp extends Window { - app?: any; - web3?: Web3; - ethereum?: { - selectedAddress; - networkVersion: string; - isMetaMask?: boolean; - on?: Function; - enable?: Function; - send?: Function; - request?: Function; - chainId?: string; - }; - localStorage: Storage; - integrationHelpers: any; - fm?: any; - torus?: any; - portis?: any; - stores?: { - appStatus?: any; - markets?: any; - betslip?: any; - trading?: any; - pendingOrders?: any; - }; - appStatus?: any; - graphData?: any; - markets?: any; - betslip?: any; - trading?: any; - user?: any; - pendingOrders?: any; - showIndexedDbSize?: Function; -} - export type ButtonActionType = ( event: MouseEvent ) => void; -export type NodeStyleCallback = ( - err: Error | string | null, - result?: any -) => void; - export type DataCallback = (result?: any) => void; -export interface EthereumWallet { - appId: string; - appIds: string[]; - archived: boolean; - deleted: boolean; - sortIndex: number; - id: string; - type: string; - keys: { ethereumAddress: string }; -} - export interface EdgeUiAccount { signEthereumTransaction: Function; getFirstWalletInfo: Function; @@ -902,16 +800,6 @@ export enum TradingDirection { ENTRY = 'ENTRY', EXIT = 'EXIT', } -export interface TradeInfo { - marketId: string; - amm: AmmExchange; - tradeType: TradingDirection; - buyYesShares: boolean; - inputDisplayAmount?: string; - minDisplayAmount?: string; - estimatedAmount?: string; - userBalances?: string[]; -} export interface EstimateTradeResult { averagePrice: string; @@ -988,16 +876,6 @@ export interface DisputeInputtedValues { inputToAttoRep: string; } -export interface NavMenuItem { - route: string; - title: string; - requireLogin?: boolean; - disabled?: boolean; - showAlert?: boolean; - button?: boolean; - alternateStyle?: boolean; -} - export interface SortedGroup { value: string; label: string; @@ -1024,12 +902,6 @@ export interface Initialized3box { openComments?: boolean; } -export interface ActivityData { - date?: string; - sortableMonthDay?: number; - activity?: ActivityItem[]; -} - export interface ActivityItem { id: string; type: string; @@ -1051,9 +923,11 @@ export interface LPTokenBalance extends SimpleBalance { initCostUsd?: string; usdValue?: string; } + export interface LPTokens { [ammId: string]: LPTokenBalance; } + export interface CurrencyBalance extends SimpleBalance { usdValue: string; } @@ -1063,9 +937,11 @@ export interface Winnings { claimableBalance: string; userBalances: string[]; } + export interface PositionWinnings { [ammId: string]: Winnings; } + export interface PositionBalance extends SimpleBalance { usdValue: string; past24hrUsdValue?: string; @@ -1210,6 +1086,3 @@ export interface LiquidityBreakdown { lpTokens?: string; cashAmount?: string; } -export interface AddLiquidityBreakdown extends LiquidityBreakdown { - lpTokens: string; -} From 75777559b2f9c70da67f0b612ad9c6843f4a0fa1 Mon Sep 17 00:00:00 2001 From: Bruno Confortin Date: Mon, 29 Mar 2021 16:25:37 -0300 Subject: [PATCH 4/7] Removed some unused code and added error messages --- .../augur-simplified/src/modules/common/charts.tsx | 5 ----- .../src/modules/market/trading-form.tsx | 6 +++--- .../src/modules/modal/modal-add-liquidity.tsx | 12 ++++++------ .../src/modules/portfolio/portfolio-view.tsx | 6 +++--- packages/augur-simplified/src/modules/types.ts | 10 ---------- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/packages/augur-simplified/src/modules/common/charts.tsx b/packages/augur-simplified/src/modules/common/charts.tsx index 0fa51613b5b..83078b8b227 100644 --- a/packages/augur-simplified/src/modules/common/charts.tsx +++ b/packages/augur-simplified/src/modules/common/charts.tsx @@ -189,7 +189,6 @@ export const PriceHistoryChart = ({ }) => { const container = useRef(null); // eslint-disable-next-line - const [forceRender, setForceRender] = useState(false); const { maxPriceBigNumber: maxPrice, minPriceBigNumber: minPrice } = market; const { priceTimeArray } = processPriceTimeData( formattedOutcomes, @@ -240,10 +239,6 @@ export const PriceHistoryChart = ({ const chart: HighcartsChart = Highcharts.charts.find( (chart: HighcartsChart) => chart?.renderTo === chartContainer ); - if (!chart || chart?.renderTo !== chartContainer) { - // needs to be done because container ref is null on first load. - setForceRender(true); - } return () => { Highcharts.charts .find((chart: HighcartsChart) => chart?.renderTo === chartContainer) diff --git a/packages/augur-simplified/src/modules/market/trading-form.tsx b/packages/augur-simplified/src/modules/market/trading-form.tsx index a86344e2aee..f53e8f00bd1 100644 --- a/packages/augur-simplified/src/modules/market/trading-form.tsx +++ b/packages/augur-simplified/src/modules/market/trading-form.tsx @@ -360,7 +360,7 @@ const TradingForm = ({ outputYesShares, userBalances ) - .then((response) => { + .then(response => { if (response) { const { hash } = response; setAmount(''); @@ -379,9 +379,9 @@ const TradingForm = ({ }); } }) - .catch((e) => { - //TODO: handle errors here + .catch(error => { setWaitingToSign(false); + console.log('Error when trying to trade: ', error?.message); }); }; diff --git a/packages/augur-simplified/src/modules/modal/modal-add-liquidity.tsx b/packages/augur-simplified/src/modules/modal/modal-add-liquidity.tsx index 1f61a120e3b..266a03853df 100644 --- a/packages/augur-simplified/src/modules/modal/modal-add-liquidity.tsx +++ b/packages/augur-simplified/src/modules/modal/modal-add-liquidity.tsx @@ -299,7 +299,7 @@ const ModalAddLiquidity = ({ return setBreakdown(defaultAddLiquidityBreakdown); } async function getResults() { - let results = defaultAddLiquidityBreakdown; + let results: LiquidityBreakdown; if (isRemove) { results = await getRemoveLiquidity( properties.marketId, @@ -409,8 +409,8 @@ const ModalAddLiquidity = ({ marketDescription: market.description, }); }) - .catch((e) => { - //TODO: handle errors here + .catch(error => { + console.log('Error when trying to remove AMM liquidity: ', error?.message); }); } else { await doAmmLiquidity( @@ -427,7 +427,7 @@ const ModalAddLiquidity = ({ properties.priceYes, properties.symbolRoot ) - .then((response) => { + .then(response => { const { hash } = response; addTransaction({ hash, @@ -440,8 +440,8 @@ const ModalAddLiquidity = ({ marketDescription: market.description, }); }) - .catch((e) => { - // TODO: handle error + .catch(error => { + console.log('Error when trying to add AMM liquidity: ', error?.message); }); } closeModal(); diff --git a/packages/augur-simplified/src/modules/portfolio/portfolio-view.tsx b/packages/augur-simplified/src/modules/portfolio/portfolio-view.tsx index 34fd9df5c96..e63d13daec0 100644 --- a/packages/augur-simplified/src/modules/portfolio/portfolio-view.tsx +++ b/packages/augur-simplified/src/modules/portfolio/portfolio-view.tsx @@ -69,7 +69,7 @@ const handleClaimAll = ( if (from && canClaim) { setPendingClaim(true); claimWinnings(from, marketIds, cash) - .then((response) => { + .then(response => { // handle transaction response here setPendingClaim(false); if (response) { @@ -86,9 +86,9 @@ const handleClaimAll = ( }); } }) - .catch((e) => { + .catch(error => { setPendingClaim(false); - // handle error here + console.log('Error when trying to claim winnings: ', error?.message); }); } else if (from) { const approveEth = async () => { diff --git a/packages/augur-simplified/src/modules/types.ts b/packages/augur-simplified/src/modules/types.ts index fcabd42e1fb..e2b53a6a611 100644 --- a/packages/augur-simplified/src/modules/types.ts +++ b/packages/augur-simplified/src/modules/types.ts @@ -721,16 +721,6 @@ export interface UnrealizedRevenue { unrealizedRevenue24hChangePercent: string; } -// TODO: to be provided by SDK the comes from user stats -export interface TimeframeData { - positions: number; - numberOfTrades: number; - marketsTraded: number; - marketsCreated: number; - successfulDisputes: number; - redeemedPositions: number; -} - export interface LoginAccountMeta { accountType: string; address: string; From 1ef1d2b252470b5ca219e5dbef67e98bb4832ac4 Mon Sep 17 00:00:00 2001 From: Bruno Confortin Date: Mon, 29 Mar 2021 19:55:08 -0300 Subject: [PATCH 5/7] Removed more dead code --- packages/augur-simplified/src/modules/common/tables.tsx | 6 +++--- packages/augur-simplified/src/modules/types.ts | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/augur-simplified/src/modules/common/tables.tsx b/packages/augur-simplified/src/modules/common/tables.tsx index 298c95979e2..a6a0af84bc0 100644 --- a/packages/augur-simplified/src/modules/common/tables.tsx +++ b/packages/augur-simplified/src/modules/common/tables.tsx @@ -187,7 +187,7 @@ export const PositionFooter = ({ if (canClaimETH || !isETHClaim) { setPendingClaim(true); claimWinnings(account, [marketId], amm?.cash) - .then((response) => { + .then(response => { // handle transaction response here setPendingClaim(false); if (response) { @@ -204,9 +204,9 @@ export const PositionFooter = ({ }); } }) - .catch((e) => { + .catch(error => { setPendingClaim(false); - // handle error here + console.log('Error when trying to claim winnings: ', error?.message); }); } else { // need to approve here diff --git a/packages/augur-simplified/src/modules/types.ts b/packages/augur-simplified/src/modules/types.ts index e2b53a6a611..18a08bcd8db 100644 --- a/packages/augur-simplified/src/modules/types.ts +++ b/packages/augur-simplified/src/modules/types.ts @@ -6,9 +6,7 @@ import type { MarketInfoOutcome, MarketOrderBookOrder, OutcomeOrderBook, - MarketOrderBook, MarketTradingHistory, - Orders, } from '@augurproject/sdk-lite'; import type { TransactionMetadataParams, From 204cdb6b0ce388f3ed76c5d36e41397881987a44 Mon Sep 17 00:00:00 2001 From: Bruno Confortin Date: Mon, 29 Mar 2021 20:18:49 -0300 Subject: [PATCH 6/7] Fixed fill-rule and clip-rule in a svg --- packages/augur-comps/src/components/common/icons.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/augur-comps/src/components/common/icons.tsx b/packages/augur-comps/src/components/common/icons.tsx index 70c5f4c088a..c96e3528a29 100644 --- a/packages/augur-comps/src/components/common/icons.tsx +++ b/packages/augur-comps/src/components/common/icons.tsx @@ -629,8 +629,8 @@ export const ChevronFlipIcon = ( fill="none" > From 693b248ca1b7315851ce10c61de23293dce827df Mon Sep 17 00:00:00 2001 From: JohnDanz Date: Mon, 29 Mar 2021 19:01:34 -0500 Subject: [PATCH 7/7] removed some unused code --- packages/augur-simplified/src/modules/common/charts.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/augur-simplified/src/modules/common/charts.tsx b/packages/augur-simplified/src/modules/common/charts.tsx index 83078b8b227..bb81f86841d 100644 --- a/packages/augur-simplified/src/modules/common/charts.tsx +++ b/packages/augur-simplified/src/modules/common/charts.tsx @@ -188,7 +188,6 @@ export const PriceHistoryChart = ({ cash, }) => { const container = useRef(null); - // eslint-disable-next-line const { maxPriceBigNumber: maxPrice, minPriceBigNumber: minPrice } = market; const { priceTimeArray } = processPriceTimeData( formattedOutcomes, @@ -234,11 +233,9 @@ export const PriceHistoryChart = ({ }, [selectedOutcomes, options, priceTimeArray]); useEffect(() => { + // set no data chart and cleanup chart on dismount const chartContainer = container.current; - NoDataToDisplay(Highcharts); - const chart: HighcartsChart = Highcharts.charts.find( - (chart: HighcartsChart) => chart?.renderTo === chartContainer - ); + NoDataToDisplay(Highcharts); return () => { Highcharts.charts .find((chart: HighcartsChart) => chart?.renderTo === chartContainer)