pages restyle.

diff --git a/src/features/assets/components/NewAssetInfo.jsx b/src/features/assets/components/NewAssetInfo.jsx
index 3fd58f5..3a7c59f 100644 (file)
--- a/src/features/assets/components/NewAssetInfo.jsx
+++ b/src/features/assets/components/NewAssetInfo.jsx
@@ -1,9 +1,11 @@
 import React from 'react'
-import { FormContainer, FormSection, TextField, RadioField } from 'features/shared/components'
+import { FormContainer, FormSection, TextField, RadioField, SelectField } from 'features/shared/components'
 import { reduxForm } from 'redux-form'
 import {withNamespaces} from 'react-i18next'
 import styles from './New.scss'
 
+const rangeOptions = [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16].map(val => ({label: val, value: val}))
+
 class NewAssetInfo extends React.Component {
   constructor(props) {
     super(props)
@@ -45,7 +47,11 @@ class NewAssetInfo extends React.Component {
         <FormSection title={t('asset.information')}>
           <TextField title={t('form.alias')} placeholder={t('asset.aliasLengthError')} fieldProps={alias} autoFocus={true} />
           <TextField title={t('form.symbol')} placeholder={t('asset.symbolPlaceholder')} fieldProps={symbol} />
-          <TextField title={t('form.decimals')} placeholder={t('asset.decimalPlaceholder')} fieldProps={decimals} />
+          <SelectField options={rangeOptions}
+                       title={t('form.decimals')}
+                       hint={t('asset.decimalPlaceholder')}
+                       skipEmpty={true}
+                       fieldProps={decimals} />
           <RadioField title={t('form.reissueTitle')} options={options} fieldProps={reissue} />
           <label >{t('asset.additionInfo')}</label>
 

diff --git a/src/features/transactions/components/New/IssueAssets.jsx b/src/features/transactions/components/New/IssueAssets.jsx
index dc2feee..1cd2776 100644 (file)
--- a/src/features/transactions/components/New/IssueAssets.jsx
+++ b/src/features/transactions/components/New/IssueAssets.jsx
@@ -4,7 +4,6 @@ import {
   Autocomplete,
   ObjectSelectorField,
   TextField,
-  AmountUnitField,
   AmountField,
   PasswordField,
   RadioField,
@@ -180,9 +179,10 @@ class IssueAssets extends React.Component {
 
     let submitLabel = t('transaction.new.submit')
     if (submitAction.value == 'sign') {
-      submitLabel = 'sign tx'
+      submitLabel = t('transaction.issue.signTx')
     }
 
+    let gas
     const options = [
       {label: t('transaction.advance.submitToBlockchain') , value: 'submit'},
       {label: t('transaction.issue.signRaw'), value: 'sign'}
@@ -205,7 +205,7 @@ class IssueAssets extends React.Component {
       const issueAssetId = issueAction.assetId
       assetId.value = issueAssetId
 
-      gasLevel.value = transaction.fee / Math.pow(10, 8) + ' BTM'
+      gas = transaction.fee / Math.pow(10, 8) + ' BTM'
 
       accountAlias.value = inputs.filter(input => input.type === 'spend')[0].address
 
@@ -265,36 +265,35 @@ class IssueAssets extends React.Component {
         <FormSection  title={t('transaction.issue.issueAsset')}>
           {assetItem}
           <label className={styles.title}>{t('form.input')}</label>
-          <div className={`${styles.mainBox} ${this.props.tutorialVisible? styles.tutorialItem: styles.item}`}>
+          <div className={styles.mainBox}>
             {
               submitAction.value === 'sign'?
                 <TextField title={t('transaction.issue.accountAddress')}
                            disabled = {true}
                            fieldProps={accountAlias}/>
                 :
-                <ObjectSelectorField
-                  key='account-selector-field'
-                  keyIndex='normaltx-account'
-                  title={t('form.account')}
-                  aliasField={Autocomplete.AccountAlias}
-                  fieldProps={{
-                    id: accountId,
-                    alias: accountAlias
-                  }}
-                />
-            }
-
-            {
-              submitAction.value === 'submit' && <ObjectSelectorField
-                key='asset-selector-field'
-                keyIndex='normaltx-asset'
-                title={ t('form.asset')}
-                aliasField={Autocomplete.AssetAlias}
-                fieldProps={{
-                  id: assetId,
-                  alias: assetAlias
-                }}
-              />
+                [
+                  <ObjectSelectorField
+                    key='asset-selector-field'
+                    keyIndex='normaltx-asset'
+                    title={ t('transaction.issue.issueAsset')}
+                    aliasField={Autocomplete.AssetAlias}
+                    fieldProps={{
+                      id: assetId,
+                      alias: assetAlias
+                    }}
+                  />,
+                  <ObjectSelectorField
+                    key='account-selector-field'
+                    keyIndex='normaltx-account'
+                    title={t('transaction.issue.gasAccount')}
+                    aliasField={Autocomplete.AccountAlias}
+                    fieldProps={{
+                      id: accountId,
+                      alias: accountAlias
+                    }}
+                  />
+                ]
             }
           </div>
           <label className={styles.title}>{t('form.output')}</label>
@@ -352,7 +351,7 @@ class IssueAssets extends React.Component {
 
             {
               submitAction.value === 'sign'?
-                <TextField disable={true} fieldProps={gasLevel}/>
+                gas || ''
                 :
                 <div className={styles.txFeeBox}>
                   <GasField
@@ -453,6 +452,7 @@ const mapStateToProps = (state, ownProps) => ({
   decodedTx: state.transaction.decodedTx,
   initialValues:{
     assetAlias: ownProps.location.query.alias,
+    assetId:'',
     submitAction: 'submit',
     gasLevel: '1',
     receivers:[{

diff --git a/src/features/transactions/components/New/NormalTransactionForm.jsx b/src/features/transactions/components/New/NormalTransactionForm.jsx
index 16f3f24..7065c30 100644 (file)
--- a/src/features/transactions/components/New/NormalTransactionForm.jsx
+++ b/src/features/transactions/components/New/NormalTransactionForm.jsx
@@ -171,7 +171,7 @@ class NormalTxForm extends React.Component {
           >
           <div className={styles.borderBottom}>
             <label className={styles.title}>{t('transaction.normal.from')}</label>
-            <div className={`${styles.mainBox} ${this.props.tutorialVisible? styles.tutorialItem: styles.item}`}>
+            <div className={`${styles.mainBox} `}>
               <ObjectSelectorField
                 key='account-selector-field'
                 keyIndex='normaltx-account'

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index 7451600..9fc135e 100644 (file)
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -299,7 +299,9 @@
       "issueAsset":"Issue Asset",
       "transactionType":"Transaction Type",
       "signRaw":"Sign Raw Transaction",
-      "accountAddress":"Account Address"
+      "accountAddress":"Gas Paid Account Address",
+      "gasAccount":"Gas Paid Account",
+      "signTx":"Sign Transaction"
     }
   },
   "balances":{

diff --git a/src/locales/zh/translation.json b/src/locales/zh/translation.json
index 577f809..eda5ed2 100644 (file)
--- a/src/locales/zh/translation.json
+++ b/src/locales/zh/translation.json
@@ -40,8 +40,8 @@
     "requestId":"请求ID：",
     "cancel": "返回",
     "continue":"继续",
-    "next":"向后",
-    "previous":"向前",
+    "next":"下一页",
+    "previous":"上一页",
     "addField":"添加项"
   },
   "crumbName":{
@@ -298,7 +298,9 @@
       "issueAsset":"发布资产",
       "transactionType":"交易类型",
       "signRaw":"签名交易Json",
-      "accountAddress":"账户地址"
+      "accountAddress":"Gas付款账户地址",
+      "gasAccount":"Gas付款账户",
+      "signTx":"签名提交交易"
     }
   },
   "balances":{