Skip to content

Commit

Permalink
fix: hotfix merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
shekhar-shubhendu committed Aug 20, 2021
1 parent b2c3f93 commit 54a1b35
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 25 deletions.
10 changes: 0 additions & 10 deletions src/design-system/organisms/TradeForm/TradeForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { Field, Form, Formik, FormikHelpers } from 'formik';
import { useTranslation } from 'react-i18next';
import { Grid, Theme } from '@material-ui/core';
import { SxProps } from '@material-ui/system';
import { useToasts } from 'react-toast-notifications';
import { FormikTextField } from '../../molecules/FormikTextField';
import { CustomButton } from '../../atoms/Button';
import { Typography } from '../../atoms/Typography';
Expand All @@ -19,16 +18,7 @@ import {
closePosition,
tokensToCurrency,
} from '../../../contracts/MarketCalculations';
import { logError } from '../../../logger/logger';
import { PositionItem, PositionSummary } from '../SubmitBidCard/PositionSummary';
import { claimWinnings } from '../../../contracts/Market';

const TokenPriceDefault = {
yes: 0,
no: 0,
};

const endAdornmentStyles: SxProps<Theme> = { whiteSpace: 'nowrap' };

const TokenPriceDefault = {
yes: 0,
Expand Down
11 changes: 0 additions & 11 deletions src/pages/AuctionPage/AuctionPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ export const AuctionPageComponent: React.FC<AuctionPageProps> = ({ market }) =>
color: theme.palette.error.main,
data: [],
},
{
label: 'All',
value: 'all',
},
],
[],
);
Expand Down Expand Up @@ -358,13 +354,6 @@ export const AuctionPageComponent: React.FC<AuctionPageProps> = ({ market }) =>
marketPhase: market.state,
};

const CloseMarketDetails = {
marketId: market.marketId,
adjudicator: market.adjudicator,
winningPrediction: market.winningPrediction,
marketPhase: market.state,
};

return (
<MainPage description={market.question}>
<Grid container spacing={3} direction={isTablet ? 'column' : 'row'}>
Expand Down
4 changes: 0 additions & 4 deletions src/pages/MarketPage/MarketPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ export const MarketPageComponent: React.FC<MarketPageProps> = ({ market }) => {
color: theme.palette.error.main,
data: [],
},
{
label: 'All',
value: 'all',
},
],
[],
);
Expand Down

1 comment on commit 54a1b35

@vercel
Copy link

@vercel vercel bot commented on 54a1b35 Aug 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.