Update Magi Talbe

DuoNetwork · Jun 11, 2019 · 3595acb · 3595acb
1 parent 7690897
commit 3595acb
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -98,7 +98,7 @@
 	"dependencies": {
 		"@babel/polyfill": "^7.2.5",
 		"@finbook/duo-contract-wrapper": "^1.4.1",
-		"@finbook/duo-market-data": "^1.0.4",
+		"@finbook/duo-market-data": "^1.0.6",
 		"antd": "^3.13.0",
 		"d3": "^5.8.0",
 		"ethereumjs-abi": "^0.6.7",

diff --git a/src/ts/common/__snapshots__/chartUtil.test.ts.snap b/src/ts/common/__snapshots__/chartUtil.test.ts.snap
@@ -8,6 +8,7 @@ Array [
     "navA": 1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 2717,
     "transactionHash": "bbb",
   },
@@ -17,6 +18,7 @@ Array [
     "navA": 1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 3717,
     "transactionHash": "ccc",
   },
@@ -26,6 +28,7 @@ Array [
     "navA": 1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 4717,
     "transactionHash": "ddd",
   },
@@ -250,6 +253,7 @@ Array [
     "navA": 1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 1000,
     "transactionHash": "aaa",
   },
@@ -259,6 +263,7 @@ Array [
     "navA": 1,
     "navB": 2,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 2000,
     "transactionHash": "bbb",
   },
@@ -268,6 +273,7 @@ Array [
     "navA": 1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 2717,
     "transactionHash": "bbb",
   },
@@ -277,6 +283,7 @@ Array [
     "navA": 1,
     "navB": 0.25,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 3000,
     "transactionHash": "ccc",
   },
@@ -286,6 +293,7 @@ Array [
     "navA": 1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 3717,
     "transactionHash": "ccc",
   },
@@ -295,6 +303,7 @@ Array [
     "navA": 1.1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 4000,
     "transactionHash": "ddd",
   },
@@ -304,6 +313,7 @@ Array [
     "navA": 1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 4717,
     "transactionHash": "ddd",
   },
@@ -318,6 +328,7 @@ Array [
     "navA": 1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 1000,
     "transactionHash": "aaa",
   },
@@ -327,6 +338,7 @@ Array [
     "navA": 1,
     "navB": 2,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 2000,
     "transactionHash": "bbb",
   },
@@ -336,6 +348,7 @@ Array [
     "navA": 1,
     "navB": 0.25,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 3000,
     "transactionHash": "ccc",
   },
@@ -345,6 +358,7 @@ Array [
     "navA": 1.1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 4000,
     "transactionHash": "ddd",
   },
@@ -354,6 +368,7 @@ Array [
     "navA": 1.025942,
     "navB": 0.595738272490127,
     "price": 12,
+    "sender": "0x0",
     "timestamp": 1528243200000,
     "transactionHash": "",
   },
@@ -370,6 +385,7 @@ Array [
     "navA": 1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 1000,
     "transactionHash": "aaa",
   },
@@ -379,6 +395,7 @@ Array [
     "navA": 1,
     "navB": 2,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 2000,
     "transactionHash": "bbb",
   },
@@ -388,6 +405,7 @@ Array [
     "navA": 1,
     "navB": 0.25,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 3000,
     "transactionHash": "ccc",
   },
@@ -397,6 +415,7 @@ Array [
     "navA": 1.1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": 4000,
     "transactionHash": "ddd",
   },
@@ -406,6 +425,7 @@ Array [
     "navA": 1.1,
     "navB": 1,
     "price": 123,
+    "sender": "0x0",
     "timestamp": NaN,
     "transactionHash": "ddd",
   },

diff --git a/src/ts/common/chartUtil.test.ts b/src/ts/common/chartUtil.test.ts
@@ -15,7 +15,7 @@ const hourlyBar1 = {
 	low: 0,
 	close: 2,
 	volume: 123,
-	timestamp: moment.utc('2018-06-06 00:0', 'YYYY-MM-DD HH:m').valueOf()
+	timestamp: moment.utc('2018-06-06 00:0', 'YYYY-MM-DD HH:m').valueOf(),
 };
 
 const hourlyBar2 = {
@@ -93,6 +93,7 @@ test('minutely merged correctly to 5 minute bar', () => {
 
 const acceptedPrice1 = {
 	contractAddress: '0x0',
+	sender: '0x0',
 	price: 123,
 	navA: 1,
 	navB: 1,
@@ -103,6 +104,7 @@ const acceptedPrice1 = {
 
 const acceptedPrice2 = {
 	contractAddress: '0x0',
+	sender: '0x0',
 	price: 123,
 	navA: 1,
 	navB: 2,
@@ -113,6 +115,7 @@ const acceptedPrice2 = {
 
 const acceptedPrice3 = {
 	contractAddress: '0x0',
+	sender: '0x0',
 	price: 123,
 	navA: 1,
 	navB: 0.25,
@@ -123,6 +126,7 @@ const acceptedPrice3 = {
 
 const acceptedPrice4 = {
 	contractAddress: '0x0',
+	sender: '0x0',
 	price: 123,
 	navA: 1.1,
 	navB: 1,
@@ -133,6 +137,7 @@ const acceptedPrice4 = {
 
 const acceptedPriceNow = {
 	contractAddress: '0x0',
+	sender: '0x0',
 	price: 123,
 	navA: 1.1,
 	navB: 1,

diff --git a/src/ts/common/chartUtil.ts b/src/ts/common/chartUtil.ts
@@ -79,7 +79,8 @@ class ChartUtil {
 				navB: limitPeriod && p.navA >= limitPeriod ? p.navB : 1,
 				timestamp: p.timestamp + 717,
 				blockNumber: p.blockNumber,
-				transactionHash: p.transactionHash
+				transactionHash: p.transactionHash,
+				sender: p.sender
 			}));
 	}
 
@@ -152,7 +153,8 @@ class ChartUtil {
 					navB: states.navB,
 					timestamp: lastTimestamp,
 					blockNumber: 0,
-					transactionHash: ''
+					transactionHash: '',
+					sender: lastPrice.sender
 				}
 			];
 

diff --git a/src/ts/common/constants.ts b/src/ts/common/constants.ts
@@ -219,6 +219,7 @@ export const TH_UPDATE = 'Update';
 export const TH_UPDATED = 'Updated';
 export const TH_VOLUME = 'Volume';
 export const TH_BLOCK = 'Block';
+export const TH_SENDER = 'Sender(Node)';
 export const TH_ROLE = 'Role';
 export const TH_APP = 'App';
 export const TH_ALLOWANCE: ILocaleText = {

diff --git a/src/ts/components/Cards/AcceptPriceCard.tsx b/src/ts/components/Cards/AcceptPriceCard.tsx
@@ -28,6 +28,7 @@ export default class StatusCard extends React.Component<IProps> {
 							[CST.TH_BLOCK]: ap.blockNumber,
 							[CST.TH_TIME.EN]: moment(ap.timestamp).format('YYYY-MM-DD HH:mm'),
 							[CST.TH_PRICE.EN]: ap.price,
+							[CST.TH_SENDER]: ap.sender,
 							[CST.TH_LINK]:
 								'https://' +
 								(__KOVAN__ ? 'kovan.' : '') +
@@ -39,7 +40,7 @@ export default class StatusCard extends React.Component<IProps> {
 							onClick: () => window.open(record[CST.TH_LINK])
 						})}
 					>
-						{[CST.TH_BLOCK, CST.TH_TIME.EN, CST.TH_PRICE.EN].map(th => (
+						{[CST.TH_BLOCK, CST.TH_TIME.EN, CST.TH_PRICE.EN, CST.TH_SENDER].map(th => (
 							<Column title={th} dataIndex={th} key={th} />
 						))}
 					</Table>

diff --git a/src/ts/components/Cards/MagiAdminCard.tsx b/src/ts/components/Cards/MagiAdminCard.tsx
@@ -101,7 +101,7 @@ export default class MagiAdminCard extends React.Component<IProps, IState> {
 		dataSource.sort((a, b) => a.key - b.key);
 
 		return (
-			<div style={{ display: 'flex', flexDirection: 'column', alignItem: 'center', width: 1000 }}>
+			<div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', width: 1000 }}>
 				<SCard
 					title={<SCardTitle>{CST.TH_CONTRACT_STATES.EN.toUpperCase()}</SCardTitle>}
 					width="1000px"

diff --git a/src/ts/components/Cards/StakingPersonalCard.tsx b/src/ts/components/Cards/StakingPersonalCard.tsx
@@ -21,6 +21,7 @@ interface IProps {
 	address: string;
 	duoBalance: number;
 	award: number;
+	enableApprove: boolean;
 }
 
 export default class StakingPersonalCard extends React.Component<IProps> {
@@ -37,7 +38,7 @@ export default class StakingPersonalCard extends React.Component<IProps> {
 	};
 
 	public render() {
-		const { enabled, address, duoBalance, award, locale } = this.props;
+		const { enabled, address, duoBalance, award, locale, enableApprove } = this.props;
 		return (
 			<SCard
 				title={
@@ -140,7 +141,13 @@ export default class StakingPersonalCard extends React.Component<IProps> {
 							paddingBottom: 10
 						}}
 					>
-						<SStakingButtonM onClick={this.handleApprove}>
+						<SStakingButtonM
+							onClick={this.handleApprove}
+							style={{
+								pointerEvents: enableApprove ? 'initial' : 'none',
+								opacity: enableApprove ? 1 : 0.4
+							}}
+						>
 							{StakingCST.STK_APPROVE[locale]}
 						</SStakingButtonM>
 						<SStakingButtonM

diff --git a/src/ts/components/Cards/StakingPersonalCardM.tsx b/src/ts/components/Cards/StakingPersonalCardM.tsx
@@ -21,6 +21,7 @@ interface IProps {
 	address: string;
 	duoBalance: number;
 	award: number;
+	enableApprove: boolean;
 }
 
 export default class StakingPersonalCardM extends React.Component<IProps> {
@@ -37,7 +38,7 @@ export default class StakingPersonalCardM extends React.Component<IProps> {
 	};
 
 	public render() {
-		const { enabled, address, duoBalance, award, locale } = this.props;
+		const { enabled, address, duoBalance, award, locale, enableApprove } = this.props;
 		return (
 			<SCard
 				title={
@@ -143,7 +144,14 @@ export default class StakingPersonalCardM extends React.Component<IProps> {
 							paddingBottom: 10
 						}}
 					>
-						<SStakingButtonM style={{ width: '45%' }} onClick={this.handleApprove}>
+						<SStakingButtonM
+							style={{
+								width: '45%',
+								pointerEvents: enableApprove ? 'initial' : 'none',
+								opacity: enableApprove ? 1 : 0.4
+							}}
+							onClick={this.handleApprove}
+						>
 							{StakingCST.STK_APPROVE[locale]}
 						</SStakingButtonM>
 						<SStakingButtonM

diff --git a/src/ts/components/Cards/TimeSeriesCard.test.tsx b/src/ts/components/Cards/TimeSeriesCard.test.tsx
@@ -11,6 +11,7 @@ describe('TimeSeriesCard Test', () => {
 		const acceptedPrices = [
 			{
 				contractAddress: '0x0',
+				sender: '0x0',
 				timestamp: 1539843443,
 				transactionHash: 'test',
 				blockNumber: 3,

diff --git a/src/ts/components/Cards/__snapshots__/TimeSeriesCard.test.tsx.snap b/src/ts/components/Cards/__snapshots__/TimeSeriesCard.test.tsx.snap
@@ -35,6 +35,7 @@ exports[`TimeSeriesCard Test Test Snapshot Test Snapshot 1`] = `
             "navA": 123,
             "navB": 123,
             "price": 123,
+            "sender": "0x0",
             "timestamp": 1539843443,
             "transactionHash": "test",
           },

diff --git a/src/ts/components/Charts/TimeSeriesChart.test.tsx b/src/ts/components/Charts/TimeSeriesChart.test.tsx
@@ -26,7 +26,8 @@ describe('AuthCard Test', () => {
 				contractAddress: 'test',
 				timestamp: 123,
 				transactionHash: 'test',
-				blockNumber: 123
+				blockNumber: 123,
+				sender: '0x0',
 			}
 		];
 		const underlying = 'test';

diff --git a/src/ts/components/Pages/Staking.tsx b/src/ts/components/Pages/Staking.tsx
@@ -76,7 +76,7 @@ export default class Staking extends React.Component<IProps, IState> {
 			userStakes,
 			oracleStakes,
 			userAward,
-			locale
+			locale,
 		} = this.props;
 		const { visible } = this.state;
 		return (
@@ -102,6 +102,7 @@ export default class Staking extends React.Component<IProps, IState> {
 						address={account}
 						duoBalance={duoBalance}
 						award={userAward}
+						enableApprove={visible}
 					/>
 					{addresses.priceFeedList.length ? (
 						addresses.priceFeedList.map((addr, i) => (

diff --git a/src/ts/components/Pages/StakingMobile.tsx b/src/ts/components/Pages/StakingMobile.tsx
@@ -100,6 +100,7 @@ export default class StakingMobile extends React.Component<IProps, IState> {
 						address={account}
 						duoBalance={duoBalance}
 						award={userAward}
+						enableApprove={visible}
 					/>
 					{addresses.priceFeedList.length ? (
 						addresses.priceFeedList.map((addr, i) => (