From 899bcb5cd412d5637c165c720a9e1e0d1216533d Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Fri, 12 Apr 2024 09:47:19 -0700
Subject: [PATCH] [Release PR] Remove waitlist button state (#2620)

Task/Issue URL: https://app.asana.com/0/1199230911884351/1207061569597820/f
Tech Design URL:
CC:

Description:

This PR removes the waitlist available NetP icon to make sure it never shows to users again.

We don't need this asset at all any more so let's just remove it and no longer show the custom state. We'll come back later and properly clean up the waitlist UI code, this PR just does the bare minimum to fix the issue.
---
 .../Contents.json                             |  22 ------------------
 .../Toolbar Button 1.pdf                      | Bin 5013 -> 0 bytes
 .../Toolbar Button.pdf                        | Bin 5013 -> 0 bytes
 .../NetworkProtectionNavBarButtonModel.swift  |   8 -------
 4 files changed, 30 deletions(-)
 delete mode 100644 DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Contents.json
 delete mode 100644 DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button 1.pdf
 delete mode 100644 DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button.pdf

diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Contents.json
deleted file mode 100644
index 89e4996541..0000000000
--- a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Toolbar Button.pdf",
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "Toolbar Button 1.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button 1.pdf b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button 1.pdf
deleted file mode 100644
index 6fca4a04e30049c80a2a9521f3e9e308873702cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5013
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

diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button.pdf b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button.pdf
deleted file mode 100644
index 04826a0a10d42f4ab66fd659667c8f5c10934e8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5013
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

diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
index ee8b4d550b..de9f3ee692 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
@@ -116,14 +116,6 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
         guard [.normal, .integrationTests].contains(NSApp.runType) else { return NSImage() }
 #endif
 
-        if NetworkProtectionWaitlist().readyToAcceptTermsAndConditions {
-            return .networkProtectionAvailableButton
-        }
-
-        if NetworkProtectionKeychainTokenStore().isFeatureActivated {
-            return .image(for: icon)!
-        }
-
         return .image(for: icon)!
     }