Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
1c7b325a
Commit
1c7b325a
authored
Feb 20, 2018
by
Iuri Matias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor: remove unnecessary level of depth from runInNode
parent
9e3c8029
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
29 deletions
+28
-29
txRunner.js
src/app/execution/txRunner.js
+28
-29
No files found.
src/app/execution/txRunner.js
View file @
1c7b325a
...
@@ -155,37 +155,36 @@ TxRunner.prototype.runInNode = function (from, to, data, value, gasLimit, useCal
...
@@ -155,37 +155,36 @@ TxRunner.prototype.runInNode = function (from, to, data, value, gasLimit, useCal
tx
.
gas
=
gasEstimation
tx
.
gas
=
gasEstimation
if
(
!
self
.
_api
.
config
.
getUnpersistedProperty
(
'doNotShowTransactionConfirmationAgain'
))
{
if
(
self
.
_api
.
config
.
getUnpersistedProperty
(
'doNotShowTransactionConfirmationAgain'
))
{
self
.
_api
.
detectNetwork
((
err
,
network
)
=>
{
return
executeTx
(
tx
,
null
,
self
.
_api
,
callback
)
if
(
err
)
{
}
console
.
log
(
err
)
self
.
_api
.
detectNetwork
((
err
,
network
)
=>
{
}
else
{
if
(
err
)
{
if
(
network
.
name
===
'Main'
)
{
console
.
log
(
err
)
var
content
=
confirmDialog
(
tx
,
gasEstimation
,
self
)
}
else
{
modalDialog
(
'Confirm transaction'
,
content
,
if
(
network
.
name
===
'Main'
)
{
{
label
:
'Confirm'
,
var
content
=
confirmDialog
(
tx
,
gasEstimation
,
self
)
modalDialog
(
'Confirm transaction'
,
content
,
{
label
:
'Confirm'
,
fn
:
()
=>
{
self
.
_api
.
config
.
setUnpersistedProperty
(
'doNotShowTransactionConfirmationAgain'
,
content
.
querySelector
(
'input#confirmsetting'
).
checked
)
if
(
!
content
.
gasPriceStatus
)
{
callback
(
'Given gas grice is not correct'
)
}
else
{
var
gasPrice
=
executionContext
.
web3
().
toWei
(
content
.
querySelector
(
'#gasprice'
).
value
,
'gwei'
)
executeTx
(
tx
,
gasPrice
,
self
.
_api
,
callback
)
}
}},
{
label
:
'Cancel'
,
fn
:
()
=>
{
fn
:
()
=>
{
self
.
_api
.
config
.
setUnpersistedProperty
(
'doNotShowTransactionConfirmationAgain'
,
content
.
querySelector
(
'input#confirmsetting'
).
checked
)
return
callback
(
'Transaction canceled by user.'
)
if
(
!
content
.
gasPriceStatus
)
{
}
callback
(
'Given gas grice is not correct'
)
})
}
else
{
}
else
{
var
gasPrice
=
executionContext
.
web3
().
toWei
(
content
.
querySelector
(
'#gasprice'
).
value
,
'gwei'
)
executeTx
(
tx
,
null
,
self
.
_api
,
callback
)
executeTx
(
tx
,
gasPrice
,
self
.
_api
,
callback
)
}
}},
{
label
:
'Cancel'
,
fn
:
()
=>
{
return
callback
(
'Transaction canceled by user.'
)
}
})
}
else
{
executeTx
(
tx
,
null
,
self
.
_api
,
callback
)
}
}
}
})
}
}
else
{
})
executeTx
(
tx
,
null
,
self
.
_api
,
callback
)
}
})
})
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment