Merge pull request #733 from hubiinetwork/feature/0.9.6

0.9.6
hubiinetwork · Feb 28, 2019 · 5b3e1b1 · 5b3e1b1
2 parents 3d5d107 + 2eb1e5e
commit 5b3e1b1
Show file tree

Hide file tree

Showing 25 changed files with 3,075 additions and 68 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hubii-core",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "author": {
     "name": "hubii",
     "email": "info@hubii.com",

diff --git a/public/images/question.svg b/public/images/question.svg
diff --git a/src/components/BreakdownList/index.js b/src/components/BreakdownList/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { compose } from 'redux';
 import { injectIntl } from 'react-intl';
 import PropTypes from 'prop-types';
-import { getAbsolutePath } from 'utils/electron';
+import { getAbsolutePath, assetImageFallback } from 'utils/electron';
 import { formatFiat } from 'utils/numberFormats';
 
 import Text from 'components/ui/Text';
@@ -49,6 +49,7 @@ const generateList = (data, formatMessage, extraInfo = false) => {
         <div>
           <Logo
             src={getAbsolutePath(`public/images/assets/${item.label}.svg`)}
+            onError={assetImageFallback}
           />
           <Text>{item.amount}</Text>
         &nbsp;

diff --git a/src/components/Transaction/index.js b/src/components/Transaction/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import moment from 'moment';
 import { injectIntl } from 'react-intl';
-import { getAbsolutePath } from 'utils/electron';
+import { getAbsolutePath, assetImageFallback } from 'utils/electron';
 import NahmiiText from 'components/ui/NahmiiText';
 import {
   Wrapper,
@@ -52,6 +52,7 @@ const Transaction = (props) => {
             <HeaderWrapper>
               <Image
                 src={getAbsolutePath(`public/images/assets/${symbol}.svg`)}
+                onError={assetImageFallback}
               />
               <TypeIcon
                 type={type === 'received' ? 'download' : 'upload'}

diff --git a/src/components/Transaction/tests/__snapshots__/index.test.js.snap b/src/components/Transaction/tests/__snapshots__/index.test.js.snap
@@ -43,6 +43,7 @@ ShallowWrapper {
                 header={
                         <style__HeaderWrapper>
                                 <style__Image
+                                        onError={[Function]}
                                         src="/public/images/assets/UKG.svg"
                                 />
                                 <style__TypeIcon
@@ -125,6 +126,7 @@ ShallowWrapper {
           header={
                     <style__HeaderWrapper>
                               <style__Image
+                                        onError={[Function]}
                                         src="/public/images/assets/UKG.svg"
                               />
                               <style__TypeIcon
@@ -240,6 +242,7 @@ ShallowWrapper {
 </style__CollapsableContent>,
           "header": <style__HeaderWrapper>
             <style__Image
+                        onError={[Function]}
                         src="/public/images/assets/UKG.svg"
             />
             <style__TypeIcon
@@ -476,6 +479,7 @@ ShallowWrapper {
                     header={
                               <style__HeaderWrapper>
                                         <style__Image
+                                                  onError={[Function]}
                                                   src="/public/images/assets/UKG.svg"
                                         />
                                         <style__TypeIcon
@@ -558,6 +562,7 @@ ShallowWrapper {
             header={
                         <style__HeaderWrapper>
                                     <style__Image
+                                                onError={[Function]}
                                                 src="/public/images/assets/UKG.svg"
                                     />
                                     <style__TypeIcon
@@ -673,6 +678,7 @@ ShallowWrapper {
 </style__CollapsableContent>,
             "header": <style__HeaderWrapper>
               <style__Image
+                            onError={[Function]}
                             src="/public/images/assets/UKG.svg"
               />
               <style__TypeIcon
@@ -948,6 +954,7 @@ ShallowWrapper {
                 header={
                         <style__HeaderWrapper>
                                 <style__Image
+                                        onError={[Function]}
                                         src="/public/images/assets/UKG.svg"
                                 />
                                 <style__TypeIcon
@@ -1032,6 +1039,7 @@ ShallowWrapper {
           header={
                     <style__HeaderWrapper>
                               <style__Image
+                                        onError={[Function]}
                                         src="/public/images/assets/UKG.svg"
                               />
                               <style__TypeIcon
@@ -1151,6 +1159,7 @@ ShallowWrapper {
 </style__CollapsableContent>,
           "header": <style__HeaderWrapper>
             <style__Image
+                        onError={[Function]}
                         src="/public/images/assets/UKG.svg"
             />
             <style__TypeIcon
@@ -1391,6 +1400,7 @@ ShallowWrapper {
                     header={
                               <style__HeaderWrapper>
                                         <style__Image
+                                                  onError={[Function]}
                                                   src="/public/images/assets/UKG.svg"
                                         />
                                         <style__TypeIcon
@@ -1475,6 +1485,7 @@ ShallowWrapper {
             header={
                         <style__HeaderWrapper>
                                     <style__Image
+                                                onError={[Function]}
                                                 src="/public/images/assets/UKG.svg"
                                     />
                                     <style__TypeIcon
@@ -1594,6 +1605,7 @@ ShallowWrapper {
 </style__CollapsableContent>,
             "header": <style__HeaderWrapper>
               <style__Image
+                            onError={[Function]}
                             src="/public/images/assets/UKG.svg"
               />
               <style__TypeIcon
@@ -1873,6 +1885,7 @@ ShallowWrapper {
                 header={
                         <style__HeaderWrapper>
                                 <style__Image
+                                        onError={[Function]}
                                         src="/public/images/assets/UKG.svg"
                                 />
                                 <style__TypeIcon
@@ -1957,6 +1970,7 @@ ShallowWrapper {
           header={
                     <style__HeaderWrapper>
                               <style__Image
+                                        onError={[Function]}
                                         src="/public/images/assets/UKG.svg"
                               />
                               <style__TypeIcon
@@ -2076,6 +2090,7 @@ ShallowWrapper {
 </style__CollapsableContent>,
           "header": <style__HeaderWrapper>
             <style__Image
+                        onError={[Function]}
                         src="/public/images/assets/UKG.svg"
             />
             <style__TypeIcon
@@ -2316,6 +2331,7 @@ ShallowWrapper {
                     header={
                               <style__HeaderWrapper>
                                         <style__Image
+                                                  onError={[Function]}
                                                   src="/public/images/assets/UKG.svg"
                                         />
                                         <style__TypeIcon
@@ -2400,6 +2416,7 @@ ShallowWrapper {
             header={
                         <style__HeaderWrapper>
                                     <style__Image
+                                                onError={[Function]}
                                                 src="/public/images/assets/UKG.svg"
                                     />
                                     <style__TypeIcon
@@ -2519,6 +2536,7 @@ ShallowWrapper {
 </style__CollapsableContent>,
             "header": <style__HeaderWrapper>
               <style__Image
+                            onError={[Function]}
                             src="/public/images/assets/UKG.svg"
               />
               <style__TypeIcon
@@ -2798,6 +2816,7 @@ ShallowWrapper {
                 header={
                         <style__HeaderWrapper>
                                 <style__Image
+                                        onError={[Function]}
                                         src="/public/images/assets/UKG.svg"
                                 />
                                 <style__TypeIcon
@@ -2882,6 +2901,7 @@ ShallowWrapper {
           header={
                     <style__HeaderWrapper>
                               <style__Image
+                                        onError={[Function]}
                                         src="/public/images/assets/UKG.svg"
                               />
                               <style__TypeIcon
@@ -3001,6 +3021,7 @@ ShallowWrapper {
 </style__CollapsableContent>,
           "header": <style__HeaderWrapper>
             <style__Image
+                        onError={[Function]}
                         src="/public/images/assets/UKG.svg"
             />
             <style__TypeIcon
@@ -3241,6 +3262,7 @@ ShallowWrapper {
                     header={
                               <style__HeaderWrapper>
                                         <style__Image
+                                                  onError={[Function]}
                                                   src="/public/images/assets/UKG.svg"
                                         />
                                         <style__TypeIcon
@@ -3325,6 +3347,7 @@ ShallowWrapper {
             header={
                         <style__HeaderWrapper>
                                     <style__Image
+                                                onError={[Function]}
                                                 src="/public/images/assets/UKG.svg"
                                     />
                                     <style__TypeIcon
@@ -3444,6 +3467,7 @@ ShallowWrapper {
 </style__CollapsableContent>,
             "header": <style__HeaderWrapper>
               <style__Image
+                            onError={[Function]}
                             src="/public/images/assets/UKG.svg"
               />
               <style__TypeIcon

diff --git a/src/components/TransferDescription/index.js b/src/components/TransferDescription/index.js
@@ -1,3 +1,4 @@
+import { shell } from 'electron';
 import { Row } from 'antd';
 import * as React from 'react';
 import PropTypes from 'prop-types';
@@ -8,6 +9,7 @@ import { isValidAddress } from 'ethereumjs-util';
 import { isHardwareWallet } from 'utils/wallet';
 
 import HWPromptContainer from 'containers/HWPromptContainer';
+import Text from 'components/ui/Text';
 
 import {
   StyledCol,
@@ -23,6 +25,31 @@ import TransferDescriptionItem from '../TransferDescriptionItem';
  * The TransferDescription Component
  */
 class TransferDescription extends React.PureComponent {
+  generateTransferingStatus() {
+    const { currentWalletWithInfo, layer, currentNetwork, intl, transfering } = this.props;
+    const { formatMessage } = intl;
+    if (!transfering || layer === 'nahmii') return null;
+    const transferingText = `${formatMessage({ id: 'waiting_for_transfer_to_be_mined' })}`;
+    return (
+      <div style={{ display: 'flex', flexDirection: 'column' }}>
+        <span>
+          <Text large>{transferingText}</Text>
+        </span>
+        <a
+          role="link"
+          tabIndex={0}
+          onClick={
+                    currentNetwork.provider._network.name === 'ropsten' ?
+                      () => shell.openExternal(`https://ropsten.etherscan.io/address/${currentWalletWithInfo.get('address')}`) :
+                      () => shell.openExternal(`https://etherscan.io/address/${currentWalletWithInfo.get('address')}`)
+                  }
+        >
+          {'Track progress on Etherscan'}
+        </a>
+      </div>
+    );
+  }
+
   render() {
     const {
       currentWalletWithInfo,
@@ -52,6 +79,9 @@ class TransferDescription extends React.PureComponent {
       !isValidAddress(recipient) ||
       !hwWalletReady ||
       (amountToSend.toNumber() === 0 && layer === 'nahmii');
+
+    const transferingStatus = this.generateTransferingStatus();
+
     return (
       <div>
         <Row>
@@ -151,19 +181,27 @@ class TransferDescription extends React.PureComponent {
               <HWPromptContainer />
             </HWPromptWrapper>
           }
-          {
-            this.props.transfering &&
-            <StyledSpin
-              delay={0}
-              size="large"
-            />
-          }
           {
             !this.props.transfering &&
               <StyledButton type="primary" onClick={onSend} disabled={disableSendButton}>
                 {formatMessage({ id: 'send' })}
               </StyledButton>
           }
+          {
+            this.props.transfering &&
+            <div>
+              {
+                transferingStatus &&
+                <div style={{ marginTop: '2rem', display: 'flex', flexDirection: 'column' }}>
+                  {transferingStatus}
+                </div>
+              }
+              <StyledSpin
+                delay={0}
+                size="large"
+              />
+            </div>
+          }
         </Row>
       </div>
     );
@@ -188,6 +226,7 @@ TransferDescription.propTypes = {
   hwWalletReady: PropTypes.bool.isRequired,
   currentWalletWithInfo: PropTypes.object.isRequired,
   intl: PropTypes.object,
+  currentNetwork: PropTypes.object,
 };
 
 export default injectIntl(TransferDescription);