-
Notifications
You must be signed in to change notification settings - Fork 973
Conversation
@@ -721,6 +721,16 @@ const api = { | |||
} | |||
}) | |||
|
|||
tab.on('did-detach', (e, oldTabId) => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Slava is this block supposed to be here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand why this is needed. Maybe you can remember the context of this commit? c375ba3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Slava lol wow i have no idea. sorry i thought it was left over from the rebase.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
er yeah this needs to - looks like a rebase issue from before -> after the signle-webview project. Tab's now detach
every time they are made inactive / active, so this will break something (minor).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@petemill sorry do you mean this chunk should be deleted or kept (or other)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@petemill ping
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like this block got added during rebase because of a fix within in the original ethwallet branch - 00cdfdd#diff-2be38b3d97f35cd818780bac4be979c4R629
I think we should delete this block
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops missed out a key word
this needs to go
Thanks for the spot
Selecting Open/Transfer/Create from extension popup, opens up a new tab each time. Is this expected behaviour? |
Steps from #13177
|
'style-src': '\'self\' \'unsafe-inline\'', | ||
'connect-src': 'blob: \'self\' ws://localhost:* http://localhost:* https://min-api.cryptocompare.com https://mini-api.cryptocompare.com', | ||
'img-src': '\'self\' data:', | ||
'script-src': '\'self\' \'unsafe-eval\' \'sha256-7B6rTuXUsu9shBeECmDFH4h7RDsfogQ3kIonJnIL40o\' \'sha256-zgjB35Pd2ax7Wwfk9iKnAH8r+gNrD2cHpxDkH81DHzw=\'', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Slava do we need unsafe-eval here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I added it because whatever the Meteor app compiles into uses new Function
. I can look into how tweaking the minifier and try to get something that doesn't use eval.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok after spending some time on this I tracked it down to this
facebook/regenerator#336. It is an unsafe line in regenerator that used to compile web3js package for Meteor.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm maybe not exactly this, but something very similar that tries to get the value of global
package.json
Outdated
@@ -95,7 +97,8 @@ | |||
"bat-client": "^3.3.2", | |||
"bat-publisher": "^2.0.18", | |||
"bignumber.js": "^4.0.4", | |||
"bloodhound-js": "brave/bloodhound", | |||
"bloodhound-js": "github:brave/bloodhound", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this change needed?
@Slava could you rebase when you get a chance? |
app/extensions.js
Outdated
|
||
geth = spawn(gethProcessPath, gethArgs, spawnOptions) | ||
|
||
geth.on('exit', function (code, signal) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
both the exit/close handlers should do the same thing: log the code & siginal, and restart geth.
there should be a handler for error that logs the error and does not restart geth.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
++
app/extensions.js
Outdated
if (fs.existsSync(pidPath)) { | ||
try { | ||
const pid = fs.readFileSync(pidPath) | ||
cleanupGeth(pid) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since geth is probably undefined at this point, will cleanupGeth
actually kill that pid?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, in the event that geth
is undefined the kill will not go forward. Will fix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
326048d
to
edb3ba8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
5b1fd0d
to
be48f37
Compare
e4d805c
to
b36ab69
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
re-approved
delete did-detach block accidentally brought back in #14734
delete did-detach block accidentally brought back in #14734
delete did-detach block accidentally brought back in #14734
Submitter Checklist:
git rebase -i
to squash commits (if needed).Test Plan:
Reviewer Checklist:
Tests