update vmVersion and inssuranceProgram.

diff --git a/src/features/transactions/actions.js b/src/features/transactions/actions.js
index f39aed7..735953a 100644 (file)
--- a/src/features/transactions/actions.js
+++ b/src/features/transactions/actions.js
@@ -52,7 +52,7 @@ function preprocessTransaction(formParams) {
     let a = builder.actions[i]
 
     delete a.ID
-    const intFields = ['amount', 'position','sourcePos']
+    const intFields = ['amount', 'position','sourcePos','vmVersion']
     intFields.forEach(key => {
       const value = a[key]
       if (value) {

diff --git a/src/features/transactions/components/DetailSummary/DetailSummary.jsx b/src/features/transactions/components/DetailSummary/DetailSummary.jsx
index 55cd734..30e2b8e 100644 (file)
--- a/src/features/transactions/components/DetailSummary/DetailSummary.jsx
+++ b/src/features/transactions/components/DetailSummary/DetailSummary.jsx
@@ -194,14 +194,16 @@ class DetailSummary extends React.Component {
             }else{
               type = asset.issue >= amount? 'issue': 'received'
             }
-            items.push({
-              type: type,
-              amount: asset.decimals? converIntToDec(amount, asset.decimals) : normalizeBtmAmountUnit(assetId, amount, this.props.btmAmountUnit),
-              asset: assetAlias ? assetAlias : <code className={styles.rawId}>{assetId}</code>,
-              assetId: assetId,
-              account: account.alias ? account.alias : <code className={styles.rawId}>{accountId}</code>,
-              accountId: accountId,
-            })
+            if(amount >0){
+              items.push({
+                type: type,
+                amount: asset.decimals? converIntToDec(amount, asset.decimals) : normalizeBtmAmountUnit(assetId, amount, this.props.btmAmountUnit),
+                asset: assetAlias ? assetAlias : <code className={styles.rawId}>{assetId}</code>,
+                assetId: assetId,
+                account: account.alias ? account.alias : <code className={styles.rawId}>{accountId}</code>,
+                accountId: accountId,
+              })
+            }
           }
 
           if(account['veto'] > 0){

diff --git a/src/features/transactions/components/New/AdvancedTransactionForm.jsx b/src/features/transactions/components/New/AdvancedTransactionForm.jsx
index efd0136..3fb7d33 100644 (file)
--- a/src/features/transactions/components/New/AdvancedTransactionForm.jsx
+++ b/src/features/transactions/components/New/AdvancedTransactionForm.jsx
@@ -263,6 +263,8 @@ export default withNamespaces('translations') (BaseNew.connect(
       'actions[].address',
       'actions[].vote',
       'actions[].sourceId',
+      'actions[].vmVersion',
+      'actions[].issuanceProgram',
       'actions[].sourcePos',
       'actions[].password',
       'submitAction',

diff --git a/src/features/transactions/components/New/FormActionItem.jsx b/src/features/transactions/components/New/FormActionItem.jsx
index bda8456..ae53178 100644 (file)
--- a/src/features/transactions/components/New/FormActionItem.jsx
+++ b/src/features/transactions/components/New/FormActionItem.jsx
@@ -30,7 +30,7 @@ const actionLabels = {
 
 const visibleFields = {
   [CROSS_CHAIN_OUT_KEY]: {asset: true, amount: true, address:true},
-  [CROSS_CHAIN_IN_KEY]: {asset: true, amount: true, sourceId:true, sourcePos:true},
+  [CROSS_CHAIN_IN_KEY]: {asset: true, amount: true, sourceId:true, sourcePos:true, vmVersion:true, issuanceProgram:true},
   [VOTE_OUTPUT_KEY]: {asset: true, amount: true, address:true, vote:true},
   [VETO_KEY]: {account:true, amount: true, asset: true, vote:true},
   [SPEND_ACCOUNT_KEY]: {asset: true, account: true, amount: true, password: true},
@@ -76,6 +76,8 @@ class ActionItem extends React.Component {
       vote,
       sourceId,
       sourcePos,
+      vmVersion,
+      issuanceProgram,
       referenceData } = this.props.fieldProps
 
     const visible = visibleFields[type.value] || {}
@@ -122,6 +124,9 @@ class ActionItem extends React.Component {
         {visible.vote && <TextField title={ t('form.vote' )} fieldProps={vote} />}
         {visible.sourceId && <TextField title={ t('form.sourceId' )} fieldProps={sourceId} />}
         {visible.sourcePos && <TextField title={ t('form.sourcePos' )} fieldProps={sourcePos} />}
+        {visible.vmVersion && <TextField title={t('form.vmVersion')} fieldProps={vmVersion} />}
+        {visible.issuanceProgram && <TextField title={ t('form.issuanceProgram') } fieldProps={issuanceProgram} />}
+
 
         {visible.outputId &&
           <TextField title='Output ID' fieldProps={outputId} />}

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index 992a431..dcf538e 100644 (file)
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -143,7 +143,8 @@
     "reissueTrue":"Able to be reissued",
     "reissueFalse":"Unable to be reissued",
     "vote": "Node Public Key",
-    "totalVoteNumber":"Vote"
+    "totalVoteNumber":"Vote",
+    "vmVersion":"VM Version"
   },
   "xpub":{
     "methodOptions" : {

diff --git a/src/locales/zh/translation.json b/src/locales/zh/translation.json
index f746815..2284de8 100644 (file)
--- a/src/locales/zh/translation.json
+++ b/src/locales/zh/translation.json
@@ -143,7 +143,8 @@
     "reissueTrue":"可重复发行",
     "reissueFalse":"不可重复发行",
     "vote": "节点公钥",
-    "totalVoteNumber":"投票"
+    "totalVoteNumber":"投票",
+    "vmVersion":"VM版本号"
   },
   "xpub":{
     "methodOptions" : {