Merge pull request #754 from hubiinetwork/feature/1.0.0

Feature/1.0.0
hubiinetwork · Apr 24, 2019 · ec57595 · ec57595
2 parents b7ab4ba + 5c281fb
commit ec57595
Show file tree

Hide file tree

Showing 24 changed files with 1,404 additions and 429 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hubii-core",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0",
   "author": {
     "name": "hubii",
     "email": "info@hubii.com",
@@ -313,7 +313,7 @@
     "lodash.debounce": "^4.0.8",
     "minimist": "1.2.0",
     "moment": "2.22.2",
-    "nahmii-sdk": "1.0.0-beta.49",
+    "nahmii-sdk": "1.0.0-beta.50",
     "prop-types": "15.6.1",
     "qrcode.react": "0.8.0",
     "react": "16.6.3",

diff --git a/src/components/GasOptions/index.js b/src/components/GasOptions/index.js
@@ -49,6 +49,10 @@ export class GasOptions extends React.PureComponent { // eslint-disable-line rea
       const fee = new BigNumber(gasLimit).times(gweiToWei(new BigNumber(gasPriceGwei)));
       this.props.onChange(fee, new BigNumber(gasLimit), new BigNumber(gasPriceGwei));
     }
+    if (prevProps.defaultGasLimit !== this.props.defaultGasLimit) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({ gasLimit: this.props.defaultGasLimit, gasLimitInput: this.props.defaultGasLimit.toString() });
+    }
   }
 
   onFocusNumberInput(input) {

diff --git a/src/components/GasOptions/tests/index.test.js b/src/components/GasOptions/tests/index.test.js
@@ -111,6 +111,22 @@ describe('<GasOptions />', () => {
       });
     });
   });
+  describe('update defaultGasLimit prop', () => {
+    ['safeLow', 'average', 'fast'].forEach((mode) => {
+      it('Updates on defaultGasLimit prop should reflect on the states', () => {
+        const wrapper = shallow(<GasOptions
+          {...props}
+          defaultOption={mode}
+        />
+        );
+        wrapper.setProps({ defaultGasLimit: 123 });
+
+        const state = wrapper.state();
+        expect(state.gasLimit).toEqual(123);
+        expect(state.gasLimitInput).toEqual('123');
+      });
+    });
+  });
   describe('defaultOption set to manual ', () => {
     let wrapper;
     let gasLimitInput;

diff --git a/src/components/TransferDescription/index.js b/src/components/TransferDescription/index.js
@@ -11,6 +11,7 @@ import HWPromptContainer from 'containers/HWPromptContainer';
 import Text from 'components/ui/Text';
 import NumericText from 'components/ui/NumericText';
 import SelectableText from 'components/ui/SelectableText';
+import TooltipText from 'components/ui/TooltipText';
 
 import {
   StyledCol,
@@ -26,6 +27,30 @@ import TransferDescriptionItem from '../TransferDescriptionItem';
  * The TransferDescription Component
  */
 class TransferDescription extends React.PureComponent {
+  getFeeText() {
+    const {
+      assetToSend,
+      layer,
+      intl: { formatMessage },
+    } = this.props;
+    let feeText;
+
+    if (layer === 'baseLayer') {
+      if (assetToSend.symbol === 'ETH') {
+        feeText = formatMessage({ id: 'base_layer_fee' });
+      } else {
+        feeText = (
+          <TooltipText details={formatMessage({ id: 'max_base_layer_fee_explain' })}>
+            {formatMessage({ id: 'max_base_layer_fee' })}
+          </TooltipText>
+        );
+      }
+    } else {
+      feeText = formatMessage({ id: 'fee' });
+    }
+    return feeText;
+  }
+
   generateTransferingStatus() {
     const { currentWalletWithInfo, layer, currentNetwork, intl, transfering } = this.props;
     const { formatMessage } = intl;
@@ -90,7 +115,7 @@ class TransferDescription extends React.PureComponent {
         </Row>
         <Row>
           <TransferDescriptionItem
-            main={<SelectableText><NumericText value={amountToSend.toString()} /> {amountToSend.symbol}</SelectableText>}
+            main={<SelectableText><NumericText value={amountToSend.toString()} /> {assetToSend.symbol}</SelectableText>}
             subtitle={<NumericText value={usdValueToSend.toString()} type="currency" />}
           />
         </Row>
@@ -101,7 +126,7 @@ class TransferDescription extends React.PureComponent {
           <StyledRecipient span={12}>{recipient}</StyledRecipient>
         </Row>
         <Row>
-          <StyledCol span={12}>{formatMessage({ id: 'fee' })}</StyledCol>
+          <StyledCol span={12}>{this.getFeeText()}</StyledCol>
         </Row>
         <Row>
           <TransferDescriptionItem

diff --git a/src/components/TransferForm/index.js b/src/components/TransferForm/index.js
@@ -141,7 +141,7 @@ export class TransferForm extends React.PureComponent {
 
     // set a higher gas limit for erc20 tokens
     let gasLimit = 21000;
-    if (newSymbol !== 'ETH') gasLimit = 100000;
+    if (newSymbol !== 'ETH') gasLimit = 300000;
 
     this.setState({
       assetToSend,

diff --git a/src/components/ui/Text/index.js b/src/components/ui/Text/index.js
@@ -5,4 +5,5 @@ export default styled.span`
   color: white;
   line-height: 1.6;
   font-size: ${({ large }) => large ? '1.15' : '1'}rem;
+  text-transform: ${({ capitalize }) => capitalize ? 'capitalize' : 'none'};
 `;
diff --git a/src/components/ui/TooltipText/index.js b/src/components/ui/TooltipText/index.js
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import { injectIntl } from 'react-intl';
+import { Tooltip, Icon } from 'antd';
+
+const TooltipText = (props) => {
+  const { details, children } = props;
+
+  return (<Tooltip
+    title={details}
+  >
+    {children}
+    <Icon type="info-circle" style={{ marginLeft: '0.5rem' }} />
+  </Tooltip>);
+};
+
+TooltipText.propTypes = {
+  details: PropTypes.string.isRequired,
+  children: PropTypes.any,
+};
+
+export default injectIntl(TooltipText);
diff --git a/src/containers/NahmiiDeposit/index.js b/src/containers/NahmiiDeposit/index.js
@@ -27,6 +27,7 @@ import HelperText from 'components/ui/HelperText';
 import Text from 'components/ui/Text';
 import NumericText from 'components/ui/NumericText';
 import SelectableText from 'components/ui/SelectableText';
+import TooltipText from 'components/ui/TooltipText';
 import SectionHeading from 'components/ui/SectionHeading';
 import Input from 'components/ui/Input';
 import Select, { Option } from 'components/ui/Select';
@@ -381,7 +382,11 @@ export class NahmiiDeposit extends React.Component { // eslint-disable-line reac
               />
             </Row>
             <Row>
-              <StyledCol span={12}>{formatMessage({ id: 'base_layer_fee' })}</StyledCol>
+              <StyledCol span={12}>
+                <TooltipText details={formatMessage({ id: 'max_base_layer_fee_explain' })}>
+                  {formatMessage({ id: 'max_base_layer_fee' })}
+                </TooltipText>
+              </StyledCol>
             </Row>
             <Row>
               <TransferDescriptionItem
@@ -412,7 +417,7 @@ export class NahmiiDeposit extends React.Component { // eslint-disable-line reac
             {assetToDeposit.symbol === 'ETH' &&
             <div>
               <Row>
-                <StyledCol span={12}>{formatMessage({ id: 'nahmii' })} ETH {formatMessage({ id: 'balance_before' })}</StyledCol>
+                <StyledCol span={12}>{formatMessage({ id: 'nahmii_available' })} ETH {formatMessage({ id: 'balance_before' })}</StyledCol>
               </Row>
               <Row>
                 <TransferDescriptionItem
@@ -422,7 +427,7 @@ export class NahmiiDeposit extends React.Component { // eslint-disable-line reac
               </Row>
               <Row>
                 <StyledCol span={12}>
-                  {formatMessage({ id: 'nahmii' })} ETH {formatMessage({ id: 'balance_after' })}
+                  {formatMessage({ id: 'nahmii_available' })} ETH {formatMessage({ id: 'balance_after' })}
                 </StyledCol>
               </Row>
               <Row>