diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index 6d8fc3c33f..6cf00f78eb 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -74,8 +74,7 @@ In your Wallet's Send Money tab, choose from your list of connections, or choose
isExpanded: false;
question: "What is a Security Pic?"
answer: "Your Security Pic acts as an extra layer of Wallet security. \
-When you see your Security Pic, you know that your actions and data are securely making use of your account. \
-
Tap here to change your Security Pic.";
+When you see your Security Pic, you know that your actions and data are securely making use of your account.";
}
ListElement {
isExpanded: false;
@@ -137,7 +136,7 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
anchors.left: parent.left;
width: parent.width;
height: questionText.paintedHeight + 50;
-
+
RalewaySemiBold {
id: plusMinusButton;
text: model.isExpanded ? "-" : "+";
@@ -217,8 +216,6 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
}
} else if (link === "#support") {
Qt.openUrlExternally("mailto:support@highfidelity.com");
- } else if (link === "#securitypic") {
- sendSignalToWallet({method: 'walletSecurity_changeSecurityImage'});
}
}
}
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index cbb77883df..f2119a1a8f 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -232,10 +232,6 @@ Rectangle {
root.isPassword = msg.isPasswordField;
} else if (msg.method === 'walletSetup_lowerKeyboard') {
root.keyboardRaised = false;
- } else if (msg.method === 'walletSecurity_changePassphraseCancelled') {
- root.activeView = "security";
- } else if (msg.method === 'walletSecurity_changePassphraseSuccess') {
- root.activeView = "security";
} else {
sendToScript(msg);
}
@@ -245,27 +241,6 @@ Rectangle {
}
}
}
- SecurityImageChange {
- id: securityImageChange;
- visible: root.activeView === "securityImageChange";
- z: 997;
- anchors.top: titleBarContainer.bottom;
- anchors.left: parent.left;
- anchors.right: parent.right;
- anchors.bottom: parent.bottom;
-
- Connections {
- onSendSignalToWallet: {
- if (msg.method === 'walletSecurity_changeSecurityImageCancelled') {
- root.activeView = "security";
- } else if (msg.method === 'walletSecurity_changeSecurityImageSuccess') {
- root.activeView = "security";
- } else {
- sendToScript(msg);
- }
- }
- }
- }
//
// TAB CONTENTS START
@@ -366,39 +341,6 @@ Rectangle {
}
}
- Security {
- id: security;
- visible: root.activeView === "security";
- anchors.top: titleBarContainer.bottom;
- anchors.bottom: tabButtonsContainer.top;
- anchors.left: parent.left;
- anchors.right: parent.right;
-
- Connections {
- onSendSignalToWallet: {
- if (msg.method === 'walletSecurity_changePassphrase') {
- root.activeView = "passphraseChange";
- passphraseChange.clearPassphraseFields();
- passphraseChange.resetSubmitButton();
- } else if (msg.method === 'walletSecurity_changeSecurityImage') {
- securityImageChange.initModel();
- root.activeView = "securityImageChange";
- } else if (msg.method === 'walletSecurity_autoLogoutHelp') {
- lightboxPopup.titleText = "Automatically Log Out";
- lightboxPopup.bodyText = "By default, after you log in to High Fidelity, you will stay logged in to your High Fidelity " +
- "account even after you close and re-open Interface. This means anyone who opens Interface on your computer " +
- "could make purchases with your Wallet.\n\n" +
- "If you do not want to stay logged in across Interface sessions, check this box.";
- lightboxPopup.button1text = "CLOSE";
- lightboxPopup.button1method = function() {
- lightboxPopup.visible = false;
- }
- lightboxPopup.visible = true;
- }
- }
- }
- }
-
Help {
id: help;
visible: root.activeView === "help";
@@ -407,14 +349,6 @@ Rectangle {
anchors.left: parent.left;
anchors.right: parent.right;
- Connections {
- onSendSignalToWallet: {
- if (msg.method === 'walletSecurity_changeSecurityImage') {
- securityImageChange.initModel();
- root.activeView = "securityImageChange";
- }
- }
- }
}
@@ -428,7 +362,7 @@ Rectangle {
Item {
id: tabButtonsContainer;
visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && root.activeView !== "securityImageChange" && sendMoney.currentActiveView !== "sendAssetStep";
- property int numTabs: 5;
+ property int numTabs: 4;
// Size
width: root.width;
height: 90;
@@ -452,7 +386,7 @@ Rectangle {
anchors.left: parent.left;
anchors.bottom: parent.bottom;
width: parent.width / tabButtonsContainer.numTabs;
-
+
HiFiGlyphs {
id: homeTabIcon;
text: hifi.glyphs.home2;
@@ -506,7 +440,7 @@ Rectangle {
anchors.left: walletHomeButtonContainer.right;
anchors.bottom: parent.bottom;
width: parent.width / tabButtonsContainer.numTabs;
-
+
HiFiGlyphs {
id: exchangeMoneyTabIcon;
text: hifi.glyphs.leftRightArrows;
@@ -550,7 +484,7 @@ Rectangle {
anchors.left: exchangeMoneyButtonContainer.right;
anchors.bottom: parent.bottom;
width: parent.width / tabButtonsContainer.numTabs;
-
+
HiFiGlyphs {
id: sendMoneyTabIcon;
text: hifi.glyphs.paperPlane;
@@ -596,70 +530,16 @@ Rectangle {
}
}
- // "SECURITY" tab button
- Rectangle {
- id: securityButtonContainer;
- visible: !walletSetup.visible;
- color: root.activeView === "security" ? hifi.colors.blueAccent : hifi.colors.black;
- anchors.top: parent.top;
- anchors.left: sendMoneyButtonContainer.right;
- anchors.bottom: parent.bottom;
- width: parent.width / tabButtonsContainer.numTabs;
-
- HiFiGlyphs {
- id: securityTabIcon;
- text: hifi.glyphs.lock;
- // Size
- size: 38;
- // Anchors
- anchors.horizontalCenter: parent.horizontalCenter;
- anchors.top: parent.top;
- anchors.topMargin: 2;
- // Style
- color: root.activeView === "security" || securityTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
- }
-
- RalewaySemiBold {
- text: "SECURITY";
- // Text size
- size: 16;
- // Anchors
- anchors.bottom: parent.bottom;
- height: parent.height/2;
- anchors.left: parent.left;
- anchors.leftMargin: 4;
- anchors.right: parent.right;
- anchors.rightMargin: 4;
- // Style
- color: root.activeView === "security" || securityTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
- wrapMode: Text.WordWrap;
- // Alignment
- horizontalAlignment: Text.AlignHCenter;
- verticalAlignment: Text.AlignTop;
- }
- MouseArea {
- id: securityTabMouseArea;
- anchors.fill: parent;
- hoverEnabled: enabled;
- onClicked: {
- root.activeView = "security";
- tabButtonsContainer.resetTabButtonColors();
- }
- onEntered: parent.color = hifi.colors.blueHighlight;
- onExited: parent.color = root.activeView === "security" ? hifi.colors.blueAccent : hifi.colors.black;
- }
- }
-
// "HELP" tab button
Rectangle {
id: helpButtonContainer;
visible: !walletSetup.visible;
color: root.activeView === "help" ? hifi.colors.blueAccent : hifi.colors.black;
anchors.top: parent.top;
- anchors.left: securityButtonContainer.right;
+ anchors.left: sendMoneyButtonContainer.right;
anchors.bottom: parent.bottom;
width: parent.width / tabButtonsContainer.numTabs;
-
+
HiFiGlyphs {
id: helpTabIcon;
text: hifi.glyphs.question;