From 25f22326a845040870a2d3c0ef6d616134b43748 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 22 Jun 2018 15:43:16 -0700
Subject: [PATCH] Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity

---
 .../qml/hifi/commerce/wallet/Help.qml         |   6 +-
 .../qml/hifi/commerce/wallet/WalletHome.qml   | 116 +++++++++---------
 2 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index d76fe0d8a2..b453509712 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -253,7 +253,11 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                         } else if (link === "#blockchain") {
                             Qt.openUrlExternally("https://docs.highfidelity.com/high-fidelity-commerce");
                         } 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") {
                             Qt.openUrlExternally("mailto:support@highfidelity.com");
                         }
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index 2a6ddfddfb..dcd1ab993b 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -252,64 +252,6 @@ Item {
             anchors.bottom: parent.bottom;
             anchors.left: parent.left;
             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 {
                 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" });
+                    }
+                }
+            }
         }
     }