From ddcdf363863150783b3f612135d7b4c38f43ca75 Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Thu, 19 Dec 2024 14:19:54 +0300 Subject: [PATCH] AG-38382 add christmas24 promo Squashed commit of the following: commit b89d71dfa87b2de931d7cbaf07e6ccc0cc0ee3f0 Author: Slava Leleka Date: Wed Dec 18 19:34:30 2024 +0200 do not display notification on mobile edge commit b7631623484366b8dca7c6d4ba31589d5d9cbffc Author: Slava Leleka Date: Wed Dec 18 19:31:23 2024 +0200 fix promo btn test for zh_cn and zh_tw commit bf2b99427f1b7ee06a120d05305519d84e2f3dbd Merge: 41dc91d6 1d270cdb Author: Slava Leleka Date: Tue Dec 17 17:24:23 2024 +0200 Merge branch 'feature/AG-38382' of ssh://bit.int.agrd.dev:7999/extensions/vpn-extension into feature/AG-38382 commit 41dc91d6d4a2e85289bb64439f1d5f9b0fc8f637 Author: Slava Leleka Date: Tue Dec 17 17:24:17 2024 +0200 update locales commit 1d270cdba8814dc6ecece93c7c2c10e0b99383ad Author: Slava Leleka Date: Tue Dec 17 18:23:26 2024 +0300 Applied suggestion commit 9df3b96bd0188ce0bf2e84a9ae5ffac4831b3c14 Merge: f4ab797c 364c7944 Author: Slava Leleka Date: Tue Dec 17 15:20:00 2024 +0200 Merge branch 'master' into feature/AG-38382 commit f4ab797ce01f92c6e51530388334e57af86aadd4 Author: Slava Leleka Date: Tue Dec 17 13:34:44 2024 +0200 fix end date commit 5fe36608d58434740133db1c2d6f1091295d9244 Author: Slava Leleka Date: Fri Dec 15 18:43:10 2023 +0200 add christmas24 promo --- src/_locales/id/messages.json | 3 - src/_locales/sk/messages.json | 2 +- src/assets/images/blackfriday24.svg | 54 ----- src/assets/images/christmas24.svg | 114 ++++++++++ .../images/icons/blackfriday24-off-19.png | Bin 790 -> 0 bytes .../images/icons/blackfriday24-off-38.png | Bin 1503 -> 0 bytes .../images/icons/blackfriday24-on-19.png | Bin 932 -> 0 bytes .../images/icons/blackfriday24-on-38.png | Bin 1843 -> 0 bytes .../images/icons/christmas24-off-19.png | Bin 0 -> 524 bytes .../images/icons/christmas24-off-38.png | Bin 0 -> 959 bytes src/assets/images/icons/christmas24-on-19.png | Bin 0 -> 597 bytes src/assets/images/icons/christmas24-on-38.png | Bin 0 -> 1125 bytes src/background/promoNotifications.ts | 196 +++++++++--------- .../promo-notification-modal.pcss | 8 +- 14 files changed, 220 insertions(+), 157 deletions(-) delete mode 100644 src/assets/images/blackfriday24.svg create mode 100644 src/assets/images/christmas24.svg delete mode 100644 src/assets/images/icons/blackfriday24-off-19.png delete mode 100644 src/assets/images/icons/blackfriday24-off-38.png delete mode 100644 src/assets/images/icons/blackfriday24-on-19.png delete mode 100644 src/assets/images/icons/blackfriday24-on-38.png create mode 100644 src/assets/images/icons/christmas24-off-19.png create mode 100644 src/assets/images/icons/christmas24-off-38.png create mode 100644 src/assets/images/icons/christmas24-on-19.png create mode 100644 src/assets/images/icons/christmas24-on-38.png diff --git a/src/_locales/id/messages.json b/src/_locales/id/messages.json index ded43ad53..3608556ab 100644 --- a/src/_locales/id/messages.json +++ b/src/_locales/id/messages.json @@ -380,9 +380,6 @@ "settings_exclusion_title": { "message": "Pengecualian" }, - "settings_exclusion_change_mode_modal_title": { - "message": "Dimana VPN aktif" - }, "settings_exclusion_general_title": { "message": "Di mana saja kecuali untuk situs web yang dikecualikan" }, diff --git a/src/_locales/sk/messages.json b/src/_locales/sk/messages.json index 28dd76639..b1dc12e89 100644 --- a/src/_locales/sk/messages.json +++ b/src/_locales/sk/messages.json @@ -448,7 +448,7 @@ "message": "Rýchle pripojenie" }, "settings_quick_connect_subtitle": { - "message": "Lokalita VPN vybratá po kliknutí na tlačidlo Pripojiť" + "message": "Lokalita VPN vybraná po kliknutí na tlačidlo Pripojiť" }, "settings_quick_connect_last_used": { "message": "Naposledy použitá lokalita" diff --git a/src/assets/images/blackfriday24.svg b/src/assets/images/blackfriday24.svg deleted file mode 100644 index 83012459f..000000000 --- a/src/assets/images/blackfriday24.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/images/christmas24.svg b/src/assets/images/christmas24.svg new file mode 100644 index 000000000..7b754ba32 --- /dev/null +++ b/src/assets/images/christmas24.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons/blackfriday24-off-19.png b/src/assets/images/icons/blackfriday24-off-19.png deleted file mode 100644 index a433d29f2e2c2fef5002e91877f9793c79310057..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 790 zcmV+x1L^#UP)URG8hardZsTf zF49|DTb{eSyUOZ0X%(c`>%A8W1=sfWHrv_RVJ9aii+HoyWW(W*|0YoP{{H^2%gamc z3s^3fQz`j3F;OXz0qlR4&1Tv8`FVvdGYOWmU<9Cgy{=wgU-RTfqrpa_(MGWQ`+G(z zI02l8&wwvT0}v7*B@hTKw-43W%XfHGHSgPYLo$rBWFInBVVb z2L}htVzID%KF=bN2(#I2OvHUY9|v?e9E(yw^2^JMQ67)SF1;Mc14AU@2?m``hsOYn zT!63EwA<~v4DELN0ZfE}K`a*I$<$RY7ruBr&i~u(c6NApxCC@_bHi%2+IJ}w3jI-4 zRS^NO2nK_kAy}baV1o-FO+PAnt5hnQVKSL0dM9qh?ZOg?1P3yk%^QLKHBm9lW-|<( zvM!-ot+Hq|%GrUX*X!jhF+Kp-*Nr-=$;ZdXX;EOk3Aq45Bf{Y@2eDeMe0;!GpDRgH zT0S~D`UHbjAk5m;)fJyJ#33JS(2S?2C*BNw{_X8;MxM{-ZaBnv2p~wntcg0pFSY_e z`i>$tolf0+H#3=xJDE&6pP!$30H4#-)1{g~7REz>W7hBl@Y&g!hsxpNV5w9}p`lA* z*Tkf+GqA!%qN|WkZ;lGh={GWsFFJmZ!-N1pF diff --git a/src/assets/images/icons/blackfriday24-off-38.png b/src/assets/images/icons/blackfriday24-off-38.png deleted file mode 100644 index 1efd82b0b0e590c8b037b8f89cd977acf519994c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1503 zcmV<51t9u~P)H2GLR7gPq4F3!0-mUPk@QYU=zp?9tk2qHa8(b zfR_xS1`%*)&sW>WD))5TZ8P&rExW6`tNuEd|5R1XsR75w$764AZ>d-;_M6Wi0`mx=rP`#)r`dAUvA-rhP_S69x>&5e2f@bK_| zhq0K`*x2Z_wzfJQ9UV@4dppeqxt8kd>$5#QJ%uRaMIt5^S`$+y( z&dyFVFhu-N(%0A5hV0152;UUsf2O~`f2q=#Wr>}goh4shUe?7LDF|VeuC6Xas2X71 zot>Q$f?~bj%ULg!*vZMsoW#*zGV_F3%o!aWHCFlvAV^>IBUW>zX<=Ys;2$R{F^^Pc zcX!tj7aCGO6Ifru!dNdJkI(n@^{qISh#egreUYDaNVT-IFf->@fcV3DAv&(F>OrluwnYe9iu4Y`Yp3oPeK%%$y^tFvDeQrpB7?z2fjXk%l; zbm9kY#wE3&t*y;ut++NZJUqNEO=*1=*FQ*t5J=*Ge@rbeF9(tWWZTx(mQxNI^jye@ z4GciGiv*<(4-da-yK$xG!fkP3QhZ&KeRQ_DxoQ6MOtX^#XlGC`J3AXFBRtP!GDQJi zSXeNYvY{TCnVE5$o0~riTw^gIH6|S-RXA-N92}Tm+NY+biq9bd8AXsqA+@@?S|mlF z`$+-fly<`C?(Xg@ZR*NJED$6M#DH4M4@fFeElqw>YEj~FXlTd@gT$Eef{5^(A$EFt zN)b-d7$l%%AHdvE!Mkf~YbB&AX`yB}an2$kE+q#yYO(zRYI*AQdLTq(}NNcjbnY_-WMXlG@DMZ=^Cz=MqpuFNwF%28B=2`Klp zLyA~|D9^NNsN{r+wPl=t$;$7NRbP;dax<|(!3`2nT&HBGr>9GbI*FsC_V)Hd%b)j6 zRu+%(yjMV-C?NYZcKB{$Vxss=+v(iD($F0h@YhuZg3WuP{Moq7Br9zN2B}mJ5m15} zsDM@zmsULtecsT}P)MiKc_SC%&K0UVCN4*+l7O-t2e`yPIQQyiea{AEjIE)lzS(mc zVr z#_lw%-~+@~i+B*oRP@dU-XMv@l1qbwgWpPsdE|0Z4^!GftzdE*i+CUJ-c3MtMnGX8f$4^_OQf@L z^qeeA`FRJS)%uCW<$YJg{BM1FJgbiBwufdR3Au4e6Jj&AwTJ1-kKk6l5? z#Y&NuF_DS+NT$TaW9+clGeFd_4u`!f&&q{Gf>)2L!hf04n%dRZ(3k)K002ovPDHLk FV1nm4!1MqB diff --git a/src/assets/images/icons/blackfriday24-on-19.png b/src/assets/images/icons/blackfriday24-on-19.png deleted file mode 100644 index fb57f9e9a389adb1617d20b7a2de0c0e37ba8a79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 932 zcmV;V16%xwP)Jl7>Ux4 zQjr!C*uYuyqph^abaN`RSxxWMnwibcd+3f$XAfNNz2`mWInVRH=RFh(1G!4aEcpFZ z8L5(@J*g7a_qjzTUMyri^Gi1KfZfKYsd~4~;9S3s+DNiib4;D7^Dg=jJR_s7Kzwh; z4kQvrlkdJkhhZyC-E!It>;^K4N+*}e#67!HC35q?I3fBUN{{Cvi`C(rcFn6fl{`*S zl1%(MPnjZr_QHyyA|p_GN+SBTvPzzC0L7WRqzp|{+ARWAGwXh{OhW*y0a0sbKT=>T zZ;dz6t0z~Hy|)fkU)F?>fK9NQEES{P!EuzAwNoxk5Y-TyU@td2Wx|XD03exmc~Iqz z7F4WOpvKzM=){Ev1l9pPI1YsBQ+0t(x1V?vVL+G!yZK`FeGleUrA zo!T-&q&?pdlG8PudR%=SA17QnHRA~c%!6aZns>>EmF**o$=D?g(%^qkG&M69V%^yD z9v$4DR!EgpG|rnWpBXLyxp-u#APQl3{aqs=gbjdbIOwPZqcAUnnBYO!wFocb zaIvh25M9$h-INF*O=K84g3n_&n^2IGhHh7vApJcfQEA0hh6;1J3&s!M3QLbV+%_4u zwjP{aAZqKd5Q678H)nKBBn81o2IkTfWur&!Zc{-{`Uax*2Ukd9A!iT=`(PE0(EZ0I zQVb3troG$xj$Wl{1N0Opn3q(IX_6@}Oz%)?v8ZD41mapflu zKdne{ryTyt40zCB2zgSwwF%8o63T6?rm!HjHj1VHIm&m#E-McxIU zbJ#Jf#zbxy<8c!)A&Uu{KYW^s#uM`s;$zAE6x=qTtVEMd-nek}A1A++azp?soC0iH z&cnT?J(8vLqcxQvI)a&*^|EoX0$WG-kZG0X8`z*rk;7j>8-|z<3HP4>0000(aPqJ-_Bbqr2pVJr4TH`)G>7jmf195&gh=;Am%G_H zrt908Oal{fmCh@m<*&@A@`caI=Xp&h!xdK=TpVPk|=Th%D#iA>H5u4 z_N3?-9o)ZXs&A$wR_tzeP3ZcGyxiGt5MpA~duEUcU8PKbiR{=?n?P`u=BP>Ky`;nn zE1T+xj5eORbN#AiwC|8KNHYNlu47xnY^S?tAWWLEDdcZIN$C=ck?Jtd@=0RLh82{T zmlL(CiH4AWf2Z{whjpN^qS4D_j)D|Cbhyh$PZ}2j*JNHcz4Hd0>A&R7nfqFB{Pw`F z=64c2hMan&M}A>aPLMjRCLLMJx&VxwE~y zx38j)_8vO1(ctcjgU|>AnD=hibW-IlEbDV0=d_#U*@q;@qams z#rU5CK8$Pl2O%_w8kjll`to>!QB))h1Mp&1Z7UTmZlcxi?vGa~epk(6n~YT7v7L0_ zvyJj^%qH~6CkT@m>gD@<~T84M_LdPKmXWM%Tq^2s6_;+%%T}AFj zj~3A#9vHB5F)(!bhPe=~gWYp_~hZbm4a76ffJ!VO%tP zE0j0HoA&+}AgMLzzH^GnyNVv$&yiA%9XS zI7qY3uqSHb#qgMPue?Gs%%r>~Imra2C55;+q5Mw6n7S?N?)h2%$se=l%wdOAAg=&S zaJr=A@5iKroEl97W>N_60bZ^YWDJfg_H%~E0B8*nQf zCxtNEi7vd_fBp)(E}y1ph97y6tUIs*)u;M0{0@1gfTj-sA?t<(_iEzhFO}HZhG^qG z!Fy5duD{*Kc^1U#p3KDxQq@_n041QAlv{_mY4G>sG&tFa{&!@Zml#`P^E!^2WAh@5gIt+wQJOvr)4>%|-($iUb7Ei6jFe zW6nze(LfPhyBXRuI@sQdv3Sq_kb7-Wu*CcPyg9{7Dqo6U4@@J h_Olvaqw8^I_#b$_d~@j~Ne=)3002ovPDHLkV1hi3aBu(s diff --git a/src/assets/images/icons/christmas24-off-19.png b/src/assets/images/icons/christmas24-off-19.png new file mode 100644 index 0000000000000000000000000000000000000000..a58fdf404955373744400c81b1ebb334c8f626b0 GIT binary patch literal 524 zcmV+n0`vWeP)a6-nO!S7cr9-T>YJ*|#WlxLzHuk;uqX(EZaKbIo0@ zurrxSHk&VhHrWVjury7>)9Lgqgot?h9<2Y`ENxPneJ>Iu3ax@yzVzHp@ zc1ubrFOk*tp{zC8v)Sw#b;P&70&MIH03ZxQ)0a}xbULLLWe))#F>0EOqNt_@DhGps zj~78%=z6=|u34nD{^Q3On|Le)OuOEqC`_^eb#1@j`(QfYv*xZByU*wI8VvbcE|)%a zIh1|Wym?N$-HsYp@En?Jocpg1CmAy@)!p%~CX-1cY&aa6nB(zi(otFv1Wz4SP$Wsx z=drnW1XL5>>-8>u_z#DJQ3hB=)h5fbw>vvdxjm9CDI~w`wL7L*Rch235*I0|9}{$& zmA{6*z%0;IKR&)|C^(w^EmY|fO@SzW`mNcqtq}9m+Gm8@UspfH(tZFxh_dcX+BkFo O0000(VP)g()!~(ru&qY_>Y&IX*qd9RSLbQM_m&^S^?_s4T%7G9N@fh7B~B^l`aK#N$X)9GU3ukzn2wg_P5(O@v>XAL|_47*d9=(}v) z^^%|ktEa4&Py0u|-@gH=hYOG*xZwv7YorZ$B`Kt!rx6|tayfABX028WJkR?rS;V*t z?B<(X30SLfj9l&+DHXf#T#=h1gy!DwYHm+sAobIhlu{~cmT=-jCI`fztFD;Grzg0s zE0sz`&OjMqsVBR{=t79SC6*|c%aOH8rII*~y$ayYHUs$+F~F5Gt#$0#0{pr#kZ*~> zzg@8et+i_O}r2xK%Gi7oh5pv7FV1l@K_Q`FnJ z2O%G)F2>-(bXywg_4+w3b!jmrhM<*nMBZ#RtxhS7_0E`BqN_ropgq=toI_&Tzp`1# zlAQC}WONvYG8_&g?XXctX;>^4;`_cVm&@pxy$MK+IlA_Cl7+G~mI$BZED#zK<7bDK z(s4~P4k?YP#R3xJmQ>bAF3@N+j57#^6>f&)bghQ~`YIuRw5yr zER~0V8==m!5EsUh#Iaknwxpa+TIp2G(g8QcZ!4`wt)?JA^Y{=|N!ZDKx=Ydwb<9t~IO|Ci>Iye48C@}*s>h96sVxG*nVMJ^ftVLxTj9FpP-AeW^hiMrm h2h3c2jQ7M4{{UezdgRFS=idMT002ovPDHLkV1ghKzk~n) literal 0 HcmV?d00001 diff --git a/src/assets/images/icons/christmas24-on-19.png b/src/assets/images/icons/christmas24-on-19.png new file mode 100644 index 0000000000000000000000000000000000000000..c6731c0489668c3509f579b67937e591b20135f8 GIT binary patch literal 597 zcmV-b0;>IqP);O5~L=4Jwc zscW=wW%`5md1!}ZL~xqDWAK*|%ztV$6Eywd1X#Hd@I?p@h?$VO1$Cq*OC?6PMR=Ab zC<^>Usu6{n^ki$vKqEtS$zVQpG@?wl_f2@`7TMfX3QK`@=pWpKT=id9TLJ@phAWH+8|2I!BRV@O7*-$Wn_`s}W%+JA zLtq}eH#a8>%6ZcL!%LiB`m%_Nc?1@=dtYAP;p8-=ps^p2CjrVcn^xk`BT-f(SJtTo^hFH?>d$7vW-b69g@kXjw)J zK?u}#ir}-TO#68Y6(Ng3AyU%Y`K~&RKX2ZmtFLJDjSyB^sNPqSKVr@grfrc9S7Ov&+1cB&Je=ett^gZp8^Iy^&FzSb0{wj#7!i zg-D!ah|3oa(J{8x>EgY#d)HPn1@9zPNaRUkvqaI%taUs&u1pylAe2Q^og~KDxRwk7 zYlTy+g!_XBc91F9YNd+Pek*R#d?acEZhQLV$`WEgPu~dLy#1U^!8x=zz$S~5A>g*~ zDw;xcW)cXz*;|2y(nT9({9?Gx4fkt`j9tolj|NOc4;NN)dho)d_<5r!Wn&dW{1Kgp z7In3COSb3S@WNaJav>1&o$1}gz7FIYOr@e3x0`8uS)DVVdfq=Gcu2|^IHpNKnkGD2I} z!UONdX?kXsG%y(4zOy9CgM6=<&kJQ6?+IeGJ@@Q3_G~oWY*eTZADp4<*9w$7 zb$}oMdizGbCkq+-Io@HbvS)^2Y+La#f&QhUdcYwF-~r+LVZy~KD)m&Ch(XM+oJ5dTqj z?IF%(xX)jf(-47UoavERae>eX-+Mr5Yw_m)Xy4QiEI!&`%n4b({2XJ&*~PFOYhiNb zv{B%9eOb^|DpoyI0Xbg9CDPpBHIV=*Wr$Vac?^Z_Jd@VW1vYEyQo3U(Uk7)*ZPoEX zOX(UAOdutEwqtc(6MY|bs)*$#0X?WLK_SSQBiZ_g6S-r@e96N%u~eWJ4XEy26e*HY r5ltQrGZDPp79_iQF*aMMi!|{UVfBdPO2_9600000NkvXXu0mjf^QHxz literal 0 HcmV?d00001 diff --git a/src/background/promoNotifications.ts b/src/background/promoNotifications.ts index 3e6be1fca..41133a7ac 100644 --- a/src/background/promoNotifications.ts +++ b/src/background/promoNotifications.ts @@ -69,8 +69,8 @@ const NOTIFICATION_DELAY_MS = 30 * 1000; // clear notification in 30 seconds const VIEWED_NOTIFICATIONS = 'viewed-notifications'; const LAST_NOTIFICATION_TIME = 'viewed-notification-time'; -const TDS_PROMO_ACTION = 'black_friday_24_vpn'; -const TDS_PROMO_ACTION_RU = 'black_friday_24_vpn_ru'; +const TDS_PROMO_ACTION = 'christmas_24_vpn'; +const TDS_PROMO_ACTION_RU = 'christmas_24_vpn_ru'; const COMMON_PROMO_URL_QUERY = `action=${TDS_PROMO_ACTION}&from=popup&app=vpn_extension`; const RU_PROMO_URL_QUERY = `action=${TDS_PROMO_ACTION_RU}&from=popup&app=vpn_extension`; @@ -79,199 +79,199 @@ const urlQuery = isRuLocale ? RU_PROMO_URL_QUERY : COMMON_PROMO_URL_QUERY; -const BLACK_FRIDAY_24_ID = 'blackFriday24'; +const CHRISTMAS_24_ID = 'christmas24'; -const blackFriday24Notification = { - id: BLACK_FRIDAY_24_ID, +const christmas24Notification = { + id: CHRISTMAS_24_ID, locales: { en: { - title: 'Greatest sale of the year', - btn: 'Get 85% off', + title: 'Christmas promo', + btn: 'Get 80% off', }, fr: { - title: "La grande promo de l'année", - btn: 'Obtenez -85%', + title: 'Promo Noël chez AdGuard VPN', + btn: '80% de remise', }, it: { - title: "La vendita maggiore dell'anno", - btn: 'Ottieni -85%', + title: 'Promo di Natale ad AdGuard VPN', + btn: '80% di sconto', }, de: { - title: 'Die besten Deals des Jahres', - btn: '85% Rabatt', + title: 'Weihnachtspromo', + btn: '80% Rabatt', }, ru: { - title: 'Самая большая скидка года', - btn: '−80% на AdGuard VPN', + title: 'Новогодняя акция', + btn: 'Скидка 75%', }, es: { - title: 'La mejor oferta del año', - btn: 'Obtener 85% off', + title: 'Promo navideña', + btn: '80% de descuento', }, es_419: { - title: 'La mayor venta del año', - btn: '85% de descuento', + title: 'Promo navideña', + btn: '80% de descuento', }, pt_pt: { - title: 'A melhor oferta do ano', - btn: 'Obter 85% off', + title: 'Promo de Natal', + btn: '80% de desconto', }, pt_br: { - title: 'A melhor oferta do ano', - btn: 'Obter 85% off', + title: 'Promo de Natal', + btn: '80% de desconto', }, zh_cn: { - title: '年度最大SALE', - btn: '85%OFF', + title: 'AdGuard Christmas SALE', + btn: '大优惠', }, zh_tw: { - title: '年末最大折扣', - btn: '85%OFF', + title: 'AdGuard Christmas SALE', + btn: '大折扣', }, ja: { - title: 'BLACK FRIDAY: 今年最安セール', - btn: '85%OFF割引をGET', + title: 'AdGuard Christmas SALE', + btn: '80%OFF割引をGET', }, ko: { - title: '올해의 가장 큰 세일', - btn: '85% 할인', + title: '크리스마스 프로모션', + btn: '80% 할인', }, uk: { - title: 'Найбільший розпродаж року', - btn: 'Знижка 85%', + title: 'Різдвяна акція', + btn: 'Знижка 80%', }, ar: { - title: 'أعظم بيع لهذا العام', - btn: '٪85 احصل على خصم', + title: 'تخفيضات العام الجديد', + btn: '٪خصم 80', }, be: { - title: 'Самы вялікі распродаж года', - btn: 'Зніжка 85%', + title: 'Навагоднія скідкі', + btn: '80% зніжка', }, bg: { - title: 'Най-голямата разпродажба на годината', - btn: '85% отстъпка', + title: 'Новогодишни отстъпки', + btn: '80% отстъпка', }, ca: { - title: "La venda més gran de l'any", - btn: '85% de descompte', + title: "Venda de Cap d'Any", + btn: '80% de descompte', }, cs: { - title: 'Největší výprodej roku', - btn: '85% sleva', + title: 'Novoroční výprodej', + btn: '80% sleva', }, da: { - title: 'Årets største salg', - btn: '85% rabat', + title: 'Nytårsudsalg', + btn: '80% rabat', }, el: { - title: 'Η μεγαλύτερη πώληση της χρονιάς', - btn: '85% έκπτωση', + title: 'Εκπτώσεις Πρωτοχρονιάς', + btn: '80% έκπτωση', }, fa: { - title: 'بزرگترین فروش سال', - btn: '٪85 تخفیف', + title: 'فروش سال نو', + btn: '٪80 خاموش', }, fi: { - title: 'Vuoden suurin myynti', - btn: '85% alennus', + title: 'Uudenvuoden alennus', + btn: '80% alennus', }, he: { - title: 'המכירה הגדולה של השנה', - btn: '85% הנחה', + title: 'מבצע לשנה החדשה', + btn: '80% הנחה', }, hr: { - title: 'Najveća rasprodaja godine', - btn: '85% popusta', + title: 'Otvoren', + btn: '80% popusta', }, hu: { - title: 'Az év legnagyobb leárazása', - btn: '85% kedvezmény', + title: 'Újévi akció', + btn: '80% kedvezmény', }, hy: { - title: 'Տարվա ամենամեծ վաճառքը', - btn: '85% զեղչ', + title: 'Ամանորյա զեղչեր', + btn: '80% զեղչ', }, id: { - title: 'Penjualan terbesar tahun ini', - btn: 'Diskon 85%', + title: 'Obral Tahun Baru', + btn: 'Diskon 80%', }, lt: { - title: 'Didžiausias metų išpardavimas', - btn: '85% nuolaida', + title: 'Naujųjų metų nuolaidos', + btn: '80% nuolaida', }, ms: { - title: 'Jualan terhebat pada tahun ini', - btn: 'Diskaun 85%', + title: 'Jualan Tahun Baru', + btn: 'Diskaun 80%', }, nb: { - title: 'Årets største salg', - btn: '85% rabatt', + title: 'Nyttårs salg', + btn: '80% rabatt', }, nl: { - title: 'Grootste uitverkoop van het jaar', - btn: '85% korting', + title: 'Kerstpromo', + btn: '80% korting', }, pl: { - title: 'Największa wyprzedaż roku', - btn: '85% zniżki', + title: 'Zniżki noworoczne', + btn: '80% zniżki', }, ro: { - title: 'Cea mai mare vânzare a anului', - btn: '85% reducere', + title: 'Vânzarea de Anul Nou', + btn: '80% reducere', }, sk: { - title: 'Najväčší predaj roka', - btn: '85% zľava', + title: 'Novoročný výpredaj', + btn: '80% zľava', }, sl: { - title: 'Največja prodaja leta', - btn: '85% popust', + title: 'Novoletni popusti', + btn: '80% popust', }, 'sr-Latn': { - title: 'Najveća prodaja godine', - btn: '85% popusta', + title: 'Novogodišnji popusti', + btn: '80% popusta', }, sv: { - title: 'Årets bästa rea', - btn: '85% rabatt', + title: 'Nyårsrabatter', + btn: '80% rabatt', }, tr: { - title: 'Yılın en büyük satışı', - btn: '%85 indirim', + title: 'Yılbaşı indirimleri', + btn: '%80 indirim', }, vi: { - title: 'Khuyến mại lớn nhất trong năm', - btn: 'Giảm giá 85%', + title: 'Giảm giá năm mới', + btn: 'Giảm giá 80%', }, mk: { - title: 'Најголемиот попуст на годината', - btn: '−85% на AdGuard VPN', + title: 'Новогодишна промоција', + btn: 'Попуст од 80%', }, }, // will be selected for locale, see usage of getNotificationText text: null, urlQuery, - from: '25 November 2024 12:00:00', - to: '6 December 2024 23:59:00', + from: '23 December 2024 12:00:00', + to: '3 January 2025 23:59:00', type: 'animated', // TODO: use lazyGet() if promo should not be different for different locales, // otherwise it will not work on variable re-assignment - bgImage: getUrl('assets/images/blackfriday24.svg'), + bgImage: getUrl('assets/images/christmas24.svg'), icons: { ENABLED: { - 19: getUrl('assets/images/icons/blackfriday24-on-19.png'), - 38: getUrl('assets/images/icons/blackfriday24-on-38.png'), + 19: getUrl('assets/images/icons/christmas24-on-19.png'), + 38: getUrl('assets/images/icons/christmas24-on-38.png'), }, DISABLED: { - 19: getUrl('assets/images/icons/blackfriday24-off-19.png'), - 38: getUrl('assets/images/icons/blackfriday24-off-38.png'), + 19: getUrl('assets/images/icons/christmas24-off-19.png'), + 38: getUrl('assets/images/icons/christmas24-off-38.png'), }, }, }; const notifications: { [key: string]: PromoNotificationData } = { - [BLACK_FRIDAY_24_ID]: blackFriday24Notification, + [CHRISTMAS_24_ID]: christmas24Notification, }; /** @@ -401,6 +401,12 @@ const getCurrentNotification = async (): Promise = return null; } + // do not display notification on Mobile Edge + const isAndroid = await Prefs.isAndroid(); + if (isAndroid) { + return null; + } + const currentTime = new Date().getTime(); const timeSinceLastNotification = currentTime - (await getLastNotificationTime()); diff --git a/src/popup/components/PromoNotificationModal/promo-notification-modal.pcss b/src/popup/components/PromoNotificationModal/promo-notification-modal.pcss index 5fa71c025..56f91dc12 100644 --- a/src/popup/components/PromoNotificationModal/promo-notification-modal.pcss +++ b/src/popup/components/PromoNotificationModal/promo-notification-modal.pcss @@ -48,7 +48,7 @@ top: 4px; right: 4px; cursor: pointer; - color: #D2D2D2; + color: #fff; } &__content { @@ -78,17 +78,17 @@ &__btn { display: inline-block; cursor: pointer; - color: #000; - font-weight: 400; + color: #252f90; + font-weight: 600; font-size: 16px; line-height: 24px; background-color: #fff; padding: 12px 24px; min-width: 168px; + border: none; border-radius: 8px; margin-top: 24px; letter-spacing: 0px; text-align: center; - box-shadow: 0 0 20px 3px rgba(91, 157, 171, 0.8); } }