From f47f259816987cb26c4960de6f7c9805686cd290 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 17 Nov 2017 15:12:49 -0800
Subject: [PATCH 1/2] Turn Commerce on by default
---
interface/src/ui/overlays/ContextOverlayInterface.cpp | 4 ++--
libraries/ui/src/ui/types/RequestFilters.cpp | 2 +-
scripts/system/commerce/wallet.js | 2 +-
scripts/system/marketplaces/marketplaces.js | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index d40c0972e9..0a5b43cc7e 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -203,7 +203,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& entityItemID) {
EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags);
- Setting::Handle<bool> _settingSwitch{ "commerce", false };
+ Setting::Handle<bool> _settingSwitch{ "commerce", true };
if (_settingSwitch.get()) {
return (entityProperties.getCertificateID().length() != 0);
} else {
@@ -233,7 +233,7 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
if (overlayID == _contextOverlayID && event.getButton() == PointerEvent::PrimaryButton) {
qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID;
- Setting::Handle<bool> _settingSwitch{ "commerce", false };
+ Setting::Handle<bool> _settingSwitch{ "commerce", true };
if (_settingSwitch.get()) {
openInspectionCertificate();
} else {
diff --git a/libraries/ui/src/ui/types/RequestFilters.cpp b/libraries/ui/src/ui/types/RequestFilters.cpp
index b1deec47c8..0a0e67756d 100644
--- a/libraries/ui/src/ui/types/RequestFilters.cpp
+++ b/libraries/ui/src/ui/types/RequestFilters.cpp
@@ -62,7 +62,7 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info)
// During the period in which we have HFC commerce in the system, but not applied everywhere:
const QString tokenStringCommerce{ "Chrome/48.0 (HighFidelityInterface WithHFC)" };
- Setting::Handle<bool> _settingSwitch{ "commerce", false };
+ Setting::Handle<bool> _settingSwitch{ "commerce", true };
bool isMoney = _settingSwitch.get();
const QString tokenString = !isAuthable ? tokenStringMobile : (isMoney ? tokenStringCommerce : tokenStringMetaverse);
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 8e4a3215fd..a4cdc5b097 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -145,7 +145,7 @@
var button;
var buttonName = "WALLET";
var tablet = null;
- var walletEnabled = Settings.getValue("commerce", false);
+ var walletEnabled = Settings.getValue("commerce", true);
function startup() {
if (walletEnabled) {
tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 80990402d7..646e5452df 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -160,7 +160,7 @@
type: "marketplaces",
action: "commerceSetting",
data: {
- commerceMode: Settings.getValue("commerce", false),
+ commerceMode: Settings.getValue("commerce", true),
userIsLoggedIn: Account.loggedIn,
walletNeedsSetup: Wallet.walletStatus === 1,
metaverseServerURL: Account.metaverseServerURL
From ec16f167578dcbc73d79c3afb3e280796f6c1c43 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 17 Nov 2017 15:21:18 -0800
Subject: [PATCH 2/2] Remove debug buttons from wallet
---
.../qml/hifi/commerce/wallet/Help.qml | 31 -------------------
1 file changed, 31 deletions(-)
diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index 0026bf6cdb..0c6b84752c 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -55,37 +55,6 @@ Item {
// Style
color: hifi.colors.blueHighlight;
}
- HifiControlsUit.Button {
- id: clearCachedPassphraseButton;
- visible: root.showDebugButtons;
- color: hifi.buttons.black;
- colorScheme: hifi.colorSchemes.dark;
- anchors.top: parent.top;
- anchors.left: helpTitleText.right;
- anchors.leftMargin: 20;
- height: 40;
- width: 150;
- text: "DBG: Clear Pass";
- onClicked: {
- commerce.setPassphrase("");
- sendSignalToWallet({method: 'passphraseReset'});
- }
- }
- HifiControlsUit.Button {
- id: resetButton;
- visible: root.showDebugButtons;
- color: hifi.buttons.red;
- colorScheme: hifi.colorSchemes.dark;
- anchors.top: clearCachedPassphraseButton.top;
- anchors.left: clearCachedPassphraseButton.right;
- height: 40;
- width: 150;
- text: "DBG: RST Wallet";
- onClicked: {
- commerce.reset();
- sendSignalToWallet({method: 'walletReset'});
- }
- }
ListModel {
id: helpModel;