status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: load browser only when the browser tab is clicked

This commit is contained in:
Richard Ramos 2020-10-07 15:49:26 -04:00 committed by Iuri Matias
parent 48fed85121
commit cf3121f688
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ui/app/AppLayouts/Browser/BrowserLayout.qml
View File

@ -32,11 +32,11 @@ Rectangle {
property var urlENSDictionary: ({})
function determineRealURL(text){
var url = utilsModel.urlFromUserInput(text);
var host = web3Provider.getHost(url);
var url = _utilsModel.urlFromUserInput(text);
var host = _web3Provider.getHost(url);
if(host.endsWith(".eth")){
var ensResource = web3Provider.ensResourceURL(host, url);
urlENSDictionary[web3Provider.getHost(ensResource)] = host;
var ensResource = _web3Provider.ensResourceURL(host, url);
urlENSDictionary[_web3Provider.getHost(ensResource)] = host;
url = ensResource;
}
return url;
@ -49,7 +49,7 @@ Rectangle {
function postMessage(isAllowed){
request.isAllowed = isAllowed;
provider.web3Response(web3Provider.postMessage(JSON.stringify(request)));
provider.web3Response(_web3Provider.postMessage(JSON.stringify(request)));
}
onClosed: {
@ -157,20 +157,20 @@ Rectangle {
}
if (request.type === Constants.api_request) {
if (!web3Provider.hasPermission(request.hostname, request.permission)) {
if (!_web3Provider.hasPermission(request.hostname, request.permission)) {
var dialog = accessDialogComponent.createObject(browserWindow);
dialog.request = request;
dialog.open();
} else {
request.isAllowed = true;
web3Response(web3Provider.postMessage(JSON.stringify(request)));
web3Response(_web3Provider.postMessage(JSON.stringify(request)));
}
} else if (request.type === Constants.web3SendAsyncReadOnly &&
request.payload.method === "eth_sendTransaction") {
const sendDialog = sendTransactionModalComponent.createObject(browserWindow);
walletModel.setFocusedAccountByAddress(request.payload.params[0].from)
var acc = walletModel.focusedAccount
_walletModel.setFocusedAccountByAddress(request.payload.params[0].from)
var acc = _walletModel.focusedAccount
sendDialog.selectedAccount = {
name: acc.name,
address: request.payload.params[0].from,
@ -179,8 +179,8 @@ Rectangle {
}
sendDialog.selectedRecipient = {
address: request.payload.params[0].to,
identicon: chatsModel.generateIdenticon(request.payload.params[0].to),
name: chatsModel.activeChannel.name,
identicon: _chatsModel.generateIdenticon(request.payload.params[0].to),
name: _chatsModel.activeChannel.name,
type: RecipientSelector.Type.Address
};
// TODO get this from data
@ -189,7 +189,7 @@ Rectangle {
symbol: "ETH",
address: Constants.zeroAddress
};
const value = utilsModel.wei2Token(request.payload.params[0].value, 18)
const value = _utilsModel.wei2Token(request.payload.params[0].value, 18)
sendDialog.selectedAmount = value
// TODO calculate that
sendDialog.selectedFiatAmount = "42";
@ -201,7 +201,7 @@ Rectangle {
request.payload.password = enteredPassword
request.payload.params[0].value = value
const response = web3Provider.postMessage(JSON.stringify(request))
const response = _web3Provider.postMessage(JSON.stringify(request))
provider.web3Response(response)
let responseObj
@ -217,7 +217,7 @@ Rectangle {
toastMessage.source = "../../img/loading.svg"
toastMessage.iconColor = Style.current.primary
toastMessage.iconRotates = true
toastMessage.link = `${walletModel.etherscanLink}/${responseObj.result}`
toastMessage.link = `${_walletModel.etherscanLink}/${responseObj.result}`
toastMessage.open()
} catch (e) {
if (e.message.includes("could not decrypt key with given password")){
@ -234,13 +234,13 @@ Rectangle {
}
sendDialog.open();
walletModel.getGasPricePredictions()
_walletModel.getGasPricePredictions()
} else {
web3Response(web3Provider.postMessage(data));
web3Response(_web3Provider.postMessage(data));
}
}
property int networkId: web3Provider.networkId
property int networkId: _web3Provider.networkId
}
WebChannel {
@ -252,7 +252,7 @@ Rectangle {
storageName: "Profile"
offTheRecord: false
httpUserAgent: {
if (addressBar.text.indexOf("google.") > -1) {
if (browserHeader.addressBar.text.indexOf("google.") > -1) {
// Google doesn't let you connect if the user agent is Chrome-ish and doesn't satisfy some sort of hidden requirement
return "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:81.0) Gecko/20100101 Firefox/81.0"
}
@ -403,7 +403,6 @@ Rectangle {
}
}
BrowserHeader {
id: browserHeader
anchors.top: parent.top

20
ui/app/AppMain.qml
View File

@ -223,6 +223,11 @@ RowLayout {
if (typeof this.children[currentIndex].onActivated === "function") {
this.children[currentIndex].onActivated()
}
if(this.children[currentIndex] === browserLayoutContainer && browserLayoutContainer.active == false){
browserLayoutContainer.active = true;
}
}
ChatLayout {
@ -239,11 +244,24 @@ RowLayout {
Layout.fillHeight: true
}
BrowserLayout {
Component {
id: browserLayoutComponent
BrowserLayout { }
}
Loader {
id: browserLayoutContainer
sourceComponent: browserLayoutComponent
active: false
Layout.fillWidth: true
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
Layout.fillHeight: true
// Loaders do not have access to the context, so props need to be set
// Adding a "_" to avoid a binding loop
property var _chatsModel: chatsModel
property var _walletModel: walletModel
property var _utilsModel: utilsModel
property var _web3Provider: web3Provider
}
ProfileLayout {