No Bug: Remove redundant compile time flags (#3085)

brave · Nov 26, 2020 · cf23543 · cf23543
1 parent 4f6bec5
commit cf23543
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 26 deletions.
diff --git a/Client/Configuration/Base.xcconfig b/Client/Configuration/Base.xcconfig
@@ -10,7 +10,7 @@
 #include "Local/BuildId.xcconfig"
 #include "Local/Version.xcconfig"
 
-OTHER_SWIFT_FLAGS_BASE=-DMOZ_TARGET_$(TARGET_NAME:upper) -DNO_USER_WALLETS -DNO_SKUS
+OTHER_SWIFT_FLAGS_BASE=-DMOZ_TARGET_$(TARGET_NAME:upper)
 
 FRAMEWORK_BASE_BUNDLE_ID = com.brave
 BASE_BUNDLE_ID = $(FRAMEWORK_BASE_BUNDLE_ID).ios

diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift
@@ -2491,10 +2491,6 @@ extension BrowserViewController: TabDelegate {
 
         tab.addContentScript(RewardsReporting(rewards: rewards, tab: tab), name: RewardsReporting.name())
         tab.addContentScript(AdsMediaReporting(rewards: rewards, tab: tab), name: AdsMediaReporting.name())
-
-        #if !NO_SKUS
-        tab.addContentScript(PaymentRequestExtension(rewards: rewards, tab: tab, paymentRequested: self.paymentRequested), name: PaymentRequestExtension.name())
-        #endif
     }
 
     func tab(_ tab: Tab, willDeleteWebView webView: WKWebView) {

diff --git a/...t/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift b/...t/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift
@@ -142,21 +142,6 @@ extension BrowserViewController: WKNavigationDelegate {
             decisionHandler(.cancel)
             return
         }
-
-        #if !NO_USER_WALLETS
-        if isUpholdOAuthAuthorization(url) {
-            decisionHandler(.cancel)
-            guard let tab = tabManager[webView], let queryItems = URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems else {
-                return
-            }
-            var items: [String: String] = [:]
-            for query in queryItems {
-                items[query.name] = query.value
-            }
-            authorizeUpholdWallet(from: tab, queryItems: items)
-            return
-        }
-        #endif
 
         // First special case are some schemes that are about Calling. We prompt the user to confirm this action. This
         // gives us the exact same behaviour as Safari.

diff --git a/Client/Frontend/Browser/UserScriptManager.swift b/Client/Frontend/Browser/UserScriptManager.swift
@@ -275,12 +275,6 @@ class UserScriptManager {
             if let domainUserScript = domainUserScript, let script = domainUserScript.script {
                 $0.addUserScript(script)
             }
-
-            #if !NO_SKUS
-            if isPaymentRequestEnabled, let script = PaymentRequestUserScript {
-                $0.addUserScript(script)
-            }
-            #endif
         }
     }
 }