Merge pull request #10663 from AugurProject/start-common-fnc-file

start common fnc file
AugurProject · Feb 16, 2021 · a193ff5 · a193ff5
2 parents 3001c93 + b1446f4
commit a193ff5
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 38 deletions.
diff --git a/packages/augur-simplified/src/modules/constants.ts b/packages/augur-simplified/src/modules/constants.ts
@@ -255,3 +255,21 @@ export const DEFAULT_MARKET_VIEW_SETTINGS = {
 
 export const CREATE = 'create';
 
+export const DefaultMarketOutcomes = [
+  {
+    id: 0,
+    name: 'Invalid',
+    price: '$0.00',
+    isInvalid: true,
+  },
+  {
+    id: 1,
+    name: 'No',
+    price: '$0.25',
+  },
+  {
+    id: 2,
+    name: 'yes',
+    price: '$0.75',
+  },
+];
diff --git a/packages/augur-simplified/src/modules/market/market-view.tsx b/packages/augur-simplified/src/modules/market/market-view.tsx
@@ -17,11 +17,9 @@ import {
   PositionsLiquidityViewSwitcher,
   TransactionsTable,
 } from '../common/tables';
-import TradingForm, {
-  DefaultMarketOutcomes,
-} from './trading-form';
+import TradingForm from './trading-form';
 import { useAppStatusStore } from '../stores/app-status';
-import { USDC, YES_NO, BUY, MARKET_ID_PARAM_NAME, ETH } from '../constants';
+import { USDC, YES_NO, BUY, MARKET_ID_PARAM_NAME, ETH, DefaultMarketOutcomes } from '../constants';
 import parseQuery from '../routes/helpers/parse-query';
 import { AmmExchange, MarketInfo } from '../types';
 import { formatDai } from '../../utils/format-number';

diff --git a/packages/augur-simplified/src/modules/market/trading-form.tsx b/packages/augur-simplified/src/modules/market/trading-form.tsx
@@ -45,25 +45,6 @@ import { useCanEnterCashPosition, useCanExitCashPosition } from '../stores/utils
 const AVG_PRICE_TIP =
   'The difference between the market price and estimated price due to trade size.';
 
-export const DefaultMarketOutcomes = [
-  {
-    id: 0,
-    name: 'Invalid',
-    price: '$0.00',
-    isInvalid: true,
-  },
-  {
-    id: 1,
-    name: 'No',
-    price: '$0.25',
-  },
-  {
-    id: 2,
-    name: 'yes',
-    price: '$0.75',
-  },
-];
-
 interface InfoNumber {
   label: string;
   value: string;

diff --git a/packages/augur-simplified/src/modules/sidebar/sidebar.tsx b/packages/augur-simplified/src/modules/sidebar/sidebar.tsx
@@ -21,21 +21,7 @@ import {
   marketStatusItems,
   sortByItems,
 } from '../constants';
-
-export function isMobileBrowser(): boolean {
-  return (
-    navigator.userAgent.indexOf('Android') > -1 ||
-    navigator.userAgent.indexOf('webOS') > -1 ||
-    navigator.userAgent.indexOf('Windows Phone') > -1
-  );
-}
-
-export function isMobileBrowserTall(): boolean {
-  return (
-    navigator.userAgent.indexOf('iPhone') > -1 ||
-    navigator.userAgent.indexOf('iPad') > -1
-  );
-}
+import { isMobileBrowser, isMobileBrowserTall } from '../../utils/common-functions';
 
 interface SideBarHeaderProps {
   header?: string;

diff --git a/packages/augur-simplified/src/modules/types.ts b/packages/augur-simplified/src/modules/types.ts
@@ -1194,6 +1194,7 @@ export interface LiquidityBreakdown {
   yesShares: string;
   noShares: string;
   lpTokens?: string;
+  cashAmount?: string;
 }
 export interface AddLiquidityBreakdown extends LiquidityBreakdown {
   lpTokens: string;

diff --git a/packages/augur-simplified/src/utils/common-functions.ts b/packages/augur-simplified/src/utils/common-functions.ts
@@ -0,0 +1,14 @@
+export function isMobileBrowser(): boolean {
+    return (
+      navigator.userAgent.indexOf('Android') > -1 ||
+      navigator.userAgent.indexOf('webOS') > -1 ||
+      navigator.userAgent.indexOf('Windows Phone') > -1
+    );
+  }
+
+  export function isMobileBrowserTall(): boolean {
+    return (
+      navigator.userAgent.indexOf('iPhone') > -1 ||
+      navigator.userAgent.indexOf('iPad') > -1
+    );
+  }