From d2b06605e331eac215bfe17e15a4f22c9f891cdd Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Fri, 12 Apr 2024 09:10:25 -0700 Subject: [PATCH] Remove waitlist button state. --- .../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 zcma)=+m0JW5QgvPDf%W-Kw`Gf2PujKNk9k?VZ$Bb!Z=P?xAQZ8ye_*~(*{ zK4s^{bM+#8^iKCNJD)xkOS`+*LT&I5IDWgkdwcrT1i)+Abv)hgHn+po^W9%J+uik7 zUzlgF)_-k}!ym)d3uoRQ2RBY`SRCq$&vd1~)$?z<*xoLZx=k0y?cJbTT|P_S4q+@Q z)e_AD+R@jLQ#Q_zxh0#MP;oi=Z0eX?4Yir=Af!@p1uPaHVp<4;_!uI2I~%HFC`pnt z%ZX#ig;+wI9d)INrr@pPr%AW3vd6a&+F8z(BA9F0`m)w;TlM~dy&k)jJzRCs#$W!1n)e%O7t04>Q))+?3N;1!t7i~gikRL@u7lv zUlMTvk>E*SlP%Fj?2(@2C}FVXYQY;=#n5~*ZuHrQmO%pPXcZ*c5JE*Rk1cro0V@Ty z-sCZfSTi2E=)47SmArXew-GA|xrBBbVl@#~HQHhliFYXk78RgYL6U2wi0hI*$wTEw zn{1lG(Rj>$XrnDHQvwpA32R8^kVUeVT3s`ZbVtEl zK}0te;gHCe=<100Zsr}RY42JxhZg=EzzOiTZ%PEcrwxS ziP$;f6H_ASWsKRSLSw{pIF_DLNFtO%#nsh5T<|4QI*Yb8k`hOAt*tsck^x7!K)v^k zID-)fCq3%M;H)RbV5!s`z$mIhh%=m7=a8&R#Gtth2@xUVBpRsLnuG#cTBt-13O-21 zAnHbXqfq$*=2Wo(U}&VlKjwAkaXh znpj)gqU4Zp(Gv8O#6Qv2(&2?U$TLsuzZ$Vf=2REAsjK$$8la7trhTBHEP z5Ufn1Ni-8pGRz1ecM@xz=0Iq8Fw14`603>uYF`KU!&+EoHr;^TM$njweXtX9AOeNv zKL5*1rBGuuJ#n1Q3Aj+SG_AybWv#d40&Rz1Y0a2zk#Zz)p;BdX7+EGB)6mnTB~fOS zs?22>NhE;r2;vh39c9#D^~G}4ozA6HWF9Cf6|(th|vV2HQ{d7ry@1XmyA?9c&pD=bJqvraK#<^q*~D^_Na zaD-Zm2_h1}Lh;Jz?cCP&uH=?-@9fBeR{KJ4RqTQBSmcmJG?YLW<4SY7E=ibXOi$a$ zq?ZG2Ie#TE@{nEKrAkFt|5=sx#p(#x?Ydb`2$k!LJ=kP?br;eos8U5#sa!U?3gxVMi}_tGz`VWsg~Ux0|BzW}5_n@y^&&WTj0p^-{X1OMVDb+0{O^K!{7jt%b!U*9TQE zSM%`Eb?-GEPD4xKYvEijDg4SL;sT_Yst)I$6wxqj2i}^xG6nZ5km1T@ zl;fZAGcR=irJ?NynC++W{l1A?MyLAFi8Jb$V%%|5@#SJ=L3zl{jq3xK35HZxsx6}Y z6;Z=7zTf91Y}KlY$Y}1|6jNEQ%QJ07bg^nx#a69a&a{=k)_`(QWaYVXc)(V7O8N9$ zDYj%;jV_RKYON^~<*Uewud)!nZ~Ez=TD8PK@aFoT?ZH5|yt8mqtJ58T z3ttAxM%qI)s$;8;$|G0&Di=pyF}Oa+i-J~SUnsJ2LNS>VU4>#gF;%-F%3(EY6bd>?>lq#a`SfAf$w&&Z#G{X-kG14(^u&Q^9jDEjVx_hzuB40GYhzlM7ZZ%4rWk&g=U z7z%rSpHt?d}uv_~!K| nb5O3X4~LTxho=Bvy}J2l2m9%x)#m;*xf3}rhewZIeE;RYY6aTk 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 zcma)=+m0JW5QgvPDf%W7ATitLgM=bM5)cAJvf&PKVH_tc@~&ZRP~hqLYGz#18wbc- zB)z}8tNuFn;nDM_Uw-PwG7QdGbNKn!!I;lJGgr^vp1yi{+MIUtUw-;;yD@gGRzCCi zF*7f|t7oB`8UJ&p`;eKBAB(2l-7BFs_y-)n-QB%8{bB;(wahx6?suEp;p*w`&ztS; z`l~O@lb8Kp+vD*2aP`cYH^;$^lNlC+mcgew(%2<^Pil_HpH+4|B;x2<~rK;PoKP9LVaXk#z| zGL{TLfOn_~ri|I9kmDq>r5xZ{#uBn~GnwF>XI6a7h-Ut+%p3)N4ljH6R^WN@0YpatXHNmX!hhBMsXtl8T(k*CC( z#~?7VXrheZ(A=_^E+8|>X_Tee%-BMlJCGwe(QK#CV22Cz8t*Gb=oNBJIISJ8Dcr-DEW& zO^f)D#9vqiggX;$j3zC7%Ty2$VI?Whn}`VoT_t@XBQ7CRX>QpAWwNZmDUFG4 zkpd7+u+oX9r5SG$VOj{W6JKjL2SUPwUM_tXUrmI&c?-B7`o+?-sRr~moJLn%8aplr z!cjiqqLfHOOiO#DLQOFfCbv_RPYghCi)y%=P8shHtQ&J5lS~? z;~^0|bt4{5BQ+`VF(n1hR!3+o<%dl;29H~ice#s2aP>j<4sAfU!h-PA>l71aE|3YB zVx<=eN2s-!AR-PdB(JpIgE8AwNP zQ_@}7AeO!UWVjn%Oh**|!ABHV&V5*$OR%AQ)(aE0IVM%^aOzqTe?`y!Rzwcxw7%I9I*=umPQ(F7F-s2I))KbkgWukl)>G&!O;rn{o9aO3|$@kn`|D`TE4aO8@?@j)&Mnu*Imk$PmOGaZ%gFL)`^@luTQ*;#~Q>Is#uh;r!mImOmMy%^-xVtJA{zhB5x#r(z+ zeen9M!7kc8y?lOmcQ_r*k3Y>1ELT7L_1n%|J>R_9Ex>oXS2vq44sXqm>+Y-cg4(c- z&XTTo$HO1@+uhN~W6$*>?#bcqw7Wy2ysn(V=bL*l!xlS1-5ZQR>pRgmH?N>-#DZ&c z*7M}>2W#C0|075ziJiZbBnBQ;Aumgd;ZHWF&HnJ_;nKJFyVrv?WtbCB{xzIqxE%p6 zpFAqaXGrY%liS@iQYdmmxPU4q%D2wqruHtx;ZC8`{pM!ByC3A??CYnv@%!%xm!=p#fzW?$c3r^bN 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)! }