X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Ffeatures%2Ftransactions%2Ftransactions.js;h=be2f60bea0bb644bcb255fa180830ed7ca4c5294;hb=3c59c51d04fcd0295dd8fdb874a94fe8e4ce6d5c;hp=fbf53fe31a32b35a15cfbdb8bf2b265415ca0ff8;hpb=690d51d51c3c905fc11b3c545dc950532e44e697;p=bytom%2Fbytom-electron.git

diff --git a/src/features/transactions/transactions.js b/src/features/transactions/transactions.js
index fbf53fe..be2f60b 100644
--- a/src/features/transactions/transactions.js
+++ b/src/features/transactions/transactions.js
@@ -4,17 +4,17 @@ import { sum } from 'utility/math'
 
 export const balance = (values, assetDecimal, balances, btmAmountUnit) => {
   let filteredBalances = balances
-  if (values.accountAlias.value) {
-    filteredBalances = filteredBalances.filter(balance => balance.accountAlias === values.accountAlias.value)
+  if (values.accountAlias) {
+    filteredBalances = filteredBalances.filter(balance => balance.accountAlias === values.accountAlias)
   }
-  if (values.accountId.value) {
-    filteredBalances = filteredBalances.filter(balance => balance.accountId === values.accountId.value)
+  if (values.accountId) {
+    filteredBalances = filteredBalances.filter(balance => balance.accountId === values.accountId)
   }
-  if (values.assetAlias.value) {
-    filteredBalances = filteredBalances.filter(balance => balance.assetAlias === values.assetAlias.value)
+  if (values.assetAlias) {
+    filteredBalances = filteredBalances.filter(balance => balance.assetAlias === values.assetAlias)
   }
-  if (values.assetId.value) {
-    filteredBalances = filteredBalances.filter(balance => balance.assetId === values.assetId.value)
+  if (values.assetId) {
+    filteredBalances = filteredBalances.filter(balance => balance.assetId === values.assetId)
   }
 
   if(filteredBalances.length === 1){
@@ -44,10 +44,10 @@ export const getAssetDecimal = (values, asset) => {
 }
 
 export const normalTxActionBuilder = (transaction, gas, prop) =>{
-  const accountAlias = transaction.accountAlias.value || transaction.accountAlias
-  const accountId = transaction.accountId.value || transaction.accountId
-  const assetAlias = transaction.assetAlias.value || transaction.assetAlias
-  const assetId = transaction.assetId.value || transaction.assetId
+  const accountAlias =  transaction.accountAlias
+  const accountId = transaction.accountId
+  const assetAlias = transaction.assetAlias
+  const assetId = transaction.assetId
   const receivers = transaction.receivers
 
   const totalAmount = sum(receivers, prop )
@@ -73,10 +73,10 @@ export const normalTxActionBuilder = (transaction, gas, prop) =>{
   receivers.forEach((receiver)=>{
     actions.push(
       {
-        address: receiver.address.value || receiver.address,
+        address: receiver.address,
         assetAlias,
         assetId,
-        amount: Number(receiver.amount.value || receiver.amount),
+        amount: Number(receiver.amount),
         type: 'control_address'
       }
     )
@@ -86,10 +86,10 @@ export const normalTxActionBuilder = (transaction, gas, prop) =>{
 }
 
 export const issueAssetTxActionBuilder = (transaction, gas,prop) =>{
-  const accountAlias = transaction.accountAlias.value || transaction.accountAlias
-  const accountId = transaction.accountId.value || transaction.accountId
-  const assetAlias = transaction.assetAlias.value || transaction.assetAlias
-  const assetId = transaction.assetId.value || transaction.assetId
+  const accountAlias = transaction.accountAlias
+  const accountId = transaction.accountId
+  const assetAlias = transaction.assetAlias
+  const assetId =  transaction.assetId
   const receivers = transaction.receivers
 
   const totalAmount = sum(receivers, prop )
@@ -113,10 +113,10 @@ export const issueAssetTxActionBuilder = (transaction, gas,prop) =>{
   receivers.forEach((receiver)=>{
     actions.push(
       {
-        address: receiver.address.value || receiver.address,
+        address: receiver.address,
         assetAlias,
         assetId,
-        amount: Number(receiver.amount.value || receiver.amount),
+        amount: Number(receiver.amount),
         type: 'control_address'
       }
     )