|
@@ -81,7 +81,7 @@ export default class TxModel {
|
|
|
let localRecord = {}
|
|
let localRecord = {}
|
|
|
|
|
|
|
|
localRecord.hash = remoteRecord.hash
|
|
localRecord.hash = remoteRecord.hash
|
|
|
- localRecord.blockNumber = remoteRecord.blockNumber
|
|
|
|
|
|
|
+ localRecord.blockNumber = (remoteRecord.blockNumber === null ? 0 : remoteRecord.blockNumber)
|
|
|
localRecord.comment = remoteRecord.comment
|
|
localRecord.comment = remoteRecord.comment
|
|
|
localRecord.from = remoteRecord.fromAddress
|
|
localRecord.from = remoteRecord.fromAddress
|
|
|
localRecord.to = remoteRecord.toAddress
|
|
localRecord.to = remoteRecord.toAddress
|
|
@@ -91,10 +91,10 @@ export default class TxModel {
|
|
|
localRecord.fromName = remoteRecord.fromName
|
|
localRecord.fromName = remoteRecord.fromName
|
|
|
localRecord.toName = remoteRecord.toName
|
|
localRecord.toName = remoteRecord.toName
|
|
|
localRecord.status = parseInt(remoteRecord.status)
|
|
localRecord.status = parseInt(remoteRecord.status)
|
|
|
- localRecord.index = parseInt(remoteRecord.transactionIndex === null ? "-1": remoteRecord.transactionIndex )
|
|
|
|
|
|
|
+ localRecord.index = parseInt(remoteRecord.transactionIndex === null ? "-1" : remoteRecord.transactionIndex)
|
|
|
localRecord.type = remoteRecord.tradeType
|
|
localRecord.type = remoteRecord.tradeType
|
|
|
// if (isNaN(localRecord.type))
|
|
// if (isNaN(localRecord.type))
|
|
|
- if (localRecord.type === NaN ||localRecord.type === null || localRecord.type === undefined)
|
|
|
|
|
|
|
+ if (localRecord.type === NaN || localRecord.type === null || localRecord.type === undefined)
|
|
|
localRecord.type = ''
|
|
localRecord.type = ''
|
|
|
|
|
|
|
|
|
|
|
|
@@ -120,7 +120,7 @@ export default class TxModel {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static parseGasPrice(gasPriceStr) {
|
|
static parseGasPrice(gasPriceStr) {
|
|
|
- if(!gasPriceStr){
|
|
|
|
|
|
|
+ if (!gasPriceStr) {
|
|
|
return -1
|
|
return -1
|
|
|
}
|
|
}
|
|
|
|
|
|