From 8b6263a35ec082d2f11673f6e006b5b502e5f553 Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Mon, 20 May 2024 12:06:34 +0300 Subject: [PATCH] add birthday24 promo. AG-32756 Squashed commit of the following: commit 2ed13837a5107b18e8b49312766f157579735893 Author: Slava Leleka Date: Mon May 20 06:20:38 2024 +0300 update ko locale commit 87034cf5a6080250beb167c98ba9b0b2377fc7d5 Author: Slava Leleka Date: Fri May 17 20:14:00 2024 +0300 fix fa locale commit 7c28bd6cbb61dad5be55e765e025fd73ff5c19d5 Author: Slava Leleka Date: Fri May 17 13:26:31 2024 +0300 cleanup commit dfbb7795771eb426ab0e72e028e763e839bc22d2 Merge: 80ed123a 3cdea516 Author: Slava Leleka Date: Thu May 16 19:46:03 2024 +0300 Merge branch 'master' into feature/AG-32756 commit 80ed123a26ec0b18dbdbfc0b7c792612054ba18e Author: Slava Leleka Date: Thu May 16 19:17:34 2024 +0300 add birthday24 promo commit ad3eab18712f61bcdcc654afe5fdf92c9a6884ee Author: Slava Leleka Date: Thu May 16 17:24:16 2024 +0300 update assets --- src/assets/images/birthday24.svg | 82 +++++ src/assets/images/easter24.svg | 256 -------------- src/assets/images/icons/birthday24-off-19.png | Bin 0 -> 614 bytes src/assets/images/icons/birthday24-off-38.png | Bin 0 -> 1113 bytes src/assets/images/icons/birthday24-on-19.png | Bin 0 -> 734 bytes src/assets/images/icons/birthday24-on-38.png | Bin 0 -> 1332 bytes src/assets/images/icons/easter24-off-19.png | Bin 516 -> 0 bytes src/assets/images/icons/easter24-off-38.png | Bin 1006 -> 0 bytes src/assets/images/icons/easter24-on-19.png | Bin 551 -> 0 bytes src/assets/images/icons/easter24-on-38.png | Bin 1046 -> 0 bytes src/assets/images/icons/spring24-off-19.png | Bin 607 -> 0 bytes src/assets/images/icons/spring24-off-38.png | Bin 1148 -> 0 bytes src/assets/images/icons/spring24-on-19.png | Bin 644 -> 0 bytes src/assets/images/icons/spring24-on-38.png | Bin 1258 -> 0 bytes src/assets/images/spring24.svg | 312 ----------------- src/background/promoNotifications.ts | 322 +++++++----------- .../PromoNotificationModal.tsx | 2 +- .../promo-notification-modal.pcss | 11 +- 18 files changed, 220 insertions(+), 765 deletions(-) create mode 100644 src/assets/images/birthday24.svg delete mode 100644 src/assets/images/easter24.svg create mode 100644 src/assets/images/icons/birthday24-off-19.png create mode 100644 src/assets/images/icons/birthday24-off-38.png create mode 100644 src/assets/images/icons/birthday24-on-19.png create mode 100644 src/assets/images/icons/birthday24-on-38.png delete mode 100644 src/assets/images/icons/easter24-off-19.png delete mode 100644 src/assets/images/icons/easter24-off-38.png delete mode 100644 src/assets/images/icons/easter24-on-19.png delete mode 100644 src/assets/images/icons/easter24-on-38.png delete mode 100644 src/assets/images/icons/spring24-off-19.png delete mode 100644 src/assets/images/icons/spring24-off-38.png delete mode 100644 src/assets/images/icons/spring24-on-19.png delete mode 100644 src/assets/images/icons/spring24-on-38.png delete mode 100644 src/assets/images/spring24.svg diff --git a/src/assets/images/birthday24.svg b/src/assets/images/birthday24.svg new file mode 100644 index 00000000..c2db43f9 --- /dev/null +++ b/src/assets/images/birthday24.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/easter24.svg b/src/assets/images/easter24.svg deleted file mode 100644 index d8199c78..00000000 --- a/src/assets/images/easter24.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/images/icons/birthday24-off-19.png b/src/assets/images/icons/birthday24-off-19.png new file mode 100644 index 0000000000000000000000000000000000000000..056e1a2d740020997e0b77cb71696352c9c36db1 GIT binary patch literal 614 zcmV-s0-61ZP)NXf!4m+mh3xlxnog(Qqk9u|B&%Mp zr-tJ=Ck(s-pv7XLvwZe%;_wM|U!lQ!P$-+Z2#o!zlPpTOSUUhd=LhlBF|{(fRvR(XDYzDfyU#2r{Fl`=0cFRNT#;bK!VI9xWklouBloj4O>5n~Ol zvnJN0R$73=WsAveL=7||2-!@i1anckaJWqAv}cBO?C$O^GpWiKkOJ_+6_zmv5t-o>hJHT-rin%eSM``twv8zPZR}=$K1}&PPZ-* zwgybv)z$SapU>AU(Uwz@!lI+2qi#Xni_6PPw*-N)wrx{iUtiN4FF@+>@Q~i#-WqK% zDW5KDTrEmdu9MVv#xe^q~!V-r@%6P%$=Pb1W;Qg z*sFdOG8z9q2@;J$h&$N0Bv@?MoT@kKjRE*h(m62Q&7t}acT*Voss zX<7jU9~>OGnvb(tB%myd?@S1)O`Q)95ALGy1DFhEiZWGDI0!|#LkPY@W420TQV`1B z-JR0eRpW!0ot>0pTiG&Qa5@9&d}$mHatFT9M5j3@&%08TJvjZy-9P!%+xx%2aLUt92)3cxX$ zUE&NTjMVh>G)+uQCPsH8}~MpP${}sS(&%_vq+Ix4xTmy7w`@18w&7 z^sIWrhK$ZQFXd%V6%-M>;A7IyKn!!`Ndb+?gB#|%xw%osHUWoA8I{H%DXz8a^nbCz zu2n?EcY1T`R^iR?6$x$}I85rB{Np>4m{eYTt!XQS%qef1j~Mbg_OoBqW^gPm1ixc6 z9pXG-iysAQ9|}uLOMilm%G(9VvF5(itYYngP(*XTZgNz<*#fC5UR?JXD(;87BGuC> zn_7UlV*QpOK|7XWLTE2X^;l<90x%(Ls_pLX?oDLbvF6YxfLs)r3^FXLle7aLhf%8H f=28{saU%Q!|K{A*?zU@?00000NkvXXu0mjffED)0 literal 0 HcmV?d00001 diff --git a/src/assets/images/icons/birthday24-on-19.png b/src/assets/images/icons/birthday24-on-19.png new file mode 100644 index 0000000000000000000000000000000000000000..c62a2e7386881e8a80d45090599d4395219ff803 GIT binary patch literal 734 zcmV<40wMj0P);z z6G0Tm-^^~;B%4FiL&bm?^&+&?6pAM$&7octNiP)-g~pS&1{5tG+VmFjV0zM95D#iE z4Mjb)hZ1_T7Gr6lm)d|L)Pf0`O~mYn@6EcKPq57&mYsR~<~RR&Gdm1AD7h5tEtmN; z02>9c!Winsr-c1HXI7p|%0lYat3vBI)&}{-=P;Up|A;e4`&4s2Ii4-G!De2@LWaTD zEDJ(#L@@>hNm8PYOXfJzH2(28phlpon#1IfQ-GG%4TwbJDjJrCz_dJF=ljmbD;KWA zsX&Nkgq5vDD3-sA_`vB)5X5*u?RP<&pVwgTU`Mq5elsA~be3=mcVpx>!mhc=o*osR z=N`fNlLIgndC=zScTIC)<)1tuGsZ8HS5h!=rYYI0sBM6it=Bf_PX#v6nJdmB96@2H z|7>**pIP`;+;0L@Yn5h42-^Po9^YC+)C$XBA4peZyV{flqHa|LcoiR99l9xEV?z`0 zQodv;(PZ4dhPd+~ z70(uGhB<7Zd-OkUQ+1YfOelYCp{h9gZ zoO8c>&SkI)WF}uo0XLJ3vE9IUl5>b-bG+KEV|x)e6glU=FjXxa+4s#XGzk`TU~al6 zUM?&98G|7t(g95X=M=$&5p`XpF#5`gVxT!e24yDuviS1`+_B24Km_rl#>WPxMjDRw z>wNdCo({uMr_m)z2oXe3RU>=+tfzQ&y!~bWV5Op52%8jvLZMQ*b>ZM-e~;G~=0%Ee zJ`QUD&e+h0ub!H4w!4VYSD3)3VGSW8XCp>2Mec*U4DwY#*R;rE)|j)!m|-Y0_kk24 zZWzlpFV%@_ND3>pCoyicl*5 z3ysj)lEAqSKosZG+!}nIp~qroXRbG|YxK`pR#Kd~NfDu)Tc3wrTb~p6R{VJJB>Z&o zYZng%0t!KyJnQbpgUqJ1f zH+0$Bx;O2Bz1!1h-A-RpwdX&CUT}h`FeoS;IR0W%=0bWgP4+{(DpO$RbvV>>v{5|9 z6$lXvi&unr63BXVIdn>ZT>K>JogYYGbqLXF@0}a~8Ihsg@7UyJCyKUApsUao%qDdR z38Z7~ZJn-miqr4Te_?AQS9&cB2CS%HGSqYhBLgjr;iun+pSm z(Ljrtu0C2pWC1^r+xFr`@iPAFVG;OI%q9dmoO=^req(t_>asb@$2h^5Sy09XzAcEl z&w;K@k3&!pkK0ljhZ@lVT?tq$(~FU|6VM@9PSJ?*N`R7%@7~fJ$LOK_RRaniD(`HUW*0<`1H0F5)rr(c_%2ze|1s1ttT$DxH(9uaFmBSbYGqxo(|z_a0YFlM z?i~z)AbH?ZJh;m>8W{MfvueE*-e#L6SUpLch@p_@()mE)5tx`22aaJasv0R#VToc! q)D4!yVYCdUQ!AN^GE4h0G>O|ma`NP~{s6uJ0000u4tfuh6*Wgf+XC4l9CgI8-&~dPC-da1>y#dL`4Gy2iOLQkAyRCVJv&I zHYs@0YV7$u&CcwMM-I$pGyixze)8wL=Xvcg41JcGWxz6EIqCQNJ3G#^NlvHJ7dsE> z0hn}LC=|YXy`KISuU4tS3*3pQ)$JPAm8^BG7a4Q zq2jK*x{QazA(5fT47`D??XsNDXCqM~)J`%Ly$$fZ;6YLbKoak2T87|3X4*F3SxCWM zHb+O1nMMNwS3nk;&8ABo;GL~(?W1D5?APn{M{!HXwqd{DQx;ry%&Hm;2G|CZxM8!| zL{Gy8^xN$=p_45l<20h%&>Eoqi^akOX{{rY^?FV7`J677OPp(0DwReiJJCFCYXDGi z{W|uQ(*VC>vDk?(Nzdgd!>^RWs70HWzp-UkOfrryMZqtFBFIrj>#@iH0000kO&nmX+Y4BJOR7`@CNV%mlS}ga!&xcl7>*z;FF*L z3eq4&iIm*@jvYCUy*nG{_@tE+dp7=ec6Vkc7LCC5^>x16?XKFky@{)3Sq@(vJmb#| zzIbSzPUlZ9m#gjW?mm(smejCXtvbzS^N2qdxw&M9$L)+;ZGV5?lXMUXV-KCMCyqm} zWWeKAW^rdaLrWvbWkFR;7mXK>+m_0EcG`ohtE)p6RsRp700vy=ckHAYSPD^P`UZFd z75Db`Dns{aSk#VA)bjE&ZES4N#Kc6Z&Ft(fZEtVW^z^jqr-*lM`R3;4kW|93rg#Lu zNW;?75-lz+`U2B{aEM!3Ss@*~T+Z?CRAJ1WZs*O-&Go$ifk|G2=+I_iVSxm~9Bi^g zVF(E%h)?iB$mHbY!1s`-7})5hGZ44R8cqj<1#T>ofVhW}JOYoY`lP{LJ3=7u3uE#m zjOOvt&(F^fe0LmYNC>3Q z1etn_`I%#nx$HV|kFT$`6Psa);C?pM&)QN^WyJ5?8n_oX;?rZ1FWTA?Aa5e@BF2T`1Ri>Od!yIaSIL_4VNr#HgM;5nVW#57 zK#8ZY9KV@(x_}`@VUplY34S|Kl>c1SIjA@9C}Xig!=fHBaMj;X(m(D_saICHl!0K8 zU$CH4tt|-&yqBk54eF8sEXZR)m8q$z^FpB@S|0K$Bm!ztR5C$@<)X#@97cP@$pzCE cK~#7Fl~g-O z13?gdyGbn6B7VRs5)c#{6I(4*5KF<*PCGlVvG!A2B%Ph1>39SgM4W zSmbl-%$;kJz4f9Gmd(A%Jl@Rgu7Cy3wMy0-I26D-6tYAmY1JT57PR6qhpO zLi?C58OWiuMN8p^N-I4DUc@}*S}6(4=1#_I>zHazYCJ8 z?>&*53UGECIvy^$Itettv3IG`vDp7#jcykk?2136W|^SCvRU%4pwjsNS}33_@Lftc p^Z;g5-%HEmryEn`q4~Ww@C62vm-_JHoBIF&002ovPDHLkV1oN=>2Cl4 diff --git a/src/assets/images/icons/easter24-on-38.png b/src/assets/images/icons/easter24-on-38.png deleted file mode 100644 index 591e4b455021e2bef159fd00d39b9396af271466..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1046 zcmV+x1nK*UP)FC3i#TEb?w z<&uzC#FfEaa27W{1T_^rb?@Cu7{&b^6f5ugRq{e#P2ga#*I2Y?6OTcM zXpt6KpfFAe(8y2h1rHYG|Lqs%w^4?Zp+z>gC70`ju^TB*B{haOd1yGmBaL3V5Hc6* zvT2ft1{sGaq~IO?qM1J$1zNaS|rM-#ya>3 zBiLKU9&?2mGCW{p?&dJ9{jvdzRzN}5nD@rR{rr;2fn3kJa@WEyynxZQgr2#smH67+qoHv8=Yo3^wA95oHp#J}I*F-BB60 zvEVoPP6J3z-A{8HO+W6VcaScz(GRoeLUjk5j`+J?vSe<*M&6vk6w znUpBduC%HemEK3&Jb9zG;mDB|$NlcVK&@L2iUyaH?7dsihUeAJdtm>w($v|Q64$&R zUH&WO5+))Ra$)=D+m95IuhsTUmDkvA=Y!V%S}2z>>Oav`SIj(@{5D6~TQb~;@Q15b zuO{PamFE&K7L7UOshHT96tC+~1z;ksQ)rT>)}}-z;CwTiY)DUGvcb1Op_M2mv_wp% zrA==HxjVOUj?k8qr`KB(-U>7p=D{6ut*x@r83jrStLxKZS!JkQRI~T22okj()P@-j z=O|9(oHKO>7*zXb%%^3%Od=zom&1aZ8R-f=dpTU4Klw7SXHnQ{`>_#!0h;V8>vyO+ QF8}}l07*qoM6N<$f^m@DX#fBK diff --git a/src/assets/images/icons/spring24-off-19.png b/src/assets/images/icons/spring24-off-19.png deleted file mode 100644 index 190300d915568e23664de6d307cae597379fb64a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 607 zcmV-l0-*hgP)Oc@3TOdF*rho4-FJZKc5>QD!4?rL6RFdmw=Ljo+yHbh7gH{3JPdwaDxOw zg3Q}6)_Sp&6nT=pyW^SXnc11KCM#XZY&miZZsO+4Oy?(%k%QePo92`6+i#QOG^vu-6Tq-QdFr_$Z;In z@AotsjmY!78^U-zeg_Y2oDdp?cvP#^6cLb2CaGSphd4+1t36rQ@Rni#PcoT|@&soS zBH!(HG#-!D8DQ^Hww`SK8AL)H29Zk&1e~T$gm2}Ksi3W0C(<17Bz zs3SRTx7&d7bULNwa!KiQT9M+>v0ktJJ$MkNqZ{kkY&KLXm8e)Osujeh*8=dsGykru z)oMT)VZmUrSg19Z%LTrd%Vpg&FM<}~{XGOy1_F44JR*D$w#-X3p`n4oX`lfuOGAY=&?6BF5Hzq~0Q&`mKVZKAD1ZuOzW}l&4T%H|GLkJ=jZ2zudlB;*L8p3={Qb~pE>mLdz~Kv z+UMuzU(fR@>+9<^N(skyV7Xk*y}iBd^6L&apVA@VcEGK&xw#qGOt2!x653};?1@ym zK)~&o$sHsObP@>pOsEWXQEw4&TZ)sOYw9>VJKJVb)jp5{@Pn(o$Es<76GQ5lQea?U zAbfs&e59F1>_9sk8yhE-L=3+I>LW`s)6>&o6JoEguk`%n#2$i$TB_+ z4h~X2pHCb&K0e-5u?4v~=1`LVorsjrk1HK95J1Bwz{|@E)$4UDV!-3$V>nl&i}?=^ z58-zeQ0dUnP`+3!*1hOkK}QPeLTkm?*jU(Xq5c5Og^EEG4$=y!luwsEel3YA_jL=Z zq7rwE|F+KUj-Zy5IQktBGm*Miyu+9=~R4c>`YzXR33JA;PoXJ-^-rwIlHq$ML04n1^LWscQ(3f;P#q9Bo z1?Kv?o@%ukyYSP~Q!}c=%T`ua!ZtrYAAUpM{rx?~0n*k1iKlCd^oTccM~cLu$;rt! z@0yyLYQ{XoI~_#YrnSMznDziLP8hTf@*QeV(;#cq z07*j4fa!FAEiNuDHYKY9oIDmAh;^uQc6OHH0F{9R)NyljL$|lLp`=7T*c@t(13VWh z)gXYxIw}~OIEFDudqgU*8zBWrpf5>XrbC{E_0L0z#pG5g10=P$TXazaKEfxc~*Sgo}=1K=Sr}0c-1WGHMjY z6y{@`109ZxjO?nxRwl!SM6EDzG}}ZGQb7(Ts>Tn-nug;j;8wv)vlxle+I_MBJaTPq z&1NWFTwJ6n=?>VmN_c5TetckwSzUhE9P$7plY&$rq}qr9?4d=|NuUA;a9nAIK3f}& z_FQWFrVe72?(pM?EC9O^`x6_2gkV=_w$frv6}Psw{=^bXOHPpWih%KxRd}p^G~V{$ zs(^E~qaIv6X%SW5zjUNxi2-r-W|yRDP+#0NlxviKG%ZhX)`ea?Nf`%zYKL4zfQBL8{Tf8vUm5cvQN&(63br zt*Bndrc0FU0fs-R@$?cXtOM2aPD1}BGOSRt#aly!qQ6;1#CZJz_&Fjim!e^|oauBr)C}y5T-Mn773Vt2=7!P1^I{KU!vuYgQ)0EL+J}b}*~qI_{n* z;=vF0yjipGnu!*Qfly>zGc!P|a|^FgJ!}6{54U8qg`9TGmWc4UGtdOzgzFm>S17jq zeiOOyI{lsxa@2?sH*xA4@cfxgG`bYAfvV$fvRLT6KXlQF3uZff^0-;I?j~>8uV7#>4e!4M5 eZW@u)+`L<@X~786B~TFn0000vMD diff --git a/src/assets/images/icons/spring24-on-38.png b/src/assets/images/icons/spring24-on-38.png deleted file mode 100644 index ee463b32a247df165982391f2dc94e3a18ebc380..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1258 zcmV>=wxA)}XM1w+eTvS4%wdBD!2@_*gaJKa6i-8HkjA2i)lRbBnf|M>o@QWyfK zmvp(KF{TubYTkhof{SQC!IQfueXE56YK!lwItGNY9e8$Gm+s!fC(xLdms|`6PXi14 zMo|0aUFF%lU`1?pNzW;bv*=l6Sa@2Y`t77z$QzhR?86_m+iGE%?!xZE8yUf|EbBRG z9jCt6Q_Uu>?*S>o<=m&1^vSdVDvcC6sA2#-J`&s?G%*+)Oka3kT|^!+|6gbOWVXK39!^By6wpR{BbWo-*a&;B*{)+)brs_ z-<4e#UNsRTf${ypM~IF8<@(Q#7_s&@aNvc&_2K&~H-dHp8ttd>Vs%0_iu|?JMA@X~ zbk~X3;%%c(2bV39e}M1K9tm8{1WBM&yz2}3yzfdOHD{VINoqI2xlLA=$}q*dbLIz4 z0dMv*%Q|{0*eu|BBYvhZ3H*ksgO;EWrcDrvEMqL{GRD{S zjo^7ar8+PvJ}UPtYk(-f@`?4iGf!OUGLqox;nMG-;(rFqpl~(8L>L>*o`aQzE=@u< zIUZxIZwF(eV;sX}PpIB>Pe_WEU|*iQ(u%w!YEf!RkVz zZ!@sIxwqsvw`onrjWO^3daTvKmjy?5*$J^_rmfuyV(38Et#?Ee@7%XvC{ju&Ezfpc z&0>G;R%*%fI^sq?Y;Q)mtd)X32MaKhzJ424`1q&%ni)bow{U(+&GUI%`TYiibeLdM z*$3H6Q2syRmqo*`9gw&@d zQklev>56vcM9{e3+zF)Q)a7_#hHp8YYWK&KlL`SD!ZL}w;m6KM->O9 Uhb~O$TmS$707*qoM6N<$g6U0JA^-pY diff --git a/src/assets/images/spring24.svg b/src/assets/images/spring24.svg deleted file mode 100644 index da3e2ca7..00000000 --- a/src/assets/images/spring24.svg +++ /dev/null @@ -1,312 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/background/promoNotifications.ts b/src/background/promoNotifications.ts index ede10dda..e342d942 100644 --- a/src/background/promoNotifications.ts +++ b/src/background/promoNotifications.ts @@ -5,7 +5,7 @@ import browser from 'webextension-polyfill'; import { getForwarderUrl } from '../common/helpers'; import { Prefs } from '../common/prefs'; -import { isRuLocale, normalizeLanguage } from '../common/utils/promo'; +import { normalizeLanguage } from '../common/utils/promo'; import { notifier } from '../common/notifier'; import { getUrl } from './browserApi/runtime'; @@ -73,259 +73,199 @@ 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 = 'easter_24_vpn'; -const TDS_PROMO_ACTION_RU = 'easter_24_vpn_ru'; +const TDS_PROMO_ACTION = 'birthday_24_vpn'; 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`; -// possible return values of getUILanguage(): 'ru' or 'ru-RU' which is 'ru_ru' after normalization -const promoUrlQuery = isRuLocale - ? RU_PROMO_URL_QUERY - : COMMON_PROMO_URL_QUERY; +const BIRTHDAY_24_ID = 'birthday24'; -/** - * List of locales for the Spring promo, not the Easter one. AG-31141. - */ -const SPRING_PROMO_LOCALES = [ - 'ru', - 'uk', - 'ar', - 'be', - 'bg', - 'el', - 'sr', - 'hy', - 'fa', - 'he', - 'ms', - 'id', - 'tr', - 'vi', - 'zh_cn', - 'zh_tw', -]; - -const EASTER_24_ID = 'easter24'; - -let easter24Notification: PromoNotificationData = { - id: EASTER_24_ID, +const birthday24Notification: PromoNotificationData = { + id: BIRTHDAY_24_ID, locales: { en: { - title: 'Easter promo', - btn: 'Get 80% off', - }, - // there is no promo for Japanese - // ja: {}, - ko: { - title: '부활절 세일', - btn: '80% 할인', + title: 'Would you fit in AdGuard?', + btn: 'Find out', }, fr: { - title: 'Promo de Pâques', - btn: '80% de remise ici', + title: 'Qui seriez-vous chez AdGuard ?', + btn: 'Découvrez-le', }, it: { - title: 'Offerta di Pascua', - btn: '80% di sconto qui', + title: 'Chi sarai ad AdGuard ?', + btn: 'Scoprirlo', }, de: { - title: 'Oster-Sale', - btn: '80% Rabatt', + title: 'Wer wären Sie bei AdGuard?', + btn: 'Herausfinden', + }, + ru: { + title: 'Кем бы вы были в AdGuard?', + btn: 'Узнать', }, es: { - title: 'Promo de Pascua', - btn: 'Obtén un 80% OFF', + title: '¿Quién eres en AdGuard?', + btn: 'Descubrirlo', }, - pt_br: { - title: 'Promo de Páscoa', - btn: 'Obtenha 80% OFF', + es_419: { + title: '¿Quién eres en AdGuard?', + btn: 'Descubrirlo', }, pt_pt: { - title: 'Promo de Páscoa', - btn: 'Obtenha 80% OFF', + title: 'Quem seria no AdGuard?', + btn: 'Descobrir', }, - ca: { - title: 'Promoció de Pasqua', - btn: '80% de descompte', - }, - cs: { - title: 'Velikonoční promo akce', - btn: '80% sleva', + pt_br: { + title: 'Quem é você no AdGuard?', + btn: 'Descobrir', }, - da: { - title: 'Påske kampagne', - btn: '80% rabat', + zh_cn: { + title: '如果你在 AdGuard 工作', + btn: '你的岗位会是...', }, - es_419: { - title: 'Promoción de pascua', - btn: '80% de descuento', + zh_tw: { + title: '如果您在 AdGuard 工作', + btn: '您的崗位會是...', }, - fi: { - title: 'Pääsiäispromo', - btn: '80 % alennus', + ja: { + title: 'あなたが AdGuard メンバーだったら？', + btn: 'おもしろアンケート', }, - hr: { - title: 'Uskršnja promocija', - btn: '80% popusta', + ko: { + title: '여러분이 AdGuard 직원이라면?', + btn: '테스트 시작', }, - hu: { - title: 'Húsvéti promóció', - btn: '80% kedvezmény', + uk: { + title: 'Ким би ви були в AdGuard?', + btn: 'Дізнатися', }, - lt: { - title: 'Velykų akcija', - btn: '80% nuolaida', + ar: { + title: '؟AdGuard من كنت ستكون في ', + btn: 'اكتشاف', }, - nb: { - title: 'Påskekampanje', - btn: '80% rabatt', + be: { + title: 'Кім бы вы былі ў AdGuard?', + btn: 'Даведацца', }, - nl: { - title: 'Pasen promo', - btn: '80% korting', + id: { + title: 'Siapa yang akan Anda jadi di AdGuard?', + btn: 'Mengetahui', }, pl: { - title: 'Promocja wielkanocna', - btn: '80% zniżki', - }, - ro: { - title: 'Promoție de primăvară', - btn: '80% reducere', + title: 'Kim byłbyś w AdGuard?', + btn: 'Dowiedzieć się', }, - sk: { - title: 'Veľkonočné promo', - btn: '80% zľava', - }, - sl: { - title: 'Velikonočni promo', - btn: '80% popust', - }, - sv: { - title: 'Påsk kampanj', - btn: '80 % rabatt', + tr: { + title: "AdGuard'da kim olurdunuz?", + btn: 'Öğrenmek', }, - }, - // will be selected for locale, see usage of getNotificationText - text: null, - urlQuery: promoUrlQuery, - from: '28 March 2024 12:00:00', - to: '3 April 2024 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/easter24.svg'), - icons: { - ENABLED: { - 19: getUrl('assets/images/icons/easter24-on-19.png'), - 38: getUrl('assets/images/icons/easter24-on-38.png'), + vi: { + title: 'Bạn sẽ là ai trong AdGuard?', + btn: 'Tìm hiểu', }, - DISABLED: { - 19: getUrl('assets/images/icons/easter24-off-19.png'), - 38: getUrl('assets/images/icons/easter24-off-38.png'), + bg: { + title: 'Кой бихте били в AdGuard?', + btn: 'Разбера', }, - }, -}; - -/** - * Diff data for the Spring promo. - */ -const spring24NotificationUpdateDiff = { - locales: { - ar: { - title: 'ترويج الربيع', - btn: '٪80 خصم', + ca: { + title: 'Qui seríeu a AdGuard?', + btn: 'Esbrinar', }, - be: { - title: 'Вясновая акцыя', - btn: 'Зніжка 80%', + cs: { + title: 'Kým byste byli v AdGuard?', + btn: 'Zjistit', }, - bg: { - title: 'Пролетна промоция', - btn: '80% отстъпка', + da: { + title: 'Hvem ville du være i AdGuard?', + btn: 'Finde ud af', }, el: { - title: 'Ανοιξιάτικη προώθηση', - btn: '80% έκπτωση', + title: 'Ποιος θα ήσασταν στο AdGuard;', + btn: 'Μάθω', }, fa: { - title: 'تبلیغات بهار', - btn: '80 درصد تخفیف', + title: 'چه نقشی داشته‌اید؟ AdGuard شما در ', + btn: 'فهمیدن', + }, + fi: { + title: 'Kuka olisit AdGuardissa?', + btn: 'Selvittää', }, he: { - title: 'קידום אביב', - btn: '80% הנחה', + title: '?AdGuardמי היית ב', + btn: 'לגלות', + }, + hr: { + title: 'Tko bi bio u AdGuardu?', + btn: 'Saznati', + }, + hu: { + title: 'Ki lennél az AdGuardban?', + btn: 'Megtudni', }, hy: { - title: 'Գարնանային ակցիա', - btn: '80% զեղչ', + title: 'Ով կլինեիք AdGuard-ում՞', + btn: 'Պարզել', }, - id: { - title: 'Promosi musim semi', - btn: 'Diskon 80%', + lt: { + title: 'Kuo būtumėte AdGuard?', + btn: 'Sužinoti', }, ms: { - title: 'Promosi musim bunga', - btn: '80% diskaun', + title: 'Siapa anda akan jadi di AdGuard?', + btn: 'Ketahui', }, - ru: { - title: 'Весенняя акция', - btn: 'Скидка 75%', + no: { + title: 'Hvem ville du vært i AdGuard?', + btn: 'Finne ut', }, - 'sr-Latn': { - title: 'Prolećna promocija', - btn: 'Popust 80%', + nl: { + title: 'Wie zou je zijn bij AdGuard?', + btn: 'Uitvinden', }, - tr: { - title: 'Bahar promosyonu', - btn: '%80 indirim', + ro: { + title: 'Cine ai fi în AdGuard?', + btn: 'Afla', }, - uk: { - title: 'Весняна акція', - btn: 'Знижка 80%', + sk: { + title: 'Kým by ste boli v AdGuard?', + btn: 'Zistiť', }, - vi: { - title: 'Khuyến mãi mùa xuân', - btn: 'Giảm giá 80%', + sl: { + title: 'Kdo bi bil v AdGuard?', + btn: 'Izvedeti', }, - zh_cn: { - title: '暖春特惠', - btn: '享2折', + 'sr-Latn': { + title: 'Ko bi ste bili u AdGuard?', + btn: 'Saznati', }, - zh_tw: { - title: '暖春優惠', - btn: '享2折', + sv: { + title: 'Vem skulle du vara i AdGuard?', + btn: 'Ta reda på', }, }, - bgImage: getUrl('assets/images/spring24.svg'), + // will be selected for locale, see usage of getNotificationText + text: null, + urlQuery: COMMON_PROMO_URL_QUERY, + from: '30 May 2024 12:00:00', + to: '5 June 2024 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/birthday24.svg'), icons: { ENABLED: { - 19: getUrl('assets/images/icons/spring24-on-19.png'), - 38: getUrl('assets/images/icons/spring24-on-38.png'), + 19: getUrl('assets/images/icons/birthday24-on-19.png'), + 38: getUrl('assets/images/icons/birthday24-on-38.png'), }, DISABLED: { - 19: getUrl('assets/images/icons/spring24-off-19.png'), - 38: getUrl('assets/images/icons/spring24-off-38.png'), + 19: getUrl('assets/images/icons/birthday24-off-19.png'), + 38: getUrl('assets/images/icons/birthday24-off-38.png'), }, }, }; -// possible values of browser lang: 'zh-TW' which is 'zh_tw' after normalization -const currentLocale = normalizeLanguage(browser.i18n.getUILanguage()); - -const shouldShowSpring24Promo = currentLocale - && SPRING_PROMO_LOCALES.some((locale) => currentLocale.startsWith(locale)); - -if (shouldShowSpring24Promo) { - easter24Notification = { - ...easter24Notification, - // update the notification data with the Spring promo data - ...spring24NotificationUpdateDiff, - }; -} - const notifications: { [key: string]: PromoNotificationData } = { - [EASTER_24_ID]: easter24Notification, + [BIRTHDAY_24_ID]: birthday24Notification, }; /** diff --git a/src/popup/components/PromoNotificationModal/PromoNotificationModal.tsx b/src/popup/components/PromoNotificationModal/PromoNotificationModal.tsx index b608c9fc..3cccdd37 100644 --- a/src/popup/components/PromoNotificationModal/PromoNotificationModal.tsx +++ b/src/popup/components/PromoNotificationModal/PromoNotificationModal.tsx @@ -62,7 +62,7 @@ const PromoNotificationModal = observer(() => { onClick={onCloseHandler} > - +
diff --git a/src/popup/components/PromoNotificationModal/promo-notification-modal.pcss b/src/popup/components/PromoNotificationModal/promo-notification-modal.pcss index 023e3610..60cb8406 100644 --- a/src/popup/components/PromoNotificationModal/promo-notification-modal.pcss +++ b/src/popup/components/PromoNotificationModal/promo-notification-modal.pcss @@ -49,9 +49,10 @@ top: 50%; transform: translateY(-55%); width: 100%; - max-width: 220px; + max-width: 210px; padding: 0 0 16px 0; - margin: 18px 24px 0 88px; + margin-top: 15px; + right: 20px; text-align: center; } @@ -62,7 +63,7 @@ font-weight: 700; line-height: 29px; font-size: 24px; - color: #4d4d4d; + color: #fff; letter-spacing: 0px; word-break: keep-all; } @@ -70,11 +71,11 @@ &__btn { display: inline-block; cursor: pointer; - color: #fff; + color: #74a352; font-weight: 400; font-size: 16px; line-height: 24px; - background-color: #67b279; + background-color: #fff; padding: 12px 24px; min-width: 168px; border: none;