mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 04:18:22 +02:00
Merge pull request #13444 from zfox23/MS16074_16076_banklinks
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
This commit is contained in:
Zach Fox
GitHub
commit
3ceb9ddee9
2 changed files with 63 additions and 59 deletions
|
|
@ -253,7 +253,11 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
|
||||||
} else if (link === "#blockchain") {
|
} else if (link === "#blockchain") {
|
||||||
Qt.openUrlExternally("https://docs.highfidelity.com/high-fidelity-commerce");
|
Qt.openUrlExternally("https://docs.highfidelity.com/high-fidelity-commerce");
|
||||||
} else if (link === "#bank") {
|
} else if (link === "#bank") {
|
||||||
Qt.openUrlExternally("hifi://BankOfHighFidelity");
|
if ((Account.metaverseServerURL).toString().indexOf("staging") >= 0) {
|
||||||
|
Qt.openUrlExternally("hifi://hifiqa-master-metaverse-staging"); // So that we can test in staging.
|
||||||
|
} else {
|
||||||
|
Qt.openUrlExternally("hifi://BankOfHighFidelity");
|
||||||
|
}
|
||||||
} else if (link === "#support") {
|
} else if (link === "#support") {
|
||||||
Qt.openUrlExternally("mailto:support@highfidelity.com");
|
Qt.openUrlExternally("mailto:support@highfidelity.com");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -252,64 +252,6 @@ Item {
|
||||||
anchors.bottom: parent.bottom;
|
anchors.bottom: parent.bottom;
|
||||||
anchors.left: parent.left;
|
anchors.left: parent.left;
|
||||||
anchors.right: parent.right;
|
anchors.right: parent.right;
|
||||||
|
|
||||||
Item {
|
|
||||||
// On empty history. We don't want to flash and then replace, so don't show until we know we should.
|
|
||||||
// The history is empty when it contains 1 item (the pending item count) AND there are no pending items.
|
|
||||||
visible: transactionHistoryModel.count === 1 &&
|
|
||||||
transactionHistoryModel.retrievedAtLeastOnePage &&
|
|
||||||
transactionHistoryModel.get(0).count === 0;
|
|
||||||
anchors.centerIn: parent;
|
|
||||||
width: parent.width - 12;
|
|
||||||
height: parent.height;
|
|
||||||
|
|
||||||
HifiControlsUit.Separator {
|
|
||||||
colorScheme: 1;
|
|
||||||
anchors.left: parent.left;
|
|
||||||
anchors.right: parent.right;
|
|
||||||
anchors.top: parent.top;
|
|
||||||
}
|
|
||||||
|
|
||||||
RalewayRegular {
|
|
||||||
id: noActivityText;
|
|
||||||
text: "Congrats! Your wallet is all set!<br><br>" +
|
|
||||||
"<b>Where's my HFC?</b><br>" +
|
|
||||||
"High Fidelity commerce is in open beta right now. Want more HFC? Get it by meeting with a banker at " +
|
|
||||||
"<a href='#goToBank'>BankOfHighFidelity</a>!"
|
|
||||||
// Text size
|
|
||||||
size: 22;
|
|
||||||
// Style
|
|
||||||
color: hifi.colors.blueAccent;
|
|
||||||
anchors.top: parent.top;
|
|
||||||
anchors.topMargin: 36;
|
|
||||||
anchors.left: parent.left;
|
|
||||||
anchors.leftMargin: 12;
|
|
||||||
anchors.right: parent.right;
|
|
||||||
anchors.rightMargin: 12;
|
|
||||||
height: paintedHeight;
|
|
||||||
wrapMode: Text.WordWrap;
|
|
||||||
horizontalAlignment: Text.AlignHCenter;
|
|
||||||
|
|
||||||
onLinkActivated: {
|
|
||||||
sendSignalToWallet({ method: "transactionHistory_goToBank" });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
HifiControlsUit.Button {
|
|
||||||
id: bankButton;
|
|
||||||
color: hifi.buttons.blue;
|
|
||||||
colorScheme: hifi.colorSchemes.dark;
|
|
||||||
anchors.top: noActivityText.bottom;
|
|
||||||
anchors.topMargin: 30;
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter;
|
|
||||||
width: parent.width/2;
|
|
||||||
height: 50;
|
|
||||||
text: "VISIT BANK OF HIGH FIDELITY";
|
|
||||||
onClicked: {
|
|
||||||
sendSignalToWallet({ method: "transactionHistory_goToBank" });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ListView {
|
ListView {
|
||||||
id: transactionHistory;
|
id: transactionHistory;
|
||||||
|
|
@ -411,6 +353,64 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
// On empty history. We don't want to flash and then replace, so don't show until we know we should.
|
||||||
|
// The history is empty when it contains 1 item (the pending item count) AND there are no pending items.
|
||||||
|
visible: transactionHistoryModel.count === 1 &&
|
||||||
|
transactionHistoryModel.retrievedAtLeastOnePage &&
|
||||||
|
transactionHistoryModel.get(0).count === 0;
|
||||||
|
anchors.centerIn: parent;
|
||||||
|
width: parent.width - 12;
|
||||||
|
height: parent.height;
|
||||||
|
|
||||||
|
HifiControlsUit.Separator {
|
||||||
|
colorScheme: 1;
|
||||||
|
anchors.left: parent.left;
|
||||||
|
anchors.right: parent.right;
|
||||||
|
anchors.top: parent.top;
|
||||||
|
}
|
||||||
|
|
||||||
|
RalewayRegular {
|
||||||
|
id: noActivityText;
|
||||||
|
text: "Congrats! Your wallet is all set!<br><br>" +
|
||||||
|
"<b>Where's my HFC?</b><br>" +
|
||||||
|
"High Fidelity commerce is in open beta right now. Want more HFC? Get it by meeting with a banker at " +
|
||||||
|
"<a href='#goToBank'>BankOfHighFidelity</a>!"
|
||||||
|
// Text size
|
||||||
|
size: 22;
|
||||||
|
// Style
|
||||||
|
color: hifi.colors.blueAccent;
|
||||||
|
anchors.top: parent.top;
|
||||||
|
anchors.topMargin: 36;
|
||||||
|
anchors.left: parent.left;
|
||||||
|
anchors.leftMargin: 12;
|
||||||
|
anchors.right: parent.right;
|
||||||
|
anchors.rightMargin: 12;
|
||||||
|
height: paintedHeight;
|
||||||
|
wrapMode: Text.WordWrap;
|
||||||
|
horizontalAlignment: Text.AlignHCenter;
|
||||||
|
|
||||||
|
onLinkActivated: {
|
||||||
|
sendSignalToWallet({ method: "transactionHistory_goToBank" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
HifiControlsUit.Button {
|
||||||
|
id: bankButton;
|
||||||
|
color: hifi.buttons.blue;
|
||||||
|
colorScheme: hifi.colorSchemes.dark;
|
||||||
|
anchors.top: noActivityText.bottom;
|
||||||
|
anchors.topMargin: 30;
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter;
|
||||||
|
width: parent.width/2;
|
||||||
|
height: 50;
|
||||||
|
text: "VISIT BANK OF HIGH FIDELITY";
|
||||||
|
onClicked: {
|
||||||
|
sendSignalToWallet({ method: "transactionHistory_goToBank" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue