From 259bd618ab3700e2739add35e6a374e0926e7eb9 Mon Sep 17 00:00:00 2001
From: gradle-update-robot <gradle-update-robot@regolo.cc>
Date: Tue, 18 Nov 2025 00:35:23 +0000
Subject: [PATCH 001/113] Update Gradle Wrapper from 8.14.3 to 9.2.1

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43764 -> 45633 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   5 +----
 gradlew.bat                              |   3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 1b33c55baabb587c669f562ae36f953de2481846..f8e1ee3125fe0768e9a76ee977ac089eb657005e 100644
GIT binary patch
delta 37442
zcmX6^V`E)y*G$_Ojn&w;ZQHhO<Af*XiETD&Y}>YNtI^y0dB5x*u&<egnOP5u-+K?f
z*V_IBOiscEGa`ZS_z+&lW3J3RrRkI@gC`3EYSvq<35ViCo*pY3myM1xAv-Ur%vw}r
z-Jhf{4rA-BVPnbfu<ud&7R@E3vxwbe2S|*e(YV^Pq9_)Y;uXNvniuRGsHpRQWF+j=
zDkEqkN`z5SF%1j-6cF`i7qvgi)oss8#y5y1$<yoF24BO{Zf>jIU21Bhf}7%e`>rSh
z1#LY&uAK}92G$A&y5+$IAt4F@<i9f^<$V86jL&+zS4V-K5;I~XW?~$k!zr}a=^mzR
z)t>2|8jt0LwA}}afFkG#WBw^#$TCX0J^k+I+tvA_2h1Itw`Li1kgyHcDwujll*+Po
z$XwsbUNDm$Wt&2Li;oZ)KsqHBet>&OoWy>!E1MRems2?s$vd~r0vYTN=myB^=e|Ep
zOPhp4yC7$yh?X{pJgiX}r=I+{B<4TOeoUksBm-D~H<`&WFHZHWL|{HK)gK&-S}>%I
ziIqri>?=0OaJ^KsnnmZJiFiG_f?UAD<qt0ok8z~VNvfW~_&Rlie3ZF#bsF5+v3$44
z#>lLvkG)=-3Aw~z%^S?4XD<*iL~Me#4^m2$Zj`empiTmN1WnOgbi8v`sM08Y{O`ZL
zDN<Mwe**(^1l{o9fod7?K}fmi05g?!c~m7dy|5;DyD%9zv6~=HeM=dcVpY1N7hy%I
zNGusbEQ6mcVW&N=CF$uXF$rHY1UG6ik~0G@7alLDUEw~E)-s-4Z_GY5jniuu{vRJt
zKLlZ-;I9#X=A>>@uIp~1rj*c9p2a4rsJ73t%3fhNB|EHS<aLn9_UZ`{0M0iiE8X(1
zTC0GSv=@%^=v>9+$2cA79N(jr%Qb1IRH{_$pRXHaK`8dw#}-s*DfXJeoWNogcLPp(
zC#5c477mpu8)E~nb*Lev%2hfE^f-7GM%lGk{TaOK^n$z$aidXt)|O&57^|vNL>i(A
z#)k1{uik?cea-bP^a_f6K&sH6VAxcnmS1QMy#2JiyY`*r9k9U@c%6$#Db1g4QmPTw
zP-deC)iPvGaxE1m;GFQI)sY#;1|iY~Z6?hbnLrJT6FpYiejmw@Q~IHbUGL-xND<2H
z)p(|GQFxTZ0Z$`p7!szU_@vn|OEhF%W2}>S`xPL$Q5I20*Q2c#U<iGnuqC>Z*|-a{
zHzYc6en{$9^L)!5OqfHaa8Tcj#Y=((4}9UN>~bEB#cO1=P7B_!+=f+Q)*C&M+}T{A
zC$+v;Z=?Rmh%t98yfbSSdXdE1ik=VA0XEuuTl;a7dqqhIalVtBiDWUu(_dP$jeCeT
zg=taDEp4CPa+l{5z;DhDQH6y3?xR^7gTqNT18`DFf(ZXGMz10kuL(@XTIRo_<i6OW
zPm1P9BChm`4Pp8rBm6m2_MN<aHy%Yzv5el~b<-{G;pbobIKyeiW%2|h(>Fi&weHNZ
z{f+G(;f9<IZVm7IN3RvW8HG-fddoA0;=>?EH1rb4&On<@5auFNj4=O6plt+z2MsAQ
z8k`XP$8pawNz0h;U|{P%{&AcJ)J=l{ibTZ&*eRe2A^E3#m#8U5L%z}D75eMWs?LvQ
zEgL^DQ1p!?GLXUCr<w2P)l){NO)}Oi(I=#UWl*B!9^#Dzb}0jR2ziXh=+wo;{lvu7
z)aU2@K4yT~0Tw?VUMDSp(Rza$X^veTq0$}=p5_LpdYFVGzJy>U=t9~vC@d(;hnKYq
zz-NRPA}7GAe!c-G)@#XGGL2KR9#Pk!OP#C^T{%|z?md4$f^_9{Ph=PBs!J8(Tr9Gb
zqDXW|?BjJhtGwDEHvYm1Ih5xBA!in0QB8q0A;={r;k1q_HtrI29(e6yr9m|ZS1p`>
zw0xGJm>J`~n-4Ss_6bUB*oyI@{1V3ope$jB^p@#E&jhX?_o-ru6SU98<S^2jLiX3M
z!}q5juU?Y6lDb)9DHy}wa*8wd#y`Cp$tiMCpXCG_ajR?|)9F97xJK$IwOb@#(D!>1
ze)V2H^*$Qu)80DEw0)aq15ULt$3JT0kL+Z3h%PZs68>Feuhj^a;WIF8F0SVWm^;Q?
zF~#Eq@?K8P`}4hb-@v;B!!9{S5s__4MAlH1p2A^=x&k&ACPyA4ZKQAeD{#b<Nw0S7
zahsWj85g1QdJV&!*1H(NG8_Gj#8|<kCQO8e{dn^NwM#XI7-#8?3s09rya#P^dPotH
z#T~K}#974G7*DxT8q6&@qOgG0lH|@jb*M#m+wq@~PaINT$@r9Fe-M5}`dz)2I5r;Z
z6oE4(q6#q8gLuTbzt}y3&JDP^>KkGcWnJ&KdnWOzmd7*3E|K=Jp6|BnUXG#*K^`Fw
zoKj0L0wF5~|G`d7z(qj&AMBdI|JPb@h{!++807z8x2}%nPj8A9?d4$A?55*L6-Y{M
zXUK{)1o_*6noez=I8?gIK1*hAFLlJ-aK7O)?$HGxNK?lY({-_4^ik$E>|P<9pT;0(
zO5uOyGQ~H|b&UV@wrx=JO?Dr$f1X0&3d3KCMt2*{T`gPX5rM7pEOwDm_6jGqN=sf1
z=?Va=;;1lVob8jLkNLM`xq;WsJ~%UHq#`E6{1#{)!e3H)|N2hrwAsh=7E@w{va{Ig
z9)TaK$6`yQ+h2{`My4D0MBKs1#ilh=VJ!2}h#D<K&n2gUsez!vIKgR8r{UtYh{m<a
z>O3B6=G5LMoO9*4jCysFxZ<d5+@51#tq#yWM?ry4HL=sc3EUdAyK0J0oc1Hi56<te
z!Pz<ygLEUCl1o^*2im>B!7mT(pAs+&x3tA+WNE6*L{!uJLW%`O+he16V|(Lf61#p-
z+5;bNlZSnyj%Dqaoyi0w?QR*Fk#Ur1kl&mIGa68}#o8sYOeM2va~cKbsjx*jCjs%%
z>*9UbKz@piah<<h&V7t%T=su~>FraUf9bX;sb6pnTz6@^OtCl{Xm@FVPZ>AZLr+j`
z+FrD-xpS`2$~Op!%w0nxbxz`5@s2qKdnKo~+szzy7VEK&ae-AdEdh0ef6)4EZH*CE
z2u>zofc77JU*S)@8*;GBBkoF2Rsi_DGT1@yaEH8)D%3>|3K9fvf%Ld_`nJXrGTW~)
zg*MA##_5?aBWzMxmgolOMBDOZS?BoZHsbWQonmqxCYPQUJp+sr&$;kg&PBf`=vTy8
zhfoZeUff7#bEav>zt9W`ClJ^wFQ24^$43&d9V0ii{y<z#@8M*MJ--4J2Ee#xUmSdd
z*{>JYY)iTAqG0zpjiA*{Oss8tZS-9rG^AyY)Wa|1j~~6Bg#bIlf8RGXZ|*4fzu%?X
zvR?7{(l6-$>Jz@e=jB$1Kce7C&Rq9D-~-2+e=Obn^mccoe}h`+X439@L@b#jV*SK{
ze2%A|pEo^H^2SWfxi+fEGW85~80T1ToZC5k$bGTL6zEv(S02%x{e!)y=Y=os5pyNg
z&^ajEQY=aW=fD&lf+mfP@J+YWCi-FKJgT7~KUEbzu@^c)8O<)IjHRJX9v6e!R^;vL
zKf?7J+_EYE00RR-{f}_t*s_3g1KdSyf5;SgT9D`nLZT&mCJt@8A+*|eR&+*d(?C|F
zlOa_+cSJ@bcMBF4I3XKjhqa2%Rhp$G{ep5fyTZf7k(#R9zxmtifV__tfu1F5zo`p)
zTSFD$?uo4XoaeiaWtY#p(Ki72Opq8vjb4{;$>ZuyIDRftxo9mN76AYO80<uo&Mv#j
z_FI+IiVXa;i81sF8b9`2o|K<{4^^K06ntIWZ60~o(3>`KVIH}Ees*qdW5YMA!`(*T
zpVcITlyl$vfU=pG&Ace2Hf8~<9MtD-8TGI<WD--A5RwMZuklkX5YRKW;&dBs1Pg(v
z{iHdcRz)E@i^dUCVh^B6Ur>plWXoQ%lURZBQC?E55TFaRp!!jL1&huPF?kM)nXq0Y
zSkHSGKvPF;8M#%Q^INbzNKOj^Ht0))l}6-h>;<+iJluj<iBK|uSt3YnriH)Z`!VSs
zsm%#!iQd=~2tQ?qu@>O!g4Oz8*9Ax2(HWy6_~($IN;e!=A3uP`^0TeU)dC{b&0=;1
z!JJ~urGME<zM&3sx9WwmqIRm;@5e&OcD9Y+3fLs08lbc4$fDn`_p+qQ07!()L+Uak
zxTdj1A@!2vvxZ@2sRU<q*F`fD%d_&j5?$ysj*QqIZzdI`VebVOb*R#LS#Pz#U3(Re
zEO!JVR@FRwBM5+w`p+<0lKg@Mp<mJ2{N=m;qYEL0uvc0LdV@?yTc&Ys`}$?_RxfDy
zH!h~UBb_;twWhFqR|Ktud-gsbTnNLn<RWWV5aIYmazr-wpKS<0k^WMrzG+2(xKMvK
z**z7f7ZtrT(^<!4AuTKVCM-9%%C`jB_W3|x=pQO=sFHy7rJ@9+h@LVtDCbQ~rgENm
zyN#X%k*S0s=PXm%k;H}c>wU4i57C5x--mNIl=z?o-bQNRYsKx@pW!%qQFPq%t{*vq
zeJJvTX06{ea*@9AHC~`5JTcw=L3LZdL`~Hlk_@!wq$s}D=T9%4-iw}?4+w%<nv|*8
z<s3+%6SfA7BMjGPjd<{3+B>M7?$;8Cyx``?!aOr=YFU+7<~{;UDH+XL_5(v4_nLN<
z)_I+|aujQA+|t^af$2z1k<)Ltr0y;k7|_&Z^eN4y`Qz2UjId8mSsi2`5(?}9P$sGg
z0r5}bTxpT2QLyehtu}`>8JBKi=f~g4i%>vE9IOD4TG4@QAu7h4P3dIDYh|B$EgOze
zsSS6WwN9^IZ$r%UnN^T;LU};2)XyTeVQTuivote^uqe5hMpA_79W8;9TZqWtVJreT
z4BO^Bm7_|xyfhOSm@GiLzrR%pa*2L*kv0O54UUx7Fn*rXRt{*LZw16Vc12<q`7r#6
zbN&XHy>XMO9F~D)uL+OW8>IOoiV`6Y;;N{kQCzW0Cs!IhS9sdtxUG`*{jq%{>mF?p
z0@OH+uj=)nafI->pI-+}=<5n7Iu>x4v_Y1hIY)5@QW-_H<C_Q=$6#02x-A>~dmPzJ
z)H_p4ln&SI4x@~n+X5Spsr|<!Z-^*|qkw?iU0JfNp6OGG$dJY4_N)biy@~@L6`{d2
zJF~g|3r&ROKThw98FRPBuQmc(36x`60$U$LXqzQ`fYT4i?#F$j_t?5-vAGOW&h2E6
zSsu^nN-!zuhhq>&rrb#u@3G$D`4LTW#DQ<5Laiy(Bl7Fc2K9L*0|*znNkRynffSJJ
zaLio&qPSBb&5zn4KmfCqs{npIO%Xag3T=$j&CzO8;)?whCQ^5QEQ49=g3MNz191T}
zxw{4Ax`3ND0+{}Uvi5V~e4yX4;*KWadQGL&>-%b*p?#VrzQfPh7M1De)wWPXkDOE<
z<>dw*-_FE{xeksr)(k&G@#03M00EE{1Xe8(!<aK~rNkB=uPoLKy>$K@`3Kw3SG{k#
z8vPRB(Wuj^NplhePT4~dxYa~+XrGAaduyYUo%dK-flcB0nwH<{aEM^+R>4ER=X_>A
z$Y?8i)rKB)Zd^VW`2MtTX6N=Kx3i^b$p2g2tKsdZRY)zQ!B^y|{Xu%vs16u?7FAb~
zBB9CzBU3N4a>TyeCmN#A_Umev6)#nQtavE@X26q<d29N6vN@pC967Er`2#z-v1{#*
zS2P00KwrYjmG(Ao;*VBIpt0;oAmyNiQ(fwuA3}W^?DT#sqT?ZXSD(Xg4$-w`;(E_l
zj4qWRBgFn^Zu48e&nMo?_DH}G?#LNISE$@_ZH?rW`CaRH+YQLFpYC0_7v8#Gx3hTX
zN5g}Xnds6`V==&#t&1=2d^~GbF{eI967eB))F;?dpIpU(bG+eUS(3A+dQxI#Zhd>2
z_9Oe|_|Q9W>`VMGOr3cnE|TmaPnJp|CK3Z3IMxm)^P6(eCN$3R$pmm=BwS59Iz}uv
zh_mtStIzK%Ft<I<X{L~ifcWB&O)PM6(KBgmEp1Uk3ftHrww^~$y+_R50@7LAVTk6y
zH+hq*f6F%;{gz!x*TP}SnCCMB?<L;t1=)QUb)lBtCi#aicGjb9viHyAPt5;1u#H*q
zkO34J7&jsqn4-)NaL_Xk1_*~pnKU@rPHYGbd3y$StuyIV*EMJsdUn7x2st>x!DCZT
z!^$DGi3F5DL<#6Oe5vjJD!7%madOcZX=*A+$Ezwx&snd>!(Yo`)vci$xrURt5u6#O
zM})7Znb^#`hFp^l;|VOY<QsSNnyxj8@$OWw+$8zEjdjQ4H%ufkb2voD4QsWk485I#
z;q@Fsph$bik>bF>5#6*hzoihwWZK-(<q%2HM1pnY*#%H*^xbk7U39%TYddb!ZOSZq
z$a)LB!OUG15=_kOq<oa<YDB+Nq{Ol)!yV;ggdv%Xe=<e~df!W43H6A;Rt|JK$nf~~
zIBEz)2s&jN=>oJj)DuE8LW8K#K_jM&fmXnd@$DvXp$|uvQ5SWGu3evwGe;}6=DxC~
z%0WCxF#rGyE#~l!R37!(AUsGbsD-yE2a@_oab%Bnib>Y%j^Q;M`Htj!&Tq}e{dzRr
zqSqTzA)i=iD}MX4FXRtLUG&tt_(3vVB`18$0%99@E(Lo}=a+Sx!V2#WMyCwc7(a~>
z#X&b(F(wB^mc5IxiQzw!@pJn_HS<+QX|WqPet>4O_tcI<=n2Jp^tSeBcUHKD%sf8~
zF70vG3=vopQ<vi9atBVe&&YQR(P{Y3Q1Ax9c<7=eI19+MFRXJlOF58P9XmS7w`q`Z
z<b~=f+}#gdIt|E{C#qT90p;(Ra;z-Kzj*`rL(r7|{)lKmg{JD{9*G{jGm-p&{0~3I
zFk(L{WdH3<ssFz-t&_+ARL<p5h0s2M7%3^vR2<)woFMG1Qk_-C#3acqC2Nrg6aR+E
zHuwLjZ6~YO3Hc|><@OR-w~%JMfbl2Y+QN+$OL>4+v#))Rc~ZIV-=^aXz{u-*Ze9;e
z`972;UHl9<A>70lJr;^8FfV`1@8xK@vbJj?g~%AeT){G5Icv-VJVLv!Q*1S|S9eor
z63+tjSKkF$#(#l8`}_Oz1Iec}U)hOf$U9fgcF|3JOtKQtR@{*JVZv=_Q8y1G1CrV_
z;UbSJBv>Mzg_?<No_5+nMirDXNkm?~C{&xwDp6wVNAgCYNlPuRp}4wyH!f4YJ9j9n
zH!T!s;Mj?5*$$onRz}v-FDm%6F}gtJPDeTOl>FXxw$0vI>I<G-->0n8v@PELOierQ
z%bQyd<d9i3VLolFpgJ>x@H{$rh*{`g$aivh@OJD1Q*hL(-pN2F*Fp8C7a|3%4JKur
z8~}a&?K8ZzZEuVXNrd<YN%uM$M5kz7tHk||xFf-)(L+8US6jpNkJz#FyBgbV2D*U&
zqV<ws)n9aY#)fbbg}Z20=_W_sRM^T8dash?G0D+54cX<)7{Ngh623`%ej%(-uL=;1
z0nOgcoUNO}HI5rq2>zBa$LPi0+=E&vzKF5XCUd-U_0sm}a_&jn+{ML;Z+ymwj*kl7
zNz~0NC;lg(m@`Nf`j@x^Ygb}mkP}c`#4`%RqkJq@^Ibc|EFPTvmNy!v!*Ir$ou^(z
zi3aM3T9O5RGkx?76|+|sYd#MZmVQpn!tzmWH8C608FWl1<WZADj#MVHKp>n)cQ#E$
z^o{Y(q2!V5@-H%J$V7ju?jC$qAY22*^vo;5C#skwW*b9#oMdHemvlkrF)m`)3`0L}
z6~e>gHYGkvxv)NoQZ6rN7LV956%gfE(l)!`k!PrBimCAtb-vYzS<mq5T%eeLuA=k{
z>6INMOhL9RG9t(&o~J9n!|)&CvH1@Mm;M1>8sdLD3k8J)Ku!UN2?-CxAUTgjX{XTn
zo0AlMTzG^CLbW_bwNW`q75uPgay8plwqq;#GA6#_PUHnMi~6w#@g%N-TRwOWrvlMG
z=h-~R;%NCg7ZGeGa2fu}-hrWQy8{OCxQzIE0j_i_5VJ&zoV1x(%|B6GvO_##gD`@{
z{@oF{yKxW!xRo!}{l$CpXGOvDD5_YZbl$#sTdDere@VfGDuR*aia;ft8Ut1d4jr{!
z(C&m`uRV++Oi!RM^w|#;EBK6Z(k(nUL=^H;by(=P7bz2TF|@Z;q9gj_=qb%I<l`r!
z3*Q%lc#6(%!33fG3<gia*2v)9gI^*#fy}{ot%`kJ01HLSrXjYKkSc1`ys^BM_qksh
z`3GB%stIvTKRW6NTqkzQR?h@hhXfF^X5q^V=6Hq7uzhWxmN%n+>-4Mwc$Q2Wa$B|9
z=b$yl<I0#pmR4GW_;fkFO)S_4qu`HZxspY0NtUu6V?7%SuH8kJVe!Z*Tb}_I&+-nO
ztxbvBj7avs502%{Z>$f69Gt8A*=bYd<bQhX4x&8cDriBpapc`V{r7SgyJ3$7{}gaP
zP=W{^2!R*zKVdPE6cS`Yg#~ax5klkpkzCxe^1aHkQoVWcyBQHN;>s@q+dUP#7&f*S
zW1yL4(`L;Cy&uyP;N+hO4oV@<c=_?Jbha5fgvbbzoyux`-r%vgdL}UF`es=$bhCSK
zAa-80v^$jG*uGX`{?Jfi?iuT_%G<!J;n7h|s1K|2uPvJ8Lbc6e4gr)H9lzVv4_^wZ
zvTZNmU7f4{p0#EF6%&R=ql5X{8EA)!{Lt#38{5Z5rvYu%N?tcC45=FRqJAk<RqQcX
z_e75{6u<fmIftY`r^9%X!+KtFpr^BduwLQd6WhOe^^=P4m>J30ZaU6;3z0+*f(8CQ
z>^*JS?keN4b1I)v7y>{ABuyn3@jre(q%?~nIvhj+$JeSx=Qr16kQ<U?KKzkLmyD>Y
zE6)A{LPNEPi6=@XO(Ow2pI3zYK^z+%uK2FuCrVq+&|<fCx91ESGbwZ{e6WW4iiKv@
zoc3#DBpI!RBOV7<<kyw}wx+v=Bt-Kk2)}#B9g?O+gxqnvv=u;jUK%Q|XmU%3Ua1*H
zdR3v>V;r)Cjn!E>!B{Vc+8e)#Xmyg~^hI_pn#+Ufw|~`h3XRP&l3)ZoX%&RTB}Iw(
zip3J`t!lNMH_x2d5YQ^!?ibq{!*WnzLFo&*hgKo*la)~f+EPtEVH`88<rQDXpl+_Z
zV-#~bKf8c&pp%J6nm`G6K3U*Y!ReIxQj1g_P#_pibx<!)C^lD^9NnMT{ck>kf<EFb
z!6N?0e)Ip7X<Se(jUXUlQhuKiX?QrPNs%(?8a34tk<L22X<Z}`9STWO5}mMZuV+%K
zq`bF|hN3D2i5J?T7sd*a7Ys2JE9{O;jaZqN;Oo}m;`V<0ivrBD?^p0!dwcy-%>Mlj
ztlEh!kI-^CPhjku@SUpV;Sjgz7*5g%Drwy?D#wYDV>0~Sz$)O%Io)vcRKkAZt$GA&
z(!6kXr9gY$dwUyCQYxZocyk-AATmUlRah(uuRy8{^H3)fz^-E-E^_P+ixsRafhZdg
zCQKaM#-4zQjW7N1ovOnRZ&)|fjyT&Hl=u2*&P}CI2MvO!PW2t(8&x~Veo4hD5~F0K
zd`FiqYKM1TTm!t)%J#a#L@F9HYVlQMrxH4RNKe%GktRtg{B=ixSFgBK(5Gk&+b-8*
zq_lagx-ypCOv}C`sJVxHcP__+WYNa6dEByg*huh)1W2ei{8e_&6V4dm=fes1%H+f!
z;LiYTq)L)Z&X-+ifSFTBoWqL2nPRWL50OmpYIYhQu5u=H$h#YprdCZDx(yKKmbow@
zt_CBIu8C=mRip@TC)KBYM$6mBF2Rg+{?7;NNZZ>i|5pX3{#ONt=!^lHQnZHuECfs2
zo^WGA@+0@>KeQJTE*??8ND%i}UPM4a5dywo1Y?}-XjZjS{khq#EYDe7EcMUNxw+k7
zw1zpm<GZ`#V-$@;F@C%0XNlGqWnzmrn{AgjGf#Yzk8(mzRJgrAghuu7Er+TZpMrrn
zWimV)FrrFTIvL~V8F&B}TH2)XL$Nj*n$nkS;JzZ^%HbLxH|+EuKBA&aEi^tP<~(h*
znxv~#>I|x%3)6mv@aYKML<qM7?%@3e40M}`8?GVtoK0P4?exzR)J&Z_|Cs*N*nItZ
z-TCNE`a#-+e5Y8HU`pu`>e2JaTog27Myb}0(jb(IjiRd!-w#;i^Y3vB^GWGK7ROVu
z?&0ibE;~*)!LN_WCG14BoBm0_6u$8ly$M54&fh&6KfyQdK#etU2tPMMJz|(gKow1?
z=ty-pg!Ygxa7T^>Nr%jT*c;jKtNKRRS|D}1r1l!Q7=C#m%#kc(*q0tKD`f5)SG|CT
z3=1)zHl{du?gV)Gy|({TrPVP%-QGl2q&TGveN;gP3f_dG7$^Voghu%;PK^gT6@6mQ
zUBG_#XTM|^oYg@AV1P9uPw(B^P62Dz*<VNKn+x`VQjyv3IUZxINYUSH8yWF6o|DKU
zbCh!r8K?)d^dsZqK9O{G5w@^JSRxN}vsS<<sXv9GRn68B1XwvdeU`V-`)kPL-9MPF
zV5^(#5fjZ!eG(1+NhE33hkvScD;%S7wzW^OH*95|vlJA*L<9&2k-ZCQ8y5#&?#ZdF
z_paJaEFCh^qQT(3X^Dg`6^{qlQG!tt2uVNx2fHYDslP6uI7SVC2C4*>{}4FGfF@ZP
zD~4I7G)!PTYy<HNI*B?gsiY##?3|H@q&j=MlSjWqmA<F<rc1}d_?G9oI$TrEn*MW%
zKtXq5@%7c68g$N4*2PrE{RGQ3@AdHK?KFb}*n>&L?rNa~=m+9ny>2=t@E1Wejmzy-
zi?Mn|#uVNpt1>!31>LkcguaE&vTousNf~3TL$7k>wwJ4Vy?{rbu9&(bV~#iW^K)x!
zt3IR=lKp9V(KQ?1J-t+ZUKNXM5~*)48bu2;#B5&6l;Gs_99y#7nCO!cd<cm?jZFqw
zgH4Zdq(n_RmA3kfxavfk+eV#wLvc9VDoCfPmJ}TO=k`7Tj<?FCFllOf3pJ9&NI=BJ
z-`JWoH*?f%D9nPKSw*EE#06YQgR17r$Y~OlqAjLq*@qs-D!?mkk;|%venOu-s&7-o
zUa<p;m@n4r>(g^yAwajs9RF$_-|skMcGTm*bild?wpt#1@WH=LTLF)B4WUW79mE}>
z!}{ZA24(;aQ6j=FSQ0a6Lf}w1vjHaX`7W+*xjQpUa`oI?G(<y=vgl3bFl_a^zP-Eh
zlTWejc)dQB2>YD!qDVvEQvbx{vpF5_EqhcTGPfyJ@@8$}7Mov@^N4un=9?j=llt}$
zzMcwylO`K#(!FcMKHE^)gI>Ee!YZ9X7J`ncX2}MS#xc<Mrw_RDHFdi5Xr#Fc<fQ@o
z+4}L($KfTKc@8ZG;wwdA`Knv2BCV)H=D(zHzgS`Xk^-Ch>4v+CxeoDkap;kkhhIo#
zA>4oiWsYGL{l+Kjv6CsSYDmvEeTt%ZQbQkdq@!B!ZHe%Uv%YwwyYEL#?%<f40s1{;
zz!$)h6G<DrwC=QKv9=i2)J-BWuM?@RdD@h7KO<gxWyM7lokznu9&@vqy{#sihvmum
zU0VwCa;2HPmJnOz2&`Th4VqY{weppun`cdWYz|VjBJ{Cr)Vm3%jzsk-_v}hc<PJ5z
z8(C*l*opq3FNQcqA$;)Hy*T|4Txo~ot}Eb!JZu<y?QWgjszIt5TqD&?Z9+-E9DGcL
zZCOeJW_f!p<?g%!ll{*)oW;<e7iP6{gv7{olMFfKMv5nlq4k44$rPOz-snuqM1hFx
z$}Y-zBiY@b#o?{9PVVldL5}HNJ+dT3-5ZOZmRfzZZogu_PvC)^Up0-}X-Ll9iIo6E
zeTt03NSmGXfzsjy*JARtT*w<D=ie;TETDgx8geF{Z1^2RQ#0yjNzqkmldK44fA{x6
zu~Xg*J6z(lLYkQK2;U`i6EVxtK2KVoE)Q)}8e62U@4KV5ETAWyU1kbTTTcq;XKGeS
zEFQJ%docGL&V;fQoy^Q(%gBB>5@ZEv>54tD#iB`QII+H>YWoMg!R>C!+2TBTtsGhQ
z!^%SvbO+$ZbPMl6B=Wz&w9Q-wYenN)6Ruk?XWj?GQD}GfYm8Q-b_VyRT1G%<+|07*
z#z7Qz(qMT4AL1n2hFoYyc*XWPzCHO~PA`vO1a}Kl$3hzS3cGT?!je>Cz1ac6_?pA~
zjK}%aXk$G(`!3Zs{9w9*<}{b5XRvejJQKy$fZMaVB*V&^G>-Os25*&bKF)pw7$;sZ
zbK91Nwg`S(p^``bdBtW3bSo73LVcvQKy&bp2y!LoxsI5SP>vzukN$xtI;s1CdB&YO
zs85Lh#wG@8ddf3!Ft9mjFi;_zB0xt2M-A=sCyXrCce}Z{IdxJwnLyoe-2unS@5)wE
zdF+j87z`rLD3IhVPUd~qspIsiUwxl}T}?Jb4d&&3cfE%MH?z6B!9#xJFmkdf8DU&L
zPZ#6O)1OaM3;@3`k^n0-tQ=l{Uy4sNM~Tr37e1UUICJM-Nk$X2$cmDc3P8RDoOlXo
z>)@9LtvrDTI!(svVY*+XYHg4Umsq_gspf<PoHSDfH&aO|1qFr0=u-6ZhYOh;NoZrG
zD8)(gxtH4UhUz1)6=I8(68+rpaOu$gEUf^v|KT^2cop%{i5r}XA?)wK^teMgvdUXc
zaTSwh^!dG2^g>0&2iu@MDS#tO)|Sf8q_mQg*Oj9w{OJ{xHY|B;F{RkX_kZK}Z+Huo
zSff$(#+3}?OY-DBUJ--Y1B~U%$qKJZt;qGhi35oJ01JhQzb_)|swoq`<$_y9Ck{6{
z%yNfH!i^yo%Rv>DPi{b$LObHPO%unM*v<PrG+$=Y7i?cTPO_}zSpZ@;CcdjjA?mTt
zZ_2a~IA(fS8f?D4GX#bXwNtr@N(5e*Z`i4!5)6MsHqjyDtX)*<5L5{9Z32AjOLCu$
zv6e+kkRbu*9xx{GD0Sw+)g$FsU6@9q-blhpy;VGC^^YqEF@+;c9b^~e+L_xkPu8fU
zvP`;f43P_V+bK*W^Z<>i`{m9n2kP1_REE8@WGnrnj1jfNgb;{|a?Jviy}~N=2J5vH
zFTCqWVAt@@M}g^zuhjGwvud`{p9E4F9t<a1lNziHasQB3Ds6NmrHgj~w{bGHap$vv
zH)eIQ#m{97`Am1#jBG^jT5|6dWEfA!sI&^Ss0K8wg2E~-Z2;<Wq9Pj%saOsIB>P^k
z-Cn%iLTPpDbfcmEhLCj2#-lMd4Kq{Rkzob<AD2KQ8WhW%nu=;K=+LR)I2g|<MmShE
z(<X!)sIRR=RMF>K!6D)%DqVD_e&KbW7eI7jQ%kt@zzjRB)p*2oKD7J=BREc*SoSoH
z_6NQ?fw^bQ3}B%&(7K{$q?Qe327xF3kn4Lq-ZLS^$R=cGy`{UEV;O5CO+zKNw+j0Q
z-b_X-jpsK4H<5xbI1Z@>d&#?q(7mj!HL3Hyx;(z9`G<|t=Hr7!spI8cMea_&Xcn`F
zQq*Bi%+H@c%yiN2$P%G&4)U4l;kYF47D=MX`xuy}ZUA%`QfdEu-BV`sxlxl2mk=-J
zm2h<g>h912wx~g_XCg@Y77_`~HE-?L4=y9anG-H>4G6dsLR}O(^!JE>5Ns5hhKGR~
zo!T16FC6M&F$-qZA#3jsERGF01}6{^cDYeT3tD-pEN>w0T@8VeOH|||fHI`kQ&nua
zZ+@&MA3);!Z~;D!9ykb<8lrX-P;NNm1*$#i_zL{?SKdXbpG6_{w1h<*<|ot3cb)UF
z7HNsSfAJ&IcK?8+tu4n;<txVumc+Z#LWY}BmQqFn{y~dIK^wHP;Hf$!J=DO7jshIL
zFYN4m3$vRBoe(XLP?b;L@b|d7=XsbD{aV=f157zWyyBL;pDmyN6EO{GhtPumRVQUo
zJ{ulLgPR91F5NGP#%HqF&}dE2=9Umzh85fx^&*JW8v`LG<j6(de0p-wE31rDN3dtm
z5+4*qup<$%9K^$sdY|E9adiInfhved^POS;R_*3sYxE{?ZiLUVKd}80sFg@V2bWx|
zpC~raMkF_fk||=<=_t7yOow`o4`0;OaCuahI<f&!nUB@4S--q;Spo+fLlrO4uH-+s
zrz`)eOd2U;HFpyox}#qT&hE_aiLyN4*B}BvTh_7?=2po7Ut&Rht4l~A7g!kUP8w2n
z%^-`AE#!aJJLuMMXQY|wNF_P7Ngw(g+~f-l4fYCrO;{k)3S9hLV1O(BKs7lqF<9M;
z{~@78tu|OEXl8O>63C5l<~W0N@(%K-RUKyjg`lcbY4npWa8<>hL0cC0)1)`NlM1EV
zj+bX*Nzn+rq1m27^S$Tp@)dltilf0G(5kJ^1v2@6p{@eP=SM}*1&;~9#${d{jSnYN
zlIf^8<sm^hl#mp;PBl?63#z6qpLb%u0guvv{Z1R>#K?Ua1{?Su_ZRWOCJYf6nEx>q
zXY5S|go#sSNzpjo^0{hlx7hCRdqoU@&^5ubwcD%~a9Z-bQ7p2v7=_`U`i*KT#SqyV
z`==qr)J~`ct!_tJv34AwMt2gqlYd4rrge6s8KG5*xrDM+DF!jz*SE2;L3}v&_wBE|
zKrD=+o<5IME-^x(Dl~R6QU19w^_iIGX6Ex*W0R&wPKF_TvieeLU<=k@P=3nj3?iAs
za9^A<o#~iKw+PV}`SK=D;xR9;{lQ)ctD^bJS3r%6z>(F-wx$n&@VlL1QhtS}!~xr~
zmvF~$Y38~WU3Qdq&MWTU@Jl@NygoxwYqrx<IpEyGL??B{ib}8jg_&Vj#0P80oUZkw
z&%ezZ%EMY*4WnzMva6`#jeH1OoOgO)8Qwg;I76b`IPImjY4-3B8UCZ#ukfH<9oYl;
z?S$AjuS=tfVi7vPUv;DIeF0&m>B659R=dYmAP8aU(z3_I2<!|>6@6(Plf8jqk$=f1
zlpk!s&HNb-vn5nz2lZW(-`^1hI;OAADW5X6dQ6NAW6fV12MyT-V(2tRLraGk;|L;@
zEGBJ5Mj%&h-(>kGwsvJJ%1oGYZ6Z`1M6Gz%70K1HvMv_@<4&}~_y+Mt0?6h1ez@WK
z_I5ukush17*vurx<XP-ocsPKQW-~EMp>m_n^HW8eB$X?#z!~>!3#?01=G_b<r?C3>
z!q@Uc_oWZiU#(ZU5%y%#Bz{kT-?uvGn71+z$Bq&C8+q#kwWY<Uefs;IJic_@SZ^7w
z>DA95HX=AcNOU(G<XxB%JoyJ!^~^F$pTr4Z9M5<gEYJoIYi|eaS@*os*lE163wv({
ztPo%{*4RbRhiy367>mBsVS~qjwA@$%cMxuayqGV*WIx%}Git%fH}J=;B>d9(%Rkh`
zW4y*_!!Bhb#cg*0?l=GNAwa4Zx_ZtB?QpaZ6<&^1I}XI|Ot|V9(vaeaV-^CTPJJiy
z_3ghosr4R#0OemGrse<L6i)#KfKsphydaX_I;k6Is3BkRioa1wuaZbOUre$r2o*i3
zz<JA-e2V?NvC&3CHQXOspr@4r94Z#~h0@R#-N_KKp69yLizVaZ^?cm}%!C)|#ntb_
z{EjF?x{;J8Dwc#T?k91wMJW59h1QsQU-4)jW>P+;)_8t(IAs|FGk)$IfXx0WA@v+5
zNbEOG+^r|;FFy0C%=fC?e~G;vOlJPQB-;wQgn4!|SFtG<h9QbDL_~_)X!Y4)1n9sm
zFMTdCh6bWQ&_=P;*};Tjft}QpG-x7STDCgHHklVtBYXH*LFHM3<^>?Hk{yMxgtIjm
zOO}l`J*+$>D`)O$>-mccuycD=&1-B1%nn1g@qwSfz%zTX6{~=Jy!EW8CzE@ww#J7<
zkEKLL%JV@Va2Q`uP%R`gN^Wbz>}{DVeS(I^+ep0h=#MEsE}$C}ywtw$dX08Fkw-N*
z!a$zfus&)9mxb+n=GK4P4!WMYfn#_0C4}i0()>`U<8AZuWA}!J<_gwV{B08<*bXDK
zWw=HUBSiCU@*C1O6ZobK^(uk?9&PfOh$!oyqD1~bMae@*7ND&6FR6;gM-n>thY)t~
z8gVJLKu_I<fSQdzoQWw=vdr)==jN6@R7rd0s+B?XI}!jwfh=J_0~L_u-Hgs=xkp|P
z@;S=#xo%}K==S>yp9iV1vp+j)|IxXevP(3G=g<$=u0IF|@~>!UppN+PpCcMVuu8<f
zHBvD5Un#s{1mHZdI26*jiK8>bym!g^u}vves#PwQPOv?)_<7{9{m@eQ8^=||smzq1
z<TP*+FFVwTRZ}CNRr7}T%bUQQ2t0Dq)KJ*Fm=$IL6%`^O0Z*>ChZ?VJB{8D-=N5K)
ziK%|Y#IHsCgP3dV&h&w-bgG}Q-=m<MDSy!IQ+m$x=K*H8(~vb`D2iN^10@ct>IBJz
z^gHVwb+#J3wqqJ$&_D=J?gkv-8v-U!Vu9%v)ap;Ig5~dsA6;;m_hJ)9LOaHyO`|TC
z^|Oa}Yum1vQ7u`Znk==ys~N#&^fxkFvQ(;i=vR^^dcS2^H6X6Owr5)M&&84)MGV)-
zZG(^1`K>G#2I)4Yq&&c3GkrV1-^-0NSn8BGnCYM*`uzHN7w2b`lG?);tDhG@wbiLI
z(Wt$SsNiT7Qp}*qEmr=R$K2P5x`DfU<#g!zTkr7e`+x^V{e%$#SB6DPK>7b#+4-E3
z&)UBiAO82^IsiV0f3ajg8U86Ok-ZSo8GJPNgL|r>P$?t`NmU_9%>qGI(Bn(T)aI6z
zhg~G)E73dTuV3+$FW=rN2VTB^C(Xc{%zWPJ*!=k1Kj#1w+0b}#bbIu6Mb1s&x8RA0
zGvSNzsiTh?J3y1Q0u^M{?!>x~PcvsFC_F?zwi=-E^8<2}uUauRw3HQ-)7DHlap583
zLeIs!ALqq#;C3vMaHYoCSyEQ9Ghy0HkIhnd3O@@!DbsJ5yKDuiSceb$to)6f)lX9B
zWmqIYS@X}a6_I*>f71pd&UKKQ3<v5OKHpIGwe>w^r6e7h);}z+X1Rseme(2-mdI-4
zq(mk+TLOq#(b#jbZ2D9}8|9zn;N&)}iG^h#i`X=Tc7=`~96m-*bMf|T+a{%+tNMD~
zMo3FTlS`eYzHamY^3{Qt0AoEF;tNVq2#9>|(9WqZS)G=sPIC9Un%Ym@Ei^k@NzTyB
zyHt)MX>G1+spXW4B70o_-b)2Rgw5Win%jTn8?#8fGyBN`*Y`I}1<>>c^*>6^UDVBh
z0>qpFat{BgZIC|ox9%WLQlKEXeN)I9c`Q*;@4$?(NCK{`${^*4G8y+OUJZxVb=%u6
zq1xdb4wSs^4%l!`LIzT!^14dG3&r~n`G#v+#W`4{_PLI0-usCTg6WBQ%<j*hhWIk@
z&kmc~RiB2xU0hT=Q|c_!>`aCjKkTQSybb^_`mN_WK{tXe|3c&#JiN4-ct-X>Ck|GO
z^$mo<=-K*ly)7D^QSAGB7Z(?c2pm;|Ylq=#8Nrp^Llsu^oJ&t(@K_7fHB2GNI_R3I
zoSdo@x>*i?T=0LFB>uQ*dw=#}ff)oV=sY_qG}JoZt{+7eTMrz(s;8?=QbjX|?H>T%
zpK?3vfzbUxRPjF4z(`gR_uyx*!NVLqEv;=N^CIH_qn<}Q9dLM1Of$G8X%rh!C`#M#
zJ{*PXi+wN5Tv!6{0;1sh#p#7XLNP&qpyw=UnrqmlU>Z9XV+*9{6hov&S$&Ent{xnz
zgcm$wnrA2*28=68ozFLs^oGKAUIJ8FPKHZ3wJhZGLq`cw(K28zL((_I`@;7-thpvj
z;Gs)Us-|uyEqHfoE+-5R|B5x1-is~W2c_Pdd|5gDoAE0+r}Ca!aiWsh$&|`4alVch
zT+tL4Zm6W;!?v{QBeBn7MR}#)OpT_wRApz-wuk#z#OxdbqF^#>+Jk~73IGN9(IB*<
z+6VllEYoarEE%j=gYp_*w|O+aS3*_aA;*`=rNxz~tm>6|f1r`EgZ(mhV0UuXhjLZ@
zuL@1lDhntl`C%g5B}u|Lo=#DRP^0h%CXSlBEw<JOqaq=N!}FGQ`XKOL%2_pKYB78%
z`K>ZE-r3j#@^*!aaO7VMGXUB+R-zuw^2bY)3xT>Ar>2-6<#w{X(xe2*QXRws{a_zG
z3a=BJP%qUFa6fs4Xe!OB%GY1lKRL-cu8Zt1`c?*A)m<E1wc*D2R3kVNRPYOw$EXhC
zj+6AVR(i`X9)j*D#<<L&?w6@{rm@=Ya4M?iOcp*z6gE4<h@`dwIeIP2X0=Pn-SJe1
zrS3O_Bo!_w!?S%sXk>L3j$C!)nsT-vajWNDVluwKhwb?1v~o?)z-U;qY<w^I&X>d<
zqq7xcYL|=^oP+sGIq&4Z|FcoGsaz6d{>>;T|8IbcN{Ik;{%d!i!0$RKVzAWE`ZMTm
zI+m5;+KR|!9)w8rLqkw3wqfo@?K&3CgiLoLzBjWLY}y5+LlkoV+*2+35<1ekqIQ;J
z-{Y+7tXFfu$LC*!9zt^LEnC}(68+Pt4P9h;b%LcyvQ7hzP2t%;tq!g79XsX_tHret
z&){758-S=xFQaPD;-FGQhJW`IAKpxu3^&FbYg0^|oQ#Z&qMGSzQ3lkj?ART=aR&KS
zj?O70Aq`o$S{k7bWf-d}5tR|Dyfo^M%SMclZc}tpDjUtVz44A_^ywg8o2Y|~gTaFM
z(e|qhlXl*99+J(}a}zQF2Hb7t)@x~qM|iw(UqCVi-Y$iWZwx%L!{)tMATbrl0VXcr
z%^Anwj*f?GFp2~FmxEU9VH{%v4qMj=Dli_|uRtiYL|7;a$e58a6QB;P&bqN^Ij(AD
z)=|n>Gv#y;rTDt##u7~?NitIJpoEEop02^P`Yvu}s3y{>Hj?=(c2BeClvCu|h#1Y4
z8NfO*Aulk=sLN}cK<~=23ofsoP|Tv2MrJ2QJ(?JLQ|d%cxY(bk=8cwRV)+x2TyL9A
zFLQTAzjiWP*LeytNf>6TP$M)J4nDha>o(EM0wVi@3>{MY<luWKrxviKPGIr#qWxBt
z6xc;5CNRpN1aI271A{FdM0C;4V~CLY13(U0&DfwiD%`7<2=ORv^7}VWXA7-tcg0n;
zR6m=pL&=+Gu(|rUbT3kW0^TnlX_(*zA?5bTnR^0ksumH@<ECrQI1|+?w@4?lU&<0A
z&<VX?a-I|sYr6g+w)(mpYtRqD&JywG6;WvEsj$kt3%?&r*|t}gCEOiHJdR;Q0f0xa
zl3TmdvgFug&26SDcFUT!K7zzA7x^_{XBoqEYp_F%Pxv9Fj+vW(Z-Iw)kl8GY4umg2
z^ap}u{@E9GmU-_|$~%ea2BMtXci7SV3<_x6n5V;*7m;geOOU?OX9<+vxTM$!ey)?_
z_3obZ4a(Updka2>ree+5i4(B=hNV*04u-sTMf32#Ox*zVWIp6Sf(ZRTL6T(|0GcqK
zx@zd34lJN&Zait0;?Qr}x%q*viRn~!y{twy^K_;}u8Ar6gMXP_SiCMLeENMH{sgG%
zDk|wB2?>fhRZ?13x(Y|oQa41xQI}CtQ(wIWMM6XzZ*hR+6YHMl{a=r|T(0<zb9|-%
zQ+&;FovvTOVCpQ48(kLDDJhlb0H}urd;5}eopY7o$H_-3npBQIZ8n<btQN&ww{|&)
zZT(ixk{$)+L^*4hXwLF}=Xp79o-Tg;sFSC!Wkhbj^*fyp$JiQ{?5V~PG5%;7bBcIB
z*b=v<Gs#Zb^-myqq^<wF6njrusnC>RoeVp#QR>C|4pV7Z`XWv;jxAq*0g&Z2IX|V1
zi(B#LpT2zYwi%ev_SO!JGwP-H(~PrlV?pgUHN;eCg|)`Eu2(1Tw@bXPD9DqMZ%T07
zYGP*h$fECeYNZ07sv%e0a$5D~FT?y}pMI51M6b$i@{nDKjpB-M#hA51W=Gp1&c0Q3
zY&Gi(Y9~qQY@Z%+s@zdl1#n}@%WIK)4a!X@&n#%>@1BUR-@!haZ(`piEl(O#Lnp{g
zvB>s!2IQAGy)F^T_Z5I)7&G-tExOWhh6){)*u;@>VrwpIwqn<<1#zO6LLd#D!c)j*
zD%U2NBBZXj*(AtdDu6C2Z>0i(snh-Aiql9Ld^LvH!NMcwyM@&afWLQyQv+J}GXdg|
zxm2qZ$!;2i0jv@;q)Tipv{^@QW;g>8Xagez*jMg%b%g5SjZRr|?Ct7(=r392%lnC2
zYMOWfK`xeb5e|#>5cmT$ybyHrJtq;AmSpqy!~=9O^$6LM<=z?hj$PsCgZ5_oOgFj^
z2zcYous)bj`NmhefR{S@a6)+`gLCY)PsB2sm66&9%_C3Bb=)3uS8(JW-Z~o#q<g1=
zmoszDY$O3oQ&@J2%R&<yxGN;0Dalc4v;ng31^y2x@VI{Q&+EVqrJO_*%B}9=!iyT_
zQKa8R=nqU2#gb%Y-iMT`I%4mC>ta+<Jn9cygh=_e4)JT20e|=!5+->ZL({y>ti(OS
zf;^L(wV#n3tpeA<^OJ^UStdx1#C4_*P6&nIy?y&sx}4avV#DTdyCb~1I0lZ|%b?Z&
zk}{dM{XGHBqD{kb(2Ou=d8_uOd>11era6+6E{Ne)+iy71*4A&vt4_d2_X3X8#VvA}
z>X7^uOi6|R1Nc!Z2x0dbe|}`*h5X<jwoVN@ZyipnMS>O@P044WE|pbb#SE-GGD6c(
z8ASh^J%&(i6pjaX$?}czY}%%bo^7gZbBjwKr>D^qPpye+cnZnyhn~q#4;d~|<g$Rv
zhGOMioZAwx>i$fr{2ck3c{~y}K1{5X=^j6_#YOvcazJYUMj|)!8jtC3SIOyb9PxLj
z@A{igCn(aDo;-T|Ed4FjhNknxliS!mF?$(h=)&YeyxL?(^-*S0IepHkTXd=$vaee!
z{uiOw$Z!tm0>_@^q_)?LP*sFm=f!hxSntd&)K`R=FUb&RVptez{m`431OwUM8g@nC
zm+f@givgvD7NDi;nUb}mt}cB!Z|%%0>&XHh&3U;=M!cMYxuW8d4w{=>dLnTWB0G?4
zSxQNUCC(3sI`Wdov1+MsE=W9C8d<xv@bVXEkr#m_SqK7>1(j>&eNl9+52p?E9(~^e
z6yJHmyd8UKawp1h_Uc3n<y)$|WDjlhH}Ifq6oC9EyxG{S+*&<2G{m#Acj7VGq8Jpq
zoRa67ohFl*5{)r$z>k(1*SA5@iUCUo|0`?s=Xs$D*nhWOYUaC=qo$TG3}uPqmhDit
zieQL4M$(LboP*N~^g%lx5H(XCF5K)!4+Yd~P1AGg<=aQWTF!<W^MW{hK@x+lKbf+a
z?*Y2wB~2eFTv0LwH4EHjp3z2APj0YX+KInQ40@NTh=E+TmnGyLa_A5C0#gOg2)--<
z!?$!}QJ-Bgvl!?K-Wv05Od1cdQI)T5JdNMBdp*RgdDZL_4uT^8eEC7j$wm)}yR5DR
z7?qfuyJ>g~-*s%-sD}RV7pyYMNovcnSOQ>|*vFN>Agd8o0CXq?TK7}d#+ZQhvFE?g
zIKP<uQF{1ZsQS?liRtFbq=&fH!gqh-krX0Gu>3pDgMH=IyK;>|c8K1>S{u}9ry>D}
zH<ditRtVM*(8Erx!NaJ0Bp4BtWLV4!0ko{?jElpfA`MdiP_Sq5jJ?x6!lt0IJOXev
zZhgK}A*+A@59Dq<Y(;z11(oro*h;q=-rs*K-g2~2{mSwTE@Wfpw7YZg8Z3<jAX!7w
z@szf+D5^m0t0}T94u7Ibh~60F@wa97$Uu<n&iTaKx9~gZMRCA&E_%bZezTYPc~*w1
zasqQ&$Z$q>S}FhF>Rc479J{bOs|k>)hYL4;!BpbN2bu<mntq1^W$$yghLb@#L5gV1
z3(;D%AlRIcjNLHqjha3S{WeuqnY!c(XM+#R|8v#JnXjcha1|?>8P(#rzBMXA{3c1)
zFY|yC?0`Zvp;W7w-;~Q9OBqgMnMtbS`+p>zV{oQjvxVb{?M!Ujwr$(C^CX$rwrx8T
z+qP}nXWsApxT~wW_OD%aSM6Ti>uS7Iig(Z)a`dN{wlb4lXeJHJHkt&$X1(!m>rD8(
zt~Vey83W~pM$6wA;_!LaW5AE7j%R*h0Oxw}@Px-H5vW!jj)3o?S%pE<?5fJJt1Z#X
zzj<K+YWhfjm-Gh}tZj?RJtbE$o<pri>b><(z^Y76$45CfLyHnTAG=56F)j`<`-wQ|
zO4w5{<p-2FtvG~Z;4~-!;xpiab&^D5#L#!=A`d!DjDko8ENr6JLm{)bf`7f>-<su=
zyh&UkT~XTDC^-&1zI@yCvYca7v?Do7@$+xx=H2~0CM1?LS(f)`Jt|v)y(83?<~j5$
zd@@zu7}gVb6a2)}?VfOjgwy<*pf=N@u78hoMzom<S|havkBPSeP#wKz^vYyK|Mrl3
zVRnB#x@w++a!0=2UO^_*JkN?pzM7maWD9juHvxX<!o}+&kR?`k&x#=BBKX!H1OKMj
zcc|olG!+C4iMuqAJvM_e4)}>JNFm81s!NJlPd|lr>khu4zq!vpqL>ic_E>4JV!Y?a
z`Iac9B#Y3+Axn<~K)lKE?PFL(c@H8z+<GwPbG-?(BP$(ww}|BvOYPzhs@sHP-1qG`
zugQDD?i4F_oGpA3Drzuuhnbyx&}YWxB1Q2RG3xe2flt}`KZt;}!Cxd)<oBHxCBk+j
zXn;Zb{op>8Y2NPq(>&fG_Y;|n!3l{w(-O2lR}|>4OcGZC54ViSB@{m(mC_6yXuweO
zIAG(V1^`ufo6<Z#<&qAtr%t9N+A{v6ay-GWGYSH*w^Yjc9sx8xvL|jWYipqyQlI=D
z^3ORD+tpNs{_h}cNt!ZSDH??gl>C!{=9j%8Uncx=(*%#|H}?P32S!^6u2m=?pkw6!
zH&vh}zH*}_s(4`}&XhtVI;ar=6cKq-LALzzG!zv+b<m{x-Hfk<MU4WLcJm<?v`}(0
zCazsNU3#3{TSNY{vBMY#ilG4f`NuhQS;X%8QoYTmC(}8ZU;IA4->Cf|)WEiJ@!d1*
zA3-gnDe9i!wy;kxI?&$ZFUAJpKnD<PjdbG0naJSbO>H!U8^j#XN8SO$0$z;O7xBig
zOiY_qVugyeEBH<|R^R&wN;Ad;cv1&^ov0jk0!5p>hAuKx$9hrh)(BRz110s}YJU(Z
z+y+!Mn-084>aeLsT#}l2ne?f#M2jZ3Ca;Eyo`rJP4LPI=c}l>K5sox6a$tWu|Ln$9
zk;G~S6kjb*tJQuL^lSju*6mu~yX-0#{`oYQk;|F@%pGGQYsA2|3-_D7vUo6u71s3N
z=s$8^2^~4IRIv@cmu4y2!<<PGX#<`CLgVvR!pkLl{rD9f;*LUoco^VP@T4=UqYotF
zAk<5ZQp?jqraJvcMCf&+(c}}5HoylxZTzgx;nZzhNF9@j8O{0&OIB^uddN8?&@?JP
zYoBCxvT3aovkDXj5bj_lx%b8o*XD622xM(sBTUl5NTl62^{o+<E&fOJY2Hsr56R=?
zG}*gaM-cerv;4c)-UNk5uUSIZ|ErEwB($wo6YVv$08l<EOYJ}1+!I~xSS?V%A+E3l
z0Vc=-CRkuo5MX2h$mpS>ZRwjN#LUhIGy)wO&Be{lZk`&{%XV&(*3~WOWOFL@IO}{B
z)mzrSTd6DN)mxV(ML*8hG6|Ao5`b9!$8GQF7vGbO)PEZB?WnOxlT>@o*)@*+X8W@%
z+LhQLAT0g#-@8eKi@JiENbN5<HuJn9HBy*1F4=OT*(8e+8Cz$x3c<XsSWFSqor-AP
zLRj(Sc|=Z)z~(8G2x+uxrCN<nJAB<(v*+iu3{6O|N-L5^fIRaYnrxaGQ^slkxgv9V
zzov%1wzKHex<IIB(>@$FW8$`%X#$e7GK(1#fVLq)w^>)Rkl1V)Pa2z-*Q~*<@pID}
z(2O}3Bqdi;zJenjy`C0-TCuh5*M%ind1&S|TtCB7=mfAZ>7k`f)97(QSV)Rr3Q3EX
zDlcMAc1=ISm86CvGN_+xuvAf@Yql(!lpw>BeOZnP*1RD^kex42B4eKF;i!^QPAA&~
z<UvqOq@-D1w-JlE32sW8a>@SVXf%=qDp^7(Q;vpIg|U#KCX#0`EHrnzhX`1pzqw>c
zHm36wx~pVN97<_-y0gU!TSKh-Xyq;N++!55R;u)=1Tt^z5<7-5^2Ty$ZQyB%M7nB8
zqz+JJGt`JBgR3>}sb~!!ve}RJj--tPsD+KEI{eP~5LA@~N~tOWs%_*7)T;9|I|n4(
z2f`-Oe;Yu4D{E4S=#|Xf8rYKR<}W~N4ISe4)XrPgCAHYZ{$7R=7=*4{neR~25*Bn&
z9-LC?pt^x`YF|poS+;PqYhVhGDKVLss%T=YUHq+?Tw|ydOdJS`u=KAU0U}lhh@#9r
z4l{OOxmhBx&XHxGTQu4x;)>176!9+7KrYUyWm;4svGbxftY`^53QRqTImL@@?D4Yl
zO2Wh^$7E1O>w$JBn8{BfBBjd+7F$PVX$K`5;mwM52Cca<)3&n^DP?s9j#*z>)DIy+
z-_P=Ck-I%JzlocMOVC7kgpEW4M8qNAARsAG-gzNo%bLz`=g+vfV2!cr(_C%b_a*wd
zQdYN#3&80{9BSPnl7LD;^>wjb`%l^K1R$C~w$y%4Z@^V+^16jpQ)cK1p*Wl7LPYDx
zi-WP(M~)i^R|X~Wh&527ghIPLJ@;aj1`i+7$6e;*NR1Ydr1c0AV@|pPgvqQ*Sh*sS
z#iC;d2Ftfq)}wv}<+FOxE|^G?CB_U}3D2P_om>#AWTroF_<v`KKfYJX0XjAw?Y9>8
zYgw#2tUd#VJ!)6C5N~*`2APiMv7_w<p>WNp5~7YD4``2J+2^JLXSDAn1#<LKWw5&-
zciDwI#iVZgo7x0A-)Im4RR8|;9U=RrGq5c#z0`RqE-_1$;#Of#V$>GQa=Wm~d2R({
zo63@NZ(FrJihQ9_^uk{wU5VSIS%+H(kcQgDKY>6>gbwAJ$%XB<bw-Sx$o`|ak9yg1
z^Vu@p<NFLPGuy=rS1wYh4YM3I&IC6rXKWpzmQR)70|j1<3sUQVz0DNMnXAf2!IG(D
z3`Z>-?=Ouo$MLDV2g7VW5&SW870b@!rgWBdQKt`zM07NLOKQp@?CQMZO|HcU$9EA*
z->CPr3Vl_okGT}K`MjU<&vtNB)pwSA{El?B2M;YWFt88v(*UK8Ts#p?snMhU`{W09
z1m74uWQW|)p5bV~wi^mL>B5FHo*oO<pI5B$a~J$4X37A6F$89CJ=M4lxw^~=aVoe7
zpf;6k{)z>RQ^rwD$jctPfj+8eyb<wDi9)7Qo=4I?Sv22&?e}C$`J>IwzYXmcE#Fkx
zD6{ee4_e_MmM^+SP#&s^wt<B-p~gL8`WRFn_9e+boZV7@9Raq9dg>~j)S#dVYWjdw
zA-bFr`}0RsUzkOzS~=ROGiTu`rs(c}s1X$0<GZUeSUHN?HQ}A&8z^00{a2?4k@L@d
zpf@Bg9csl?=>wUkA)XWdqvw&wtlejT0s%>Dpyod_a(owhK3$j-yt`FYiO8p`$LWb%
z_y@R>D?Bm4L4n|tYDY)P@BBWko$iR8>q{+ZdOj>!qA*g{mf4&4k$WyWyXeO_gHtW(
zU4~_u@ciaR(FYL-Fnb0*m(eErkRuQPhl&OOVTyZ{e>4}|rys?)oY;Pxl`e?)4ETmH
z&KDQZnyg$A{>l3lWcE$j4A1&JILYD_nri#d4I&3H!jzfcV#4W-69y`x8vd<hMXFV;
zqrYnyI(zF&0|6&VZXZ)35*oTyP}&x|)bFR3B9|=fls(~~%-TW_by@Y|K<VwW?3tiI
zf$F<d>@m`2!!WORtD*v)GwkwKyjP|Z5`>7Y9On%F3{OYDcg91!<B9=N#v^T>JG!(G
zIaUI=|J~LL5q%;XM=OeY2a@jti&?}N0xd3YW;2j3J%Yjp2F{s@!T9@t#Q4zRkBTm=
zZ;HDMI9l@W^h9dU@@Z$R!jZ$AqV&KM*q1-Xkv$Y`cs0iYP^gi>A`_v3p{bD^ZQ1H!
zpK(?ZFGb$GKH#6RzENZS=@H$_j|^r|^>t<doo!q?7HZFI|6Y!I1C=uo;aSr`lU{b*
z*fdUS!=^Oj#&dDahY{v_7gW0IR_$2qX!i5Jf?%70zg0p_OFp5f;cg2{b|fCx^ZcuX
z)%o_Cx^O%VVBWXmOmW8^%c2BL)QlHOI=1q4L)mVstYKMk*SD6N9%fUnXl3#2gsevZ
z(SI%59BYuGouh5CJR^DYj(G|(YCI(=fuwfEH$-fL1l%suv0M9x39QLtygWkT!q!Z+
zu0Iut;aVAKt7x+J$S`?5*dbuI|Gl<E7>R3WC2RyShvH6OwLZRkW4`AEdkiN3-Q#P1
z=*yj7_J9x2ltKK1keYfb$1azm%kvuG6L<Ly5y!}YF9tFQMogrm(wJm9f{4V)olJIQ
zN<yqjcoXWMrfepu=o>X9_nfYn-TCU31vPRLRnUQcSjZ^ODv>5LUx$J`!l4J^@`&gh
zLBMK+7^x{1I?g+kU5}}nJSQkO><^ff!dpX&&P<WO-n`snF_+>PO7k`gTqy*^8U0nQ
zpdycJ)|i<YX;(kN!9-aYA2(9kVAIkEYh6>@z5sv6Ni)L`w392E$COm{Gu{JZzH|`l
z&_+G<=yYky9O+!d{FO-FEqS7id9c_Q$>f7%jJid$OX@za?b02-6M<etOr<sP9JNIw
zhvytUXn)WO)3^yiykzCWJr4{ZTXAXJQuKV)bwlda85)&JD_l&Pv%HoQOFx!($Yhpz
zhxe;hU>Gi!w5+VD&Tr>jA-dJQ2MJ~r;?%;fU3~qz?d_LtLT659>X;n1NTrNe`*q1e
z8l8Zc>P$^0r#xiopNnu8>iSJ!4DEEa-Aq}hX3Y5NZ{usP<*^fG#PR}I@qRt{gvtj)
zRdz2a1?9v?rFvP3)Ow=qmY@A}>7Fj=ys4><bz>!;FOfma1y%|@6fl97ycYbf>V5m|
zMwLm5wR-Wu#ot>h`r;z@*HjcHSck#2>Fqok)oOWwD7W+#Y1L?C`bs+!+s*Pbm@)1?
zCj!5ba0cYQc@7WfBk~!ro_fiOb4~rcu8stCd?!JZ7=f3}-t8I>sj_NBk|!GU6f)P1
z5$rz}gw$w%Y@~Jwxv09qLdf;_1IDijQu>L#uo(_&HwT@}XiGwmEfbuhMnmGX7;%j@
z71Dy%o&VtJH~tLm8T{v6k-`7?+VwT_lQvt$4??UuTr|ew6ITPk>{kS8{5Q16{KR(>
zzgW@bP0|Hf4f$#W;mQ>jw^5wpdXi**G_i0!4BuGHs*b51ehphBfsAK*hxlgw6W7z~
zTaNk+!|DYF^p$nEjS*aDrMa|9gUoh4<*WR!%3<!=XVxiqQ&4=Jh*}EVvl_xr0)W)&
zp;njVTeiGsSnv~&J@TOZYq1L@c`;%mC5b&hs?TWqw%Mj=LxN;dLn@=V?_1&R#S?fW
zAgH%)9MB7t!&7pH@9L+A>Y{700b$%x<+RxB!1zA<t^ZmJ@<htv$hAft7U9Bzl(YJ4
ze&-FJtEU%}Z~2G+Q{yOgZgiA8G$bvVNuRjp!KjOP4Yc$h$%Aoy%<UNj;p{U)2>fBR
z#xAW{SQWJ>L1mJ~Tf}V@+F_`?&1ERR?ZMX<Z<C9R-WnAy4ymn0eC~{}tx^e^_RtUa
zo+6Rq^EPt)AKVDtb|tC&6fz=6pv$y4o;C{aE;9P}4C7FZ0$OcNQh1XxvM>`;12Iqv
zdWcbf7)&*wNVIs3|M*^)Qr)a~Cn^1HkNHJABq{@O9OJR{b&$87|7AmLv~Uuw2SB4T
zNWw%meUAwfryJVYrpUdYW2fV=uDyH2R4k<aIWC02x?vv~O!EN)@Jk2MHUl*cubEV%
zQtVbx5P4h^!|^6Jt=;c6l}fJDVFi;6&rR6X99aN>UryI#z48=`m7|?b?2XrH$kwRG
zV5N%`;e2&$y~B80j!PL58XPMv?yH}zIZH}w7VA(x)@cn0kON{Z7#FtC!8%GH1HKL*
zqsY=(xQDVWs%3$jRwxCtrIMe(+0la)DjI+#nKC%6a0NlM)J@{DUai^<D3oi|YUYxo
zp+f*9>LP;~;+Fn90~*mXvc%=gWPWbUN4V|Pya2t-?`l`>uQ?GvPnWYtdd(~?r9#TI
z)XmX)ic@0`+Jao7zsDyerjhee$AW7SMsXLRLtR}ZL4)*BqI9KVTQwBbryxmJGR=N%
zn6KBj_{;^CKx3EuI+b4`lM3HWq>+M%i;Mu<cF{hJ8_asCuel_C<Da$y%1#)k35g@c
z=fF~=C&Q4dkOYRxkE;zy3)0D^%l((=fpRJgk+gywWd>2zlkpmW$$O)8>g>xX35_}V
z@1Q;_W6%VS6fOn{vV*yxvsg&}OF`4b`;&xpKxO=+J6UxbzmaR&6(W~?|G--d(+YsH
z>4|K9_)hV@C2}J-@^+ihBea%l$i8C~bTlcR7?Z#a3Ug80QFS3Byfss@JrMPVNHs-i
z5X15{HkqzKGW1SOswml8S2H7__?~8JY~FNFAtl8l)vWwE>D^`tNcW9_&`-$saEn{Q
zbuXoYhV^+N<$SiG;`4>=bLD(%ZwruK%=?8pJrDdr&myrBjPTpyihRH`L}sN>1r472
zudc0}eG{#;qx}+=)R8)~1}~Y~%dxsw{XJJb@^d$^|2BJ0K0Dm(2E<v5!z`ynYba>x
z8Ly_7KL6I1JU(U-Lhzp&|Cu%U7e1L>6X*`#>(H}CnbOy+8PaWeW?uMtK~{h?XzA+#
z-_l1IVqyv0Jcd8D!pt*V_Q*R%<72Y&A!r8l5zm=2g6Wx0N)A-Vd&u?3xBH=A^lEMg
zp)|h+Ezkt;dlj74wG&>7y}a2OImj7ioF7^IC&(Bl$hq<su>m(;f&R8^BhaTc)a7;I
zyx_ZSTkiLZ4UmODtX154sVU&>O_@b^7Wu|=y9C0i=?^JLg@{ns*a>zKMt^sL@HWQB
zS*+%}b;>v0^R)0O&DRBL@)3CRTH7rvJ|7*JZq1Tb`>}Fk)u#7e)QoBkCjyM*1S_SL
zLZV4CNCO))Mj+6gr6A%d4i^k}dhnzkVyOt(A@wf>dWMEe<eN%gIR?PcI*_~_Zc*ay
z-`r9U@5W2sDdt8V@4@v&9fJ#|oZO>{{>o-=i;O(=VVK6hCiXkC%zTs)@~%nNLfA{5
z9OhQ-U!J+lzY)dNJUfGORy$u<RwDil?vzda`c(zf@mE&^;n!9|D0Ox#WNsb*G8exT
zbMVIAMEuc{0fgd$_%Q*%9y0ZA>C0zI^P^esFW+G1ON!$IQ0s1$vkILM3{kuPfwQn5
zbkf~3@HS`PHER1l2pUpGK;3H<)q(EUUw3~5A&B~2XSAx@d<SZiM>9lO&$HWxhTM%t
zn;fSsoWmN2Hm|sokdOAx+}JF$O4B%dAdkFv7W_Y?5U;MG?{C8Z!EVaUz)_q-ZGm~!
zr5SRNFCXgNf$GvX+(16oz&$2E^OPMFz3Oe^-`))~x^@>jt2I&b$1g6UMbC32xf_Z#
zQWIeP1kAlR6Zcz!)loNCyWRtR$oP8vDM#{VZ{LD`Kz@fh)uwOxPH;Tg=^YdkU-Mlm
zKJdNmgJ+K`!Y!Eqa8*P8D;9)6L>1}>|7&M(>GxeS4NsLS3U?K7X%N0Cbs`FIu>6J3
zR|Z;+QWA)4Xe-jvw~4*HoKm%Y=is0uubkDRrS60Z#h__4<ngY5#a+&EEyDeq!{{$b
z-)XC|$1@s$w%MLTWLP3-`)&MvvlQ|U?(nc%8|wsrTc#QSEQr?<8E<AhX&?Xaq#va9
zT><MyBna<^C-x<>adTYo1n9@?A0|<6xQE-Y%F$8bsa$^cdh;B11@~n(MbM9r=HNnp
zX?J%<^E=a}2oS8DoA(yxa^m0rnkgoqgQ;L3@0%%adv)McRHnA-e%iS4jydNZ)2*MZ
z%Hx1<A(##Tfpz@bAFHf8ir!oylTHSPEJRbCBBY{%KxMj@;%DmRs+Nvs$0@E{iSO)}
z_GmRSp2FwkDE-7~g`;8?iVy_ENM1Q<@5m?h&>wT&0&J?N*8W#tlPeF*;XZ=tD59zX
zqO*7}ZlE*2T1GSSsIo54$WRmKpwiD?&GJ1<AyWsieOv~zdTa_h&X!;A_}BSj?Qeu(
zCR4HK`mwvFsd##WGG=>`z`+EFrzu?F+oQ1QI2|{23Z=K0K`5{k8PF;j!FZDI#C!4|
zb8$x<xEO>ZPCVl9c>UDT-b)_og*gV9WvS$Ujeb!TNp)^~mmI}hr5aawj+wC&&y(1}
z1>P+H?}%^KXxC(y5Z_AMKTyJ4mn0v1d*;@bN66;Jk#p(?*PD&I`^3rAHHsB(4*BLy
z$}Rbpdqk;LX~>~-XNNMMdwKRfma09vyb`Jbw~Q7m*fVM}TUk?_Msa1Rh0`^TN$4qY
z(K`P94Og<A@)=+9HMv*1TBS;}!P1fNAsQTD9ub?gnu4Ym?3IWo)Iu34uk>C(*rHO3
ztf0@RC*U#s`HCNy#TkTP)E@Mee)tTLi~Hr4Z7q{+nL_tgr`=I0!8bSs2I5EVA=DyP
zA%stat9@7iMVIZylxpY&@d?hkm%ThI@R_s-@jkbxM`l6uw16Y(@E%RdVmh@*iX09Q
z$qg?TC?RZz`U?X{QP12pqf&AHvvl`E%?XlMvZ$TSl#jk=sAp5G-IlC9|NeohXIJHI
z=+lmu%M^HmKJ14Vp+`w7WK`Gxp&<If2Tz<hRRpQY2{PvM?9CM0bvOr!-dB@@&ShOp
z%Fn&z(10aFwgJ`*OA{Zx6uL!8N{kH<^dx2Zx>L7udXOri(ESYZ4{hPtU|^I#6|@;e
zp~z!xk(oubYzX)zvLP<VMCgp_bp}3+(|6}>aPRF1iLL&QO0kWwz!&D>lTk9u%#!Sy
zF|2n_m7C9Wgp^T}RqS*m%`(6kYsU4-GEtxA6I0BxQJ-<lfo)M^{A<eDWx)p^9*EAd
zE#o&*?UH`5p|a-@j?RVKG+I7ybb{Kkc~(q1Emh&7wxD!ErFE<$tUAqA;ie}Id?Hxk
zC|0)Y8JNP&FGii^+cf`1pu6{pRPEF)qR#arTB$2ztrKZcO)YStGeLQ3Rq|AG<&sP-
zhod8ISy-7`<F+Nb(uP;W_2R-_;a-~$@shoG+MSuP$zLRUPPSgv{imf&Ub*p|##Z$Q
zR=3_k_;mcv{=b$*E3YGoA36|_F75xg2IzK-02m)_Q?ws|<c4>qS#65l1ZH6pTt|&%
zYke}30RtDrl9Is|h2bBs)Xf%ml6KPewGafA!9AFxJ?k)pTSgU?Ub<?PkgyFfG!a2?
z#k&A{5hO*V_;-H&1lFr{AwbXL=7aAE_svb#1MlNG?+0*|(iJqjzU$I3t9|*7*$`bT
zK>6-n!ndlmyPWTs>{nLM5vLthmdgR#%7R<}znKvBk7^l?W&07j8I#2HcZu5M(N)<e
zP~W{GRzx?J*#D{5p3s&H))6P(jp1MzOkZjq;ELQ!Cq*{gS4Hn_9RqUa6p<I!8S++o
zC@~w{=R0OXlwcj3He6=*4#+M2LhOL8mHE_`eW*@T^L1>@x&_*+@+fms<VbZ)3gxt}
zt#!j@k}4JbiMNfG4aOOP;C@Cg)(g(?l(ftU(*;ZJqvoc&v}RgE90pH^&}5A)2V=E;
zWOD*~TeDEU<2KsB+zJI!7Dw`fYWI0)R#BQOn~8{0wo;T(gkqao(}!U<ybJ)bNz(eo
zqv^tWA+$6%8DkMQ!iJQjXLtXFJ5yxp!s{43S`|jeLRQj2wW<Vr)QUG#RoS)+jecv4
zG(EHtd<C^)%sK%`SwgL+AlQR`K7pA*i4QLBAkAb-tug8+oKp?N2!uhNTz*td=}(N6
z#yTToNE4lgRZzeXH1oU74G2IQBt3Tda=)*jSTM^U1ymytBG}WIrjuu^y|F=#$gUKQ
z1)@%75XWT2lJqJZ`*3WGCd$lkSx7z-LCG=LVIV$8Jcl-nC=yMBa$c_BZtD7oOpQ7%
zC$kiK-vp@+)*3Y?mnHC^$YMoQgm6rnd?2c*aPu*Fy*?Gpk!yMU8VjJZG6tDSuzZv{
zt&}Eeyka}i7G7npZ{YbQST&>V-qIgfuH4_t`8Q6D#>_k|ej+{57jD69)>@NsYHtX9
zl`J@<+j;~CgagA~h2zc@kI4bAc?u=xg6z!yfs~Njv9FD3&ee3dF%g1o-q|hVrQ^A7
z{onLfY{$A<0=7;6u@t~%k7)Z&Z$i>!;o0-?&(cUzc@B*sotR3IZod>GlrX4vx(jGS
zoPlUrHcc|-;lwOTZ?Ol;0H!(cv&B%052mpUUPwKyp(zt8Bc0_Fk!sx>b!(-)Q>m<5
zIvj^eNmGUElQy+_tD9+}pbj0nt$2Y4E{y7+fYo2|=648)({F&DdPM8h&^ua8HcNG6
zu|$<DF|pvYMRivsmr3Aie5)IIGdA_UtsPOHOQ{<csLY!bH|MVIS|3W3=p0Ih((-9o
z>uxphUo3lK%Rp+P9J$PeI+uyTj61i#!iQansV4n70q$tR<(jq9rL_O1i8?`7X+;O^
zhYnDTG|LQ}NOu5#UZA%=(gY6BSZ;wK7Vd0@drcvxam|Ii4YS965%DYfUE6Zh@Y?Nn
z#mrDMolCnWVD<+zw1YEmk<^xx^j<MzQiEd`+M!x&XG-!4$vgdVy%Oi`hRLb0qO~oa
zyvBGTn(6eam|e;ENLkCot(MJEg_NC`9B_Dr;{|=>M)?7eGt97WHp|g2(?Nd`^{<Am
z5}@==Dw4^J5%p8l8gSj~fIY4|YFeJ3jlMoBk{B@b3x7D|IJ(qp+}%r%YtZbeC#j$-
z$=gk9OBc6;J4G{Vne!XV*||Y+naE|5XG5oU`+P^o`Uq2&>iy#dVM3!C-G?p%KC?f>
zx_=I(?<4@*G5=sfoQ3qc;a?*2Y%tI8YMJll8*+C{;CHl}^g7+L_NdKV)EgVtrB|<F
z8}rpS+)-MNwY;oxv??Y0&wWN4G?*$vM!TJfL9#DJp&%ZJJIWM0e=UVQqQmhiSYnV;
zZqphnd69bwKNY0b_l!N0p+ESccY*vSVT9@K;Nb!Bf;@C|-2S-=HZ*%?ZTHOS)bP9E
z`_W5AQas-ejyRd`3)j=16t6H`#Zyyc`>vELl^4n5sw3P>`Xf@qSwCp>QzYqnGOVCI
zW<^YDwOyQ3LLFs>LeZI+#XI}%z@HE^GHIj{qQ>i*`v^`C-(`6jvY+YKd5KJRR6?Xb
zM81HTXXq=+u$~BSzwjPKR`!Lg{Uqc4o8LGjNAq+~FB-z~9=Zdtq(7ka5Uam_G^^g;
zn8?@zuRmG??VVTlVl)~?5`X$8l0Be)iY;cY9NZgTZbcc%I+DDU=6(h$fpr2Du^Sd7
zhqkh@l<%Sqoc=!3kPjvJxs;>XeyMd#bQ1xrON}}zD0-+4JXPg>Y@C&X2{OhN()isX
z=;DD(IS4DH#wz@}jbv1Zgxv1Wmr61O4~pNkDA|t`^nIO|Xm~}+*OdBNW#YFhxbi?M
zLU=gKi+In_i%Zaha<NsKt!fme4@9|*HWUaQ1CBg!iu4`!tr02;m-_v+@;J0+imU*n
z?9nf6CTw(Ffr7486^X(l(HAx*8BIL$QT%*)=oe=`l4g?QD&%#ZkLS9<3uKaMw8~_6
z9>YnSc_|64R)@4$+zUDTW?bC6Yj^b%6&X@uWzP@NY#E}RtOp?odZsDh!qo<UD0m+4
zrBQx;d{UutN>)RcB}WW+6f2|RtB?a4{T-4gaYn`kho8?cb=_z#B<sr#rX;zrJlo8Q
zcy7<j!@@|7XRe#v&+E0bOUN-@z3P8ioZ&Q5&PcA4wqzkGm`f4!mS{*{dgxkSR9=v>
zOYOe$wN8&I<Z^Y>WP9Llgl}83EqOsyM9<h#%^lr|0&-aEBw3Cah=UuLGdBTdrBBfK
zHb+^omdxYkGx6d$0+=)ce5)*n&a%RMH$blv`hN;vX?6sv;!mg{F<8Y~?ckEH1~yGU
z7<w%6(Su$L4a<D+(c$*mItc*I3b6+dCzHiVlGooCIO26A>vJ4oZ=5u^eGL}I|Ar-5
zI(R}=m#RNg2PlO(Y!P9cIGh0pYV;HNwg?%XW^@3U0!|xDG4aR0f;yO2JYf-C-<lKG
zV(jTQV}0X<+gq5?cBHJ7$L{b(hDA{$L`Q!#P@`2?j%Igw!%PNmTQktAlMSb~s#sqL
zW>MjjkK*8xPwFnrRNxLO!rC#e0`+mD(?Th%AKT+N1GnZR3?Nso?W+Oztq|6KnpIo(
zR^v2rbg-f)XQkAGK?wc2dOkAp*16wZC=eNikJ%mm2z?(ELVG(T_*^O4Y)FsBz5|qg
zBSSx`0K6bu=O_QtJH7TZbT4+fKMJ0!Gltb3I+$~qz#1!{;*?-{-)&s4k4I?VNsMv?
zg=Vm*vKU#og>Z0$dJh3QU(h)D5E;dr7UQs>gJAL@PbgDU6`0^%Mj_!vTF1kM=a6_L
z;6iV|&O<|QPZ9AZ_DYeML&=5B23I5H95qZO(66l{&}o^xDsoFi2VQ;Q0Tq7Fb(%xI
zjiv9Lws#Mqttx{Q)~wdlzV;C<YJO7LTGrd2R_=`8ui9nlTbh6b$O@^J!gwYqhbNeU
z*Oe^~(vd^e?yQQ{fz>@nTW8NUv2+$0*O)SarhPpfr09@w?}Be^v`eZ=Mdr?NZE7bg
zIa^Wrl{hY{(qm>@C#yL;lR>2H{g5!EeI?(g0p7>8Lc%{Wn2M2->_sWF+5Dt^f-FH)
zR*T_CjhA|ua}t1JeiN6utz^#Ts6L+xXL_@TRsl@flabBaI;$y4>>nORW*P<`#F60f
z2s^5qa>Y`)(WsJPQ_kiVZT&oszToUVZt=x*#dbJht1aLA>{#1qs|E8PmBMK{u+$HY
zaGY1YHq4jZ#H_#I+kK8&y9DAY0XxHlaQOWL*nDFF5_y0q29TdoLgC#Bn~5NsHefjO
zx>%?rIpR9K?1H^BtHKaT*1Viy<#XsKJh+|GnuS}hCnz|3#Q|(TW!{Rt!gIza*gU_2
zoY`0AbIpM63m^Qu85LS=2$fa$$Qx#C42sw4?ip*HyxrE1XUl(Kpc^R~2GytM#_wPF
z1l|z@{1*jx=vn9#ZcBXuvuy%>xer}=jsbx^r{0nWAmBf>JwgW{;UAS>4`3^C96sm2
zQ?{%XU-)%Q48jAZQyHC;ob`JJ+Vwcpf83vbt{_5jz@r)><RyEtW1t5xO`~%YhI?6y
zywDoqF4e5|D7;0N7C$9On7$V7n47eYT>vEPmI=xwE1$@qFH!sJl;Jwaiut8tifpXW
z0iYS@sYa_TD)N@m(`kBzifmIWVZ&<;ndGOFiDOp3#m3G9`VHY(Hn{@`sjdlogo9Pv
zrW9yvd*!Jdk1^p|p;h8~Q|y|eY?G4h!X_SY==a(b-A<XF&p-&prQWV5OXv6CM6J5s
zp7jX$hH*IIT@vkJUg!()YmXV~GF{k}>gnr-dIJ5mLaCbZ1eZdwsKV2`o70Xqg4VjF
z8AmXLn`;qRyDJ@%dSIHrCm2@nM|gVvynTZSeFM{u)Q-Ua{J+;$T{=B+2o?ya0rP()
zkBS%1KifYjBWlQxMzfZ<b(igCbYN@DKi|JsUo-)9L>@s~)WU)#i!)*Ra`5V}J6avo
zzF>r1;c)W`BBEbT({B&i{DhuA9=@OoBZ0ljweE8s4)!Jv;*JYju76UrUH_0sC8wlI
z8PQ8+{J-_zzNPpnkPY0u1x3@nm9)9IA`=jzN1`kb$8-LqRoyaBW%)VT%B9t4ura@}
zpR%toBqBCMSgFgDGGo+L-`=%$o3ZGMKSBT|l`1&`=2FB0RYgMfC`_E0@##&xkQ4<#
z-jK2C`pianh(u$gVeqByoL^yr|9Z&OhHfAdTf4FT<OpB2KX>UZ8=U!i(Xfy#<_3gJ
zk7{8tF*?6rIHe!8np(N&4^eR=YG{2~-{R|aB2!e==yEzRs0tyO{xZhIAAzKTmr5J0
z)C|}Y_9Inkqr9JibsR!fPtMw-;rK0c&o#3}1pQmU^XvT`d;!OIQspDf8v??@&_MAO
z?7y1RWv7|R>Yt19<lpxnd-(sy<cNLf|0_M0Jb&aK+Y+jHY(^wSK-%k#jighu!H|Ci
zr(S_MRPoe32#}EKNUuDTCe+M!MHuV-VZ8+2;L>VgJA;mjNw2Q5W{VS6hP1&|U|V;+
zv5T@R+$t=#9$B`n3wZvS?rJa{39*}?=g<Dge)tbH`|-VV@VfNU^U8yyOLq-Gc6rb7
zhG^Yd<Ebi+J$sXJF5u*y-<->0a|S1_T>Hm$Ihl-#c`L|SVwE1*Pcs`@F!p*+Qytfw
z3P+-~KEs^~p7W5S9)zPjxSwFR-}V9bh}@|75SLn`A**7f?S?AK!Dqei&||qTOyjM=
zpv?+?v&~L*wTm==JeYF-B>@S5hD$Ft((0KWJrAT~iY(ME6s1jE>Ku;L%Fn~-e1Ax(
zHf@CV1gGtk<*soxZT_@a+1}fDY^sjakK?zFi8&V)tW12klpi0u3IxG&=E-Gkj>?NX
zG2Yyx`}0KfCBmiM5Ottbo8zL@TD7I6msqN!+POBm;l)^M+9}q%n#>AV7;)IE$%e5D
zb@)jZ+peoce~fQIn0*0d&9ZmQHH&@HNXfyOHuC-u6wGOP{$r>mG$B-^(3N-fgV2R$
z1v}?dfuNj*{%cH}x*s)<08kCB9CrSCLDZ(4*tu-K*`_#q`WM3mw}Y25+cHhpCrw&%
z1%53m<LU~(&a;dAnNbF?)>_!HmAXVDtzfL}9Zkd8&MT8TtJM-nMWN$eB{by_=GR|m
zBaMA|%urprjMzL|+_-yuTBMMfN5-k$5N)HLn?3~+EYMP{prW8KgLWBCQUqmHc23CY
z32)`1z$3zV4rYzcTm>>+ZEwxbvw>~6E|IAbITe^Pt*MN-y2t?_?kLq*JWPkSg;Qkr
z?wGD~!xXhJLnrTd33kp0qboD@|1N1c+~ioF#^_0?+5ZwaPFRbecBv*9s&l))>R*(u
zc3l+q4Ycdh^Aex(FSmeAT}3_*QM3M&!RRVImD!TP_RwN>s7lKZ%qC7Q+{(3-O%6@)
z7-f}t9u_}S_6`N0wKXSSlwI&a$p&7B`iV*#%7RGLn{y+Sf}e3tg=z11;oU+ka689n
z+7k~-76J{_TIWM8VH$P|rI7Rn^Q1k1*Ci_Fm-#pqV_PH;@)Z<rf37!xP@ekIuWrH@
zCjwh-{kp=?B9ZxZhFIx@^4c)$;BRLpBCzx988v5}!L|rkgzn5=jjKkBr&_jGIwdCT
z2%cNw+aU9#9eL|Nu3|=rvOh{>5$xpqP3`kn?XXg=P%PUV<2n<)350bBGrjD1kgwGM
zYMlu|if=O<=yev3_ijqN1;PTgSfoM2t3!q5GQ4JM)KcOPca&oGK%YQZ-zGBc8_Q>x
zWe&40|0F#Cw1iV^4RK3s*2A>g?dwfwECf<_g3`pvDXseNpVkdw6#~>k(NJ%+hRQb}
zp2imZUj%o-X)n#V*QOFVdEtoB3%FqwN`!@Lv$}ms0RG6X$ZNCc>+*=i)-`@LmXT(|
z>Est7IWB80uQb1`%5e@~R41l;Ar2_bDt4Kd1^GHaTyB+K<uFMXDRJhW*8KvZmw&tp
z|G->qAj!q#Om9nz=O4fRHD}<WQsVcMQ)9w+&38{bpjq2hW5a*O{!zhiC>h3-`?lAN
zmTnmL&Io}~`dRu0x?EIL{ncQYOP(Qa`NG##Gu4$N+lPvG=|`+%-yrL$E7C`0L$9br
zTkbCa6Aof_DqN=D^4LO8U=o7E6Rfsbi^+w~%D`hKO@1)h5Ydm|a94cFRHjwTBnIJm
z7(|)La`UnF1LdRo!~J0sl&cJPP31sGj=C*v=&E=D7W-xW^s-NGIzD3r=Mvt6&FATP
z$oiD9F*cEDS<*%xdITBUIto?4Yv7DigXAV)iY)t@t08^7E5u48?3$>QZZQbfUa^@-
z#rXgeB5|aBV=2BMT^PGAk~DH5kF;}0u6s3Red0HT8H!b9u%>!U1`93<=fZ+#)A}lz
z$+hLwOOY){k(rh&20V6(VWn}4ZXL3&UBu;~%^BM`Gp!SbISo0E<WecdD)%v@kLfNT
zNb7;H{w0=U8QV;toD}AGZjps9{9?Jmtt_QRy0k3Bw!S$Q2Z+FFw>DosyKmiq(jJEs
z7dK09*B9E?POdmtwbqYVM1JmME`(!OxRpV^q#a8zJ9$cG!6lRlXSGMPXR6Kz8_PJy
zHF(_c9V8nnpPeUiQ*nI95EZOCyR`%`eb}l=i|*#KWrLb!b|p>d71NkgaAI2%8%WgH
zQI-9sBu6jRD%}3?2=dUwA*}}&Dby3GFko%os=4TH_Vl}mhzSt8kx9QGJu2+^6?8>6
z8GUs&{toRMyrwTI+97a}t>7$_&+k7RcFIeUWcW@cesBHAYLW&1;TZGwB^nLTm(5s+
zaxnYk%21caiN^{sh3a?|AJ<g4k3EwYdK7;w^<jD!09<2s{Mvk?&q{iLI~=P(@scJc
z&VqbSxy+EdR}WNM>acu1*AG2~dzLmCZfu67JN_mUsa@D9=u9eh_EJ?)*LLz-P^D+?
ztl8tUpKo1l-U(4Z=2plD0Br(>72OPP0s9rtv5&alZxlB|bI_6$P7$LaXOS*3Nbg_k
zR2{8kao^zd0ep=?3`b<5*D9cowOMmWf_gFEKwq5%0ePSDn1+4g*+Mr?Kc+DuXFZ%C
zKatzQPnaTXdn{;q(5QcGH^m5}Rv7b~ay5c1n|eJ+F5J9q@?Xa;+*SYqeSTQ{k%XrB
z4OZK3+e;Jc>nAK`{q(3FdSI(xy#=+6{(STV=l=D$tmPa8=!IDC{;g$1DIi<06QH6^
zqNz<&b7pK<=uZWNBq`y;oZ#+#%UvbA5oBpPRftV~67)oDiv@P65uPMZIL|jbzs9Ku
znu&fguyBu2D=T7oUt9p9y8-8oQ=oswuoF2VCCggGbbcdO4v{vtlA;BuA0VSL)`WYW
zw1+NooBvE=ldwjn#A%Q(6O-=_EmdlYb(99p`=ef=7N?VSSfvLC5xNW(8-Z@X+Rs1$
zvFVN%*mE144dp0Gz(!IS1Rh};^fx+k;v(KziFF8+5p@uZ&tCxqU5HP&p4&-(+ZTd+
zpKy|j*!%-U85Op{mIQn{HhS3bkH=~X6`+0@){EM}36<KZpk*E4@lNg89{4Hi5F*on
z-n@`1VbLBq1r4cA&o3=ukGQu1H+xL;*0_2V3$8r*-uh@f7QmqL7Q|-ucxsJkiCme8
z=>8fghh#wO$6^O~P;^hlce%YE5~5(WReZ~sA$kzh*l06|hj00S^E9MHOQEbfNY9_C
z4Dl^H7PdJq<73TQUHn!Q4m04v=J3ldZyy>-2cLxx`$Jf-|GOVzU?06hg9dH(I7k#a
z9haK@BkYHkxL?u&PYj6^z31%d6C5y+fwO+$eoCxGX{`=8^L1`H_|zU$bbF|7{Aqja
zK`RO~Ts*b<6^2o&+weZ@ps3re<920KXA*>mY{?i1#=UhAZJlB@x!J)?Fq{WZcuPqT
zL)eObbm7v2h0bXwtOZ6?+s)Q9_RK^uo6OQC>nzla%U@{=42<IGq~<LE)HH_>6Mg2M
zpnNsxm?r^<0=<Bhdi}K`g}+ga_RNf6kjZlYo}*-^K|hXFAr7UqONG!4f;y<q`=cux
zW2hCS7=VyEtAuO>vIueO%~%st5+kEHz^RpkomNnC%G|{C3@gf&lfPtMbn~YvgwBmE
zT)l26ww?~1cA-Pqblo9C$h_RzAfYBa`K)2Fcj6F`TlGoc71N<SM!Ej{xs+4AO?ERB
zyD&6Ic5|%KuU>LhN`V@=dypYa-euHqZ)QXAPIHCm5}|VATvP<XgDVWTB04i)6X2XA
zLn`VL@hmq_-Un{sjbClb?EtJzc<z~^6nP46)#oEkl^n(PJEwqH;Tg4g=<w~r=;Rb#
z?Un*?x~Fnas)g;n{ecN?oHLbph(^DH7vH`cHk1$sjaX0LD-t<~``VR=u5Mt3pxu#O
z1|scwySA_7dZ=h2?P|;TCP29ehaH?jg!cMpty34G?=oUw+siW8E6vXF)cWoTzPh@X
zJ(3|YNc=hoM3G}NHu{5s8^Um8uR2!nk~j^J4YrdBG`z8@46GmLg6-HfegT_Z>-JY>
zn;Fj7oU-TSH<}WZy-h^byXj-GKtIM^!^E|W?GwKc++Enr!Xf=atZe_*V>sDQf%w{u
z{UGr+Q#Q?lyx|Y%D!(X#SIc{b&)o@r>9j}UO@mj(rgI9O6lvX?A?9DYechINnOrUa
z*j?KDV}2qZ!Ttp<&B@$i4im2*G}VxjsTYWaH&c0?x{^4up1jK_4$i$R?Aw7bTo2wI
z7o8Us_^+>H&+;Kpjl6KWz%eLDyLe-6zg8LU%LCN=E_rIy4%z%bp<?K2qVyYq1clRX
z=u8ZB_biU7U+!JP0nkMs*67mER>1iHX5)F+x=zRdggW`uxK^`2F3u~LD8=}x0?zoK
zuZS@Kv>ib|uy#Xlf&L&1YZVaAm_4lF8?PBvYooe*><}N87Bgl<KuQj;EZ>YWIYwW}
z4#)|LykTjayS_}$OPOFkW&JsB7_1Y<MgN{8dm@itOpbK1+d#og>X|!-nEo*UlQ%qe
z2LrNpMalb>A&*3_gr7$mK=$WyMt)AI<wqYcqsqrN0p5LZX6|D0O)Nr?MRX_XwdC|>
z{P6|KzRMlHiBDF#a`ye&<cRw&DYCTn7SP~yBY;ZY<=R~+v%@{We-b|>)FxHSvhKuL
zL!ufpwMaF>woWxdeQL#dU8D<el9|`zgr7&^#LF*a;D`^Y+jWeR;Y>Ld<h-}91)C~8
zJQbjr;LzyLe=|K>K3OeI<>cILw}gEwNk#LDF2t0Xg3UQwTS3GA6%@8ztctcdP7Q9L
zH|~-8$z8DvDX0gr>w##@`{lf3?ZVCGz}LgL?3m)`K-Ns2;gv!3JER^^2=~J#$}jRt
z(2M;I%8z^f!u=|km3-!#%Ib$2&H4a6^EmJMTg*QQzkQ$&-f7Ymy3A`2jqk+cW?&wP
zWcw_v#AF#aELn7x6HhabMhJ10qCZ9>Jc%5>z0_@Yk(A@9N<$Bwx)Qp2dth5E9!XG4
zxiF06FVP+fRL`MyrW6Grs!GH^A3V-4QIS+j*&mBx@JAW9H`#(dGDd99vx$Zdpk+fH
zNquy~N*|G<+(f<aE%=x;6tk%M^f+#uHQ6yUw?VmVHKiy<E#v50cpAEnG^A)Jb;-q#
z2y8=s_HnHd^QvT8&%Re{51QwmI<%{1U&oDkSrhrnP14{i5tj~V+%IY1@X2_tF4IP`
zx!(d5ahJIsC=ZM{Ig()byfUNeDXtuL{p>9?F?9!$KV9!G2n{SobTnW_gK_c5h9%!L
z1YLJr@0uJjF1IRTR;ke-hrJ%iM{Zz?qO(<nz@O_83_r*8lON|Zmn~~URICI!V-H;|
zeXv5q<T_dsZFT|<+o-un<+5s%Kas&XbaSI#UtyrT(0Ju95aCMFP$fD2&;=;xw-S!y
z&pOZa-tjE(df?tkeC6hOn7%xzq%*`z^o!I<rid5x`{)<`<%D?x(*K=(86=W?fYkB`
z%C+QV>Jp(zWr>xkMZfs(;FeKmk*A55!tc0$xg7wB*ni2^$j<+Qe1!d|_xL6Otd?59
zxy4WrQ3|K2fez9IM@2l4mPuj=8vK)E#jqE+elyH9M3}@lX*#3UVFMA{bV6Iid6p`j
zm_?;|i+9)GoU}$dvubv=GRN-3Y`6U5RZG|Uh7|O6>V_S~%_}(}=bHn;4MlFa_G<yx
zSu^9TP6$by_RDQ{Y4mz8KTheTg+KRTtsj;G@102P=VWO=g!g$-p6%gA?r|r8|LrFD
zP#YLSMgjs_Ao!o4<s8Wh2<R80OcD}ARM0`&=x<QKQ7&g>Bq1YtB3?E)+;QQy!FZ1R
z>cu3+=vOUMl=<8P_YgftI7n}SoKtga$Xs)ue#l|wWZv=feS^*mVhuScEHpo2x5~!(
z=(jDysi?24DGNDyO_?H|aAqB`hMWgAgu#Q>vbk4a&gfr7FeX<4u)DS6MxZURvxa_T
zEZtKiM-1)jM!@}Bm1}3SK@uceQ@v2@AUlCZRHu`;D2x=86#006eznxFj2L>pLC6qd
zG8G9b%+qAk$8Z5&Vh8cp5avs@*H<6RYl&GFi9&)Q>gG<kW@D4}iTsJzPy`wRtHJyn
zlxP#8c0=eNYou2YU=tn|aK!+--Kay|F%vg>b=Zpa?)-Lzs)Q*mB*+y^A{N5v4_m#O
zGsciyne(<x)E*mgIK8CcjVso#$RHYpp`26BX5{&<91$Cayjfo40L46zHcT^Mk_rUw
z3>!fYz9DM}yhd{D7%X*MeZ^3fU2EDn_9ufQEZ90ss(alQ@PG#KMRb@;gpoh~cLghg
zcdfcQ2Wo{rq@zeDfzn>_z&VpQ+x)xAm61Z?kLme2S+-EfoR-M1FQk`T=`=#!V&PW~
zw{s#3%29<_GzQp(%y`*SZzh2URI#(lxgC~w3!t(7i5bk?kD&0EIC+S~Q8%L$F2=Kd
zahc!5Z@{UkCh`ud5KL7qv;c#sG*O)khGO_cOJ-u*<Kf7DZsZTS@>~hw(lY`@r4)E}
zZg}^&JYbm?T(RPT&weN;fTs`n`D9_wQT&bW&?c1Hw>G#gfm8g%SI_@Qh2VG^n%e&s
zVQBq7sj!X#Au(42GVyl|0RWT{ahUwMwmHHVgtSzxL$`{zN)-%=2P#77X5rF>-IlGB
zWWx*bgP=Q@yzkF{3aawlAC$D%n^b$U!-tD6P$027@?F!e?%13|)TKZhnh~Wb6a5Mv
z>ZU%W6SmR&v@~v}pqy7GQT(!`#eRBb`VnT9oc9KaK-frupG(YWK*+!zrMd1SJHIye
zKyNAL??%#03+clq*|eHbPrpb{77i>CK^f||O)$c|r#SlT0&81|Uc>7I21iUBXnb6B
z@b+8yiN|^G@sbc7&<c>}leYfZJlXz@vn-W0{|^86_Lh#nhz_$|Z&0T^n>M^3H(n^f
z$#(YhA!JQjv;MfibW7CVATD{sZpwl3C@t+b4HtE48rI_WvwmN2HofR7-T%A4@pgbV
z@jv0y>VNClLt=#i@CsydLei8;N<$@rj6p#f5g9`CEfU~3dB`*+dbcJ{39vF|!|ei^
zR_eaD;!Ozet1EoLEmfxYJ`Y<vyY{z3Z8Hv%{%tJQvS!oWJ|9lqU4WmDqgo)cy1v`P
zy@BFM_j-_(<zUSy+2JN78mxt?ifWwA1zKj+=7_+<7zQwaJ2)lvrmQ7ees!ncQnYMJ
z+g^mpBwcC6rra6u@ZjL<>nmD=E7Qj}=?;U$uA0X=GH$TuvMk~6Et*6ZVGg<>B2Tl+
zdkr#GRGfNzAp=;e>3dw+&1JYg#MUgQj?3Eu!ud@2R@=Rz8!q%N9^JNivy{vt7gQGp
zm)bkH9JV%qrW`%`a?mm5sR@TNx}M#{lSuR4m;+%BT$L*|tzn6nTWohJ&Y7p3Jfld)
z6SPW*+}4(CB`=>7e;{OsN|0khe(fH&Ef$1m$+`~s7A&D+a~G|U2?s7eHc22}mZBqe
z7i<@tDzQAcIpwA5)?(L%;Ho!L)_{M6UzYi){j>vMy2+RRgfmbb?Jr>=E+vD5uksK9
z9fJ!dIz3aCH74uZuNDlXM8gnFIg5~^2*~Y}fM1L<tI;~<?b`WDsDr9eqeWaRLuzs!
z;uEAu$=ne|V6u!ZxJr}~%9Sqi9Gi{5LmESUPM#0J9H0&i|3*&0@{T+~ZyPIw{a;sS
z9uHObfbog3lOfVDlO@EErLxqJu`lr|OF|?{V~xoY$)qerMqJs2DNHi5mL*xUma%&!
zz4nxK>`U<*<5!yI^SS@b{eGTv?zwaCoOABE&qHJz3F50^!cMY|-nmM!0>IrPce=&H
zArqom&j-z0s*4Ep_3h7ISC|x5;sg*p0ZkAePGyCIwM5P70R@YBu8#iY($O-hatq<7
z^-&H6;)4y12uHcr`J^en&y_qIBR7xTTm$<)_m1;-Yd6!kvv0TrX1f?0Ug0IvDsTuV
zDEsCbQ`}>K;?ZJ=)1nJCWNX}J@#d6@VNN@dvS9QH?63coK@&_5i4+{(Ci|5}$&RT6
z=sVm-eR!Y9l$1ZNC%NW-nM=ziPq{ZM*kYceZavh#SxL1LkpyGg9PR9GwSMQ$Gd`QH
ze<;Zl*80%>LNN46k@|PS9l5X$?#T8Mh`}}{tj5*c49h&}C516g3{KpL+7fKJ7k)WR
zSU6`P>QEe-OL73eRyqHgmE%9|{%oi1&b#9(R^;xUYfhSd(V5E?Ll$hcETYA-#t>jU
z3LOSfWtV|BwCnQ^#cOe7KSlZB-d#sdlD-xV+`7Ybe|^2<>Y0K_G{=pe`L_K!3%;+_
z8ysZiYOr!?0YOsiQS$nNeTNp<6h2QU=3SZf{7K@u;~VCZKr;5}p8rN#R^z6JKNJ1=
zh(}?};%P7TtV*K=snD3qfP3R59K8;I5MW=D{Wh|M{{w$+hnw;%iDp}onbnK$LHHVE
zxUdSoJ4_CiA~>8qG{_kBT&V+^*Tw2=A%{=DoS~N3c)9evE>nU=M9S8MDRlgXoVVjS
z*3$0R(RaPT!(BIH44V=(C^NnrSsB7k0-tstVqGo#lqXNIu6Eo_P~PzvsLo*mwt>S~
zY6@Q?36+s4lWC25oYN$-LYHa68W+Lmj$jFQVxSim)<h1<xcVj!y6K->5IS>T@MM8J
zdFPG{C3*Rl#J*STzv<Yv?dv#^l6bia`vZJe+LhuT>lsbD^Y|Y$`H_>DlO-Z96Z(Q+
z;Sz3eOuNs-yt3Zoiyh*bc%5AcHtB_Z2rub_e@|>&tC>RoBQwC%-0G|(5!UZ24p?ds
zqi?QbY|K4tbKARN`xC{b_#Hy=&B_CIp$}b#1KfQA72^>Fp-b|hU{rp3U!=(GJi;TC
zq0(5fYkN#f=T}BzPeOFy^#KkWDJje#dZwTA4BfElr*x+$&KUpIu~=U0F|{Rbh(Wj$
zv_(I4iaFTF3K41ft@6hTtH})6TSYFYsjbS8A!4r7bT!n9m#%KcG=%k|wDiI6=5$-D
z1|Qq%RjmbTc}d=*(?rU+Z%_pFn&r_+LQX8<z2X4(3>2Zm$+DD(NU~QIZigFBv&n($
z)aUDrKDR{t_%zYhOSZ*ck;4AKtoB?0=`b+YMxL1rlBfIW{$g$G1L*TXRQ`Qm2Il@R
zs{0sSjk$%`MOJ6oAVKQ0szP#h$6XdpzSXade<B+(q(@BwV8-!Q{|b;MIoLv;$w-#$
z@gqmE0IN`9)6oW7nMQ}L+^_~uz9Au_L>BqEY}Lj%2Ui$At^{G>1@WFDE2#RWDcp)Z
zDZd8qr!W$6V^K3wxEO1*8Qs7p=eVUi5+S&7@*PKjo6tzvkF{Dd134~TckK?^vZmlC
zj^mV1b-}+s;@<Z@<9HUP#8EY+oYa^Lc9Zt=@bFrK>xjHbf<%6Hs#RVUFIAFks5MGh
zP!L|>T{8|=7EQr|xh8AXP&Y8;EM4vaj3)nF(rV?K)DOHr$#+zR%}G|}`v|8h*^@7A
zv7ymMW%S{7n}8YtQu!MG=$YY>sJCPmK9b)EAoFf4(ztx>c<!ws)3nrigvz^nx&=s?
zE$~zSA$dM5ql;~6*TuK-Ycuy|sb0L+#miZ<ly1p6Mrt4UWV{k~-S+?`Yr+=rv1dN3
z(Td<7)kqfSFsm*sMQIa@Gr3Ww;1qG$Z|%*7DT&3>bO;$j=^UYyO#(qMeEHxO?(6*h
zZLX>Zs~<&;I<pRwnwyh1zx<qC7+jsbjon@x5CmNqHVy@JajsLRd7v>}M=rH$^=fza
z>q*D-E;498Ii`*68}U=EbNVubprq18)D=RFITx26Sbj*3_O`TC@RK%adcTMf&Qn&r
zK>R*Eed%nujs-OBSPsG{p$-!u_K>p5m;Y-hejM!+D<Hm(U(drKk>w-MGyJEf=^f^e
zF5{yoI3*C*A57}VM4uRY)N;Tf^pb?f5i$Yk{)N<~eO3u8dJ8%+1L%$iBV5Yrdo%8+
zxap%sOc^wf8l4>$ue)cfn~j!qwztCss@A21$4z<RUcQ)Q5e9Tjt@;WLa2Z73iCg7x
z%9;lc36ubjQNiq$i(jl<UIoJ3kWdw(8<IZZzF(joGxq}4ACUVm$`MS@Y`4OJuD=Hg
zC{+(Q#)_?uvK(<?(M&(RpGC>!aX^*5Ro1A#+}&i4BEeRO_<l2+HnUnbp?hV4g&3(i
z*ZZxBn=Fo#NcJZgWhKNn8rV*5UR%NHnNm$q+yS9R;=cZ&r11shD|U$!+$aHjttV2`
z!n|$2Zn&eTCeVYKz+Jyakl;SLtp%PDGl_;|i(s>DJj1!`!ppS@xKbXVfmn}oQ{^$G
zlln1PZ4g=}{;Hq};!5l}=v{H(r55i6(|d`CaU-wLfYOL7fqA{*7n$vd=`WyDha6dw
zE;VpMIEh`FDe{w66G}twH7ahE>l0q_?8m$fBfztDI$SMTk}T{^z4@H0#>OaV@ciB6
zYV7^4%Cafdyq>V;8znts`Jc=DjS3T1Gvcpw@N@w$_bpYdyg8ox^KvYETXpl1dw|<m
zOG-zNk5V_>%Va+yL{x!q_QKrx?_xZ|=_Vc#aTo{w=T1e=8=ibs6|8eHZ+yAuFd`Le
z8TxOLsh(srypYrCO&3EYo!3%+lt;^7AFN=(kL&W=&mVeARJFIK*U@q;ZoEI?_4pjV
z)481?r#e4adM?&n?1*(hizG`m<ZBf)tC}M`G=HD=m4H}}iATy7$#16{_w7^DqjYob
zecbGNJLK~syUFm{73=dw5+8DwkFXcGR}vg+liWkJnONgL*_L)btFzQ3g~k8pE;Bbj
zjQy6>J9ojlwy68x!t&^N;zqKg#a#CkeoNhdKWWpGT~<zO`}UNZpyHCe--C_tf$FGD
zPaau$>D<{<s#Y0juDDh|mRDx}dXy#R?G`_kgZc<Bdn?35->P3_vquYB44KElrEUzn
zseP$Oj-T$%(YqCuAy52n-x??+le|j4VuWoL?~0!1@~$#;E4#B6JdE>KeZEz*X;!}g
zt!oHWRYAPeK780TcX*yzZOBaC_24b5W`xRt3&rKj;+U4@Esb-<=kqst2hUr5bX*-4
zU~DGmD@c`JG9J9!Hk2#z{f*h(7H3YI<EK2sQXJ-auhu<xwmjiwaQdd&kgnRhM!%eS
zEc)k(;W}eF+bU>kjjTv;go3bZr?>x&4#`8=E5pI(k`jg4Pp4LmD5;5iJY3OIsw|t#
zGO}9AodVbfw3i89l}lsaWhcT)hd&7Eg<0a`)5G3PhM+F1lh1hQ_#@jTf*!oTv{A*L
z&m32Mwg_9IJMgRk?F`E}i~c8bqp<_Sg=LeqCu>WWc(#VE9X}kIowd!(mt5_pXtn8D
zKUvh(kaUiZWy;~U+h><&$l}E3VFsOX=LGfX3n~u_=nEh<qoPY+7MC7f0_%T^i7hE0
z>3nGb6r}|m6!)i6^6uh2PL5ZyOZLn;8HYZ7Xgu`(UuD~Om>`n~y8~?_a^(d*P$q2t
z0Cd%^9%>HrYS2`keI(mabqHF&SjNE7r|<f>U82JwL|-|8BjUk(y+qmL(_-#H+VLJD
zJ$;8GaHGo!k-lyzZ&9PoQqPqlioXIlmy^sssajEXTfzD3@<ts4FRps<CAFhQlO|;^
z!cJcsU3|%`rJ0=&zjjI%lNpj}&99BEePL@nY1S!V6#C9JJGYU%%&VcO?5<*W41!M+
zZ_3sS)$vEf!a~kQZxZZqZbvnO(D;r)d9R+>Vx*pRFmJdFN9vd3L38-q3}`yOHlvZ?
zY|A!xj4JPx9acQoreW(0?||OF;!K-*EY?D0(G3+0@R@oY=hRh1(!txL#=O&bd7r?3
z{gZ_+ikCWcJT5*ox|YfCbjbVoq_=^;p{RdkJ*Kx+!ek=96GW=oSr)T+S+6345d_lW
z06wHzvN)4kt)75DpfW(_sRnHG+)*bH%COOcvdM!e9#g+R5KiEH8Vr!(6au2sAh264
zdgw^XAK?JSh*X>gOoC8BNSc^{w%ScKD+=_Q(t|uf0|f);(u`qsm&pny6aj#e5UxVA
zU+*AA<OpDVP?TEQpE2U9G$02*6`Y5P?SKOIzvH6+RvZE{(l5gH(se-~TA?)29ibRe
zst$N3%N6j<I7s*H=<e5yKw$;~winO&_W^B4{^A@c$=*9H^g9TW(g4S4>KrOft#b$-
z0i(wDQGiBD3#rjS2{Ke@7Ow>RBi-t+whod9)Ss!te+SGk|9vu=6hT0Zg4|Ap;M9N=
z%6ZMDY|=Dk5s*8SFaUop2H%T_`1=s8RY3qmMU|@cJClG?cXb-AKGY7y4?Izmr#8cH
zFMA4khK8Kd08p8h@EtF89HmN!DS#{ua9SG#6lk8J7P#jM{da*fx;qpPAeW^J-?PRA
zflktBkqv%PEWlNLVXEezK5D`=wEaK7Xl6hlTaaPbbxSRqmp<m=?w(zzH8@pg@8u>C
z2tlLMX7!7fgYT^e1c5|oD5B^8OCw0Y|6H_ojD~6r{6#SXH~j^uCGSnif<QtvbmHA#
zG!w8y5QOi|r-49%G$dWjE*Ty{{oTTU&m2+C3GJ0#6uV2pa4>4=dxJv|NQOr9MBFZ!
t8b!T+8K~W6KrV-uzBy@k&+aI4S7+~z1OiFW=m<RhMawV>WbWLH{s(Q46{`RM

delta 35599
zcmXt;V|-nG^Yzo1jhhoUwr$(CZ5t;%vDLV-Z8x@UyRrTBzW$%*{eHD)X8qQD*YqBM
z-!FpK+I|N{kHhydqKG{OzJ$I1f!s95Y7Cz-Jv8B4s)L+kl@0pru5$C4=2}*XWvE7S
zpk<p{J?mNx<W?ZN8E8||5$_yGT{%mdVX5mzNa+I~Q<?CTRIONSh&F$Bx?62sz3=I2
z|J^PdHvmXo=P1C1*4J5n@<i%=xrBvZz*3ZfflY<8`u^7k3=Aw8EU7LTFNqpi2q+D~
zgp#wewxrDvgcZkCcHwR{Sg(p&cv4pKqqAhy3MbPv&9nv9m~f!wn$+|9n=hr)4~*=<
zz$=SS{+=xXFhf`vME&M<t=j=C;p*8U--*M-r`8GE>KIDbBjU^=$xex2;-3*TsKjl;
zZQqNKd^<774daff>xtuB*-V&lkbno*L7n_B7Y3<AD5&bhI4GhejUxAJRK^@95EsP!
zr@2o_l!Hh>`)?*QITl4}o+U`kC+7NtV^Ir+v@x+1=}mn_DjBZ(YF4wDEpcdfXP4v)
z*mwfrG2t<e)Hx~DGe5pgk)UH}E?k`^cTP-SEwZr|wbDwS@GX1waWiJj6&Z482pI$P
zg47tLmCM{=@%z4$3GP?ELBG`q#NsUCm-<2c@5h1nL2eU&0|RsX_V2&ZB-PL&C+QVq
z0?m|l6wsAWKEGq6Hq$8nhShiKYAQ0LgH>njMqwaTizY*fW+>?hy9n%J?a;|*x)r!b
zel8a$wKVp9^myi3SPfl6)1S&pzngrTOiwoec7K2|Mv;M@e0-*992&Vf+(T@vqcZA>
zFxmQDGUkr*?l%(m(}VW9YoU-K`Pe-bfy_94D{$KKzv=9qcu>TutWxl{Xh*{fx@#5L
z&5z;EHP&8q=+=t`XLgF1+xnUcX+jwEqVhZXkR_w`QqtSfrAIM3*4Do<f>bAMUO=9d
zcD;;;FRAt~8;zm%E6N6scwrspDZkV+mFnQp5c}7C)6UsF==_?x>7o^d1cLVlf#Cs0
zjW`h6d5sUlyp{{1k}-;H4o!HwAe)*@(v&iH%~U%ANJyznVn$!=JH}{NB5R|2)F4v2
zZ5uWY(-p&$9tu6|Es9><G-EaBU1k65JdQL24W<xTczAKi8&x&<A>|Qc(Lu08sry~p
zenSb@&7|TWDbT>$Q3DM16iM~~kV{uFA=2Kjwb1yQ(kXK6g0woM@7PU;as~ixdJvj3
z&6qRpf!XeiXQ1qav^?J$iEEdNeg*Hmpr;*KvZn?Bo`*()7tfCrNDj6+c~(wtvSAtL
z1QP7pXa8DL;=r6h!{v|z*<QNZ7dqqKDFy$ql%qwhZidO?yNR0$M;~tlMpCK>U}%3q
zGAkLJ4&{Re)d#Wb(@X74eJGhjjJUBzEAj}tObO+%*bN8_?|JGoVF2610~Wd)!-rp=
zDIy!DrSgRN1J~b^pxRTg{f#e2v1BoN_NIoydU^!D)u}>x#6dBeVy||C_wo--)2ja!
zx)S(bGuoO~%h`j2fi)xrq8k7&<k5vN_(TGW*5`s?pXsW9erV$`Cc+OvO36y%Fy;fE
zO^Q3_&5S&n(>L=6MuMLaKW8AxW(Q!d^P)Z0(NHp2FUegjj&fYC(s?}mzg}(-{(!?H
z=ElbAtMdcc>@N_kaAiPh9MT}nXQbu*1YF5^WLu#(Y0sdrpsWsF)+(T$(M6b?0Bh>m
z27=hAC1>$8ZZYm~DINWk4niDk1$D{0_xznD$;ROkFI}jsE>(zgkw^!OaA<PWBaI94
zF?BKB_vkngL&R6}8P!zJOYfjw#AFqBj21qnX5N-goM-+t_Y~r;9cm0~?;--YrrGe&
zFq~IxX+A2u2J9P2O90SRQp*Aby1<)A5Wzkdp<#mYc_799KG}$T88>I!_++~3uw`y0
zVJXjuGlqyX2_TqiG;kcoCgiNTzz@^!S=~O2?76x>N97>yG?{wGgV-PV4%0FZwH)fD
zw0D@;2$4gBn0@1<uw>K55bSY_rq$0Gd{SIxQROYe$55{~Ck4buZxw$6j64YDEFEdJ
z;Cvc*g39!R*fxwu!k-fMXvVBwg~f?B4S3vGoV#u#mEUX6K(o#`9*!Il>%WWv=ioDj
zjHIo029^OaYdN*V)&Z==Oa=S=1d1Y6b2KI+L&Qs&{&J-nokwsJDk@g@OW5N31O-|G
zlWv8U6SLN6aOU?3a+uBN6eActMh7%|4#}T1_=+G~#4{P+%jY4-rv1z!NVxjd++Qp7
zcqWC<&5l9m2HISAtltymnr^rMOnxt$8O@-wMc)TJMQ$^_9Yq%;c?29u)mLJ6BS-Z7
zuib1aVbXPygnrlpZ4~AWG5qxf;hQM2Zv3$^v2AJ4XSjZG{Lvx)?Ig`C%X-zGRy8+1
z=l+}Nl|}ZxK|l~4ljP=ha)8i`SI+`cXbfw)^1^59IO{HJ+~;-wxP$>r+$nf>@$T58
zUSW}VIW0s_nL^c1Nv^EjL=7qF4P;`Is)9!95lYocVcF0J<dds`^&73w%HggXky9vK
zu-0nuRAT|h9h5Z}CFGOQ<apBo)|qFJUQ_Gh<`vbBgXltRR?HIV5tc~|NT<KYAz3sf
zYO3cp1u~6zl^mVzWf;MOqW4qh&C=3j6PDyi_%1Ymw8*fSp0a!J?LI0*hz*l9p1-_k
z*VQrPh3@JC3oomzQLYZ)J#Z5{r~QcXQt}pS0Qz56&~D^ovavJANbA=O%({fpps$$H
zD4BD|wmdH=J4=UQdP;cHzo|q<$Rc4T=pxI=UM#eTQ@nfQymrnVSyOL9)-IW3A_>Vj
z5t?Zbky7h<>L+5t93s9JzDL2o9!F1v7({5tVnQH*h(6iv3=U^fmLYi*th#qdEPla0
zDO&oIRGcCG7o6cFh<cgLWOyc)^a!~|hJ3R+gA&3|RC1Z3@bW*&_c>pi53!Gg`lO5p
z<>s~8EEra&BJs!gpqqd1U_gVLJArOS2JC0HXVOIwJ01j{>DF9aIH)9v7v=E_nZm26
zF|3Gy?SV@z@|xR?(U2$aq+eA$r>QonwI3C6ZnKiRlp@F5X7P@oyqbh0O%m@(Qi!@*
z8si%kecx83bfmGKH)fgPB=L~Jvdev)5FqeP-SRhv>`w|4ykl(dmRdAuKcyi6{e|iM
z#=Ary1-8D#bUc!TL&t4M>zC@D6}C!i-wZQQ4kCBT5-g`eOKf-RP)x-z<S0!v7k_CL
zGn&QQ1{`4sd$VTt>}SR)c(N$b3jzM<0`+6J*!8(E#fQiOLSuet4l<g}3DpEt>BrT~
z&36eE!r%TPK%+;VAvCwy9U0deBBkGpj<-g}m?REMjOvyz(G8)QliJ;Hx_cz_m3y~>
z%WSfXN-WycQmqvZ;5n`GPv4BC35ktYL-+=2GCQA?NS*eWq;E_uJpvgkr@G)Kd%*rT
zKTwk22k0Td!1Q4L^IUDDWJx(CWWa3oQx9}AtS>%Rvo%*y?WOuoM4{huN#Z~1nma9Z
zP!kFd$(sCvTV+`k<^xA%v(g(?p`QG<2RAh!J!V^?#++UbV0ygo31{{Rcerx)DQ@^#
zq;Mr`7Z}ph-!^=5w?8)Nw!dBum%-TgzYrM+`PyqP9%p`M@DIq*Ef7c}hXRT78dD}u
zL1$;F*pu2g6m648)!bR%!_+7;2#!ug<oVA-*1}Z#cM}xp(I?B>O6h$O?bn;Bx?Y&)
zn${y9MZEfd2C`I&bIek3u(Xf1Rb^r)#yYO&bx3Y4wHGzfmER=HB;YWD4Cltyt^8x`
z9YN!CJm}*q<>uF#YcnRB>Ol624DBr53pKm2^|ZfCRZ0yU6ajCEg%$0(!U0Bil|z_+
zk61=hDdgM1X+&uK1O0u2zk^=7AwV<Rzh2o3_0n=s)fsQ9XQUBF3)fH$v9&G2)X}m8
z+4FI{E*WVf2vsE(G`ALGG)wF%Oq@2ILi^k|7dG(`hck}=kAL%~2!N{_eO8wiu&fvM
zmua&BgF=#;eYK^+x@f6Ps%$TjF+#M%@Yo1S22s|PiAurRH;)Y1LJJWbVxZ`#0UgO9
za9!Fh`n<8m33;BRY3F&f6YE=SR#g^s8pRpjWmn1uC-S_AGbOr>HICGR!sRsG4ZG6V
zc_NbNRBcw0zFNbhTHy8^8(fvBvVrxLJa!s<5rCbEmKUo%gf7`9*n0v0v2=}YpV=0{
zn1;T@L2bU&RGQ=xpLb;5UgFLlTjRH$;@U2%DCz+sz4hH(G1nZ?{`LwgX?cyQC0CCb
z6BG|}iC193R0HvCp45r?%9a&1Z>Gy|GI8iw=@}*0I?gOxHIPaqwF;x1!8+by&_UO1
z-`m2(2FV?bqA*d7YFk5f<OvBAmTEb%4q+Ld+#|Q&sLr~xegj<;YY$PUeL7fTmiCge
z_>j8VJDjGR3m={6B5xo{Ue&H8jL<!T1X{|&J#wYXS2^c1*pFC23S`%CM3%?%-RLeV
zz7rF)|G=8S0Q98K+AJp?3jFzcV-S?Fd)ZXZGB0~Wa876{iM_aKB(^WVw!~-EK~dd{
zgg8D`)J9W-i_=230T__e6f$WUh|kMY-m(v*Znusf6P!G>)L|B-Y5wq{C&9vLZFLCG
z8)}NgHFHuKWX1;3yCTogx!`o6Au_eY+WatoQKZ6c0HQe~V!erS>zRnDMoFuKn^|z?
z9l<6emHcQ4N>nv)r!@+Rj7l7>&6{(i#2V#{uKOwOgquDAYTyLF`W-pCx{<ecEhf*k
zLW(sNw<rJYk)HZf*pvAZwcdPV+;KJ<u1u!Y;6QDj8!0%iu57@l#S9Rl{+D)^6L~L>
zn>QfL3K-A*YNtC?V9ZQEY|_LTq&ApvuJyWpBn85c=-fSHg)cc@Qxb2RWbl0CmBTFP
z*ihFSH`mmz1YD(VLUD<`)8?Qn=9IwG3#45WGYNfd4amkjA-<hmqv;oO%A#fIgw0cV
zW7fcREn{1=G^b1>DQ1p(&L7`Y)eB#@`tpSD1Hr|R)Ph@*Da9<j80^c@Ik5*8J=0oS
zyq0i?xVNzo4mkOLlKUkr>Bw$L_zMgCIBqlq-@IQ=wAN6SP~hhox!`x3*;x_Q5y=;5
zT`a{~&)Pa0q<_k39POgGaJrK6*`6mIstxxSc=!a!kbYwiQGxlcDra<RMXPX;-Zyp)
z2~=;9HIy?2w<$o^Tn7C5<84I5Yxid;=tHSKM`HS8*QpX;;-1CUA4W%qeAXTDVRwO(
zD}CTGP)gVBjI~|4u*qCuhekI$QX@18X}Qri_PjX$xwucu;U>D1#aFxs33dk8Nr*$b
zG`|%*#Eiimqn1>1=%lS1V_f-FlP{v%1Q@SSAb^=8e5R`TC*8dxSr{dj%(){#w=%z`
zi6HN-u4ac@+@kLxUwK)1hZJ0mP@V@qQF&IWOY^jw=`E1-?lhg2?J{%7P48EJ90#7H
zYSfAkB$65j1q6PfFAhi18iY!#7v8C=&x1#)4I-<$0x`=>Vx*`F4Gu&SXEN<I22dV#
z^L)>g|2vJ)5+B|Ehy=OQTMK8Rbja!X<q7BI8+hDAe}Ko^{`&9@B%k^g8fWYhcqgbt
z-tbeZvMfHyB9iN-w+F@H1-ypQx@HKrtE=~#uK6*3ymaJcl%?mH;EN-|qnK@fH{YDa
zNOu{XX!8kn(yuT%{8`$<KUzHU61WBdsWb4hTgM`R{;n|aM&<m8&SfBwB!*5i9x1{q
z!K2g@Mf$No(7*5#y69BhI-a*_xNG4ja{Q6W!p~`CpH4w5pUknpkWItGn$ZSzkUdI%
z@3Cgj5aX-xto4hHLOxv`<tIyCrLPG8djqcmF0(eE!N82agZ+CGAs{iplG>6nl3t0F
zNg?2M5(4E1I2wc888$Z-+5%=NX9rA!P=ga3JT~>p8e3%6>5?3YDS^F)&$T^Y`8V=5
zPA&=~&CTWM_*I4JIqOaM1Zz30x;1noR|pc<f-}Q<1c0Mz#;2ehT+0glOUV2}H@f~q
zz5ZBM?FaA0%1xrmZNM!L-!PFx?RX3|erTgDRfvO3RHxrA3`W#@%x#r(zhzYSqd$B!
zQP<&vuL^G+ey`$_FR;S+rSl>@@^mG|ZQ8BPmP6{4>j`3)L7*WxfRv*{=?vM=hUOqo
zk#S0qJJH7wZHTnL5UYZ5!=7N257txCDCYUe)++1?`|^web;N-s`dr~|oqA4jUXiiD
z7=C{K*B@Gur9%gupx^$j=?CfanGT-08hG?oW9ooKce<Yb-@p^(piU)v`CZnV&rr${
z)PX~y2Uf+pfEU)OJ-q&Cim$|NY$5^TozX}&9)6i#u?%Ddw8r!B_@n*ePr_N`VKpag
z87tjBOw3~^BI^2~_?rU|MOe>=rK(yS7P)*<aosUIc6n=T3gr=!wRqM?{EKEYwzBue
zvs*hGVnc#Y0r0pv<SVfSFOZteAg^Pb5o;3sg4{A!9JEB7{Ug2)uqwOjc7`jD*+cw>
zJ<B3-<qNJ&ED5O`d1nEw`3^WwvCJkNH@2e|2iGSZ#8^%5!!m_w)uu&qyimz+i%x+|
zm0>L*(R2dygB>lnhC#EUKvDK~i^q;S9FBiQ`d<sd4FvS^$o*S;(~@eF@srv}Wq_*x
z77|5(|99Nv7$<CwZ%TPV_O@oakV9f4q?VG7w1TA1p;>NW%9cFNYeWMh$Tu9%LP%+%
z=)eGhv1fOP!_-PSd7qpouiPi+t;eTa!XB__qrly}(NXQ!f{f$WZb$gD=<=&lDK&;Q
znBqach7(Kox}UIVeP|n)rW=RV#lS0gziqnJYVL-9It|iA2$6=DK=W6em(furKii;I
zX1~K8m3mt64ZZ4^Idx9ZDJ+rP@Xvci$uwis90CGDc^fFFQvY%o6WAIo8D*>*IT=P-
z%%TKlQU*=pA{}$<I?MG9s>*ofSQ(9xz(ojw;|Umgh6J}bA7P<*BCW+25KsbNB=|G8
z?|1bE8s$8~vZ*=tS*PASKA<hkk0NV2hXsE=)4~(ILcWH8|C2t55l6UG3|)k=`7Z=&
zV@Tdl93ej8?y{J?!J}a>p-}0XIYv<I${2yb0aX-_xb^1Uv>E$nj!*<$tCJn4QXI^I
zM`r%-OiK1AOM(qpf_#=}0^q&!d8B;viEczsyF#b+;PP~E#-c`*Ka?M$+}=nMFG)-y
z9o}?NA9bEgj#Uw}^6ft6{DV1(;tgwvKO$q}rikKoG|?Y~P@Qb8$t$?cf+<lH5#H!y
zKzrtDwloGQ)r7UZi5FW(_GG8t+LRePd+Jg>;^y*PQXh(hYT7Z}DNr%8Uo!N!(Si6r
z4K^jfq?9A1#nLIQ+%{^k#!L%ZY6ptE4=_v`tlqSmjvuMb#i${aVRStuyCvX+IuXKz
z#GSW8?01GZ*-fQWe<y5z-ANYo!RiM8;b@KW5QbtI@#-Qi2^Rg1Yvm`^p$`d1bT_l4
zzK1v&h|owrJ@bk5X^klc!_APcAXx#*k<M>A$BXNpq3P$Xa=X93q9i~s6P`*aRUiPY
zaf`iCL8Bi_+UDfH@Q8CvGc~=S&+CYow*T2!21@f4s>xgt-P)0cx=U9_#dkYL3$|tb
zG5BB07eQi^to-YEX{i4;2M9_DV6Qwb6AFG({0vxN>JNFm_A??OS{-FfF-4+pX!**J
zrDdFscit4Z!OI=>T}ouC{Dr_?xUw*RFv3tk*iUbf=bd9Oha)fZ%ge7%h=A{vjL$B9
z9|b;`1G>8T@<A7Zh(Qm62U<j!9?Z)|sT7i(LZKVP5hC^?OrlO!;}g*9K!|GEY8Wvb
z^G?{Jr|_0$cCllc!;DLnkKd}1usjF5<e{Z1WvDR=RCOe*sh`B%9XDnLxa6Gh{?lM4
zGbhJIsGgLV%qIurG0Oeup$Ur2+#?Oq=Y<mTB^#Qox$^MacP29)8%Fr$h(8#f!zCim
zS-B$^6kE9$01Mqxber_SK<NrUb{LlH;%{!2jHS)pEz>xR7u%D%NpViY&*K;A$-T$w
z9Z$x%Uu?A^EC(6V<A_ZrwcBTW9`hdl-*{@=ZHrH0Tm9UNP^X3omCW*HX6wsg8a<&A
zwhme+j9CS|Dr;X8peup}*bM!x+XWQwQ{z$PYc~7-#w=rX@p2?+Fu|3O-*%>9(<<<u
z$jR9Efk&sw$rEh%&H=W4a_XsF6@(7I{jYMwoGiZi|9G(<_<xnlK_^SvB85&8pauXH
z{=;=PI%n2a-zt9R(@5*Ivkv|vb^MZh=&0b(D*7X?9_@O+K1TjFGl+kNeSR}w3rw`!
zL%x>4zG^1(Z!}L_<*~Tra=BW4+dp2u0$Va-^yTGQcj%ng+2F;@DRMY7*Qq%xzJiWD
zNZ9uQo$CZSk`?ac{T~00jMP9f0i3Tr2fdnSjw`A@{9)H60LWL)uC0`2o=;P1uvI@_
zR3}4*;M*^pQu40fgeb;Zps%4*7q-AURPyQB08&p*uUHHbS0Q>TWN*e2f_kr0^cpZ*
z3QN=H%Iw~%$N6l+k{?^)L$$Y%_A-$3H92BP`zPS8ZZZyX^w#aNVOgX}fP?WnW9F29
z-@EaYn*qw7f<ZyYvB#ne0CnkouYJjvcvG1}5u{}&k|<Vt>k&h5oMpxWBA#e?#PktD
zX26m3p%kVpwm5XlC-p~p-nywIzzH+dA-lAnQ6R7JHUR`hYwiT&fgSm^)$^Bo4vjkI
z?JEzN+cSO;jUW+@7uJ#<IPxl0W-=q`E7MOxJB${`Hetjcs}2A>sF_RJ&x<l1>}@}`
zpErki_v<MCmWM8~qA!V$%PycKd}9{`EEdjoOP7d|T7GMjZt#lOID@)fM40gZ294qE
zklY$ZDkfOq9P696GTeo%`3x#DKWtU(4DpX$<<GfSdJWlwt$v5Y1CrB=q&#Byh0!ok
zQr!IKj&xf*P{041bCG{Q7eDDYtsqe8|K^;6NCtw63d;K|kLJ5niWw9pCHTNM(IRQo
zpF#hB&SN_>C1F#LcNsW|9{#}G7f=roDaI2ICVrS7#cZ#z0KY!GAOnz|`*toL9~<5F
zC3JQ3Vn6H*TtA8#WY^LnkLON)vN0)d<O}BzCGh1y<%jK2;}!zbdo~ZL`-`^~f|8#g
zPFeG-s@&@8q}rMvoO^f_Bf+)eV9pQn<qO3dl_@ar^CwGx4C>ejENKfxi+nxNGD4@s
zVrvEp6bVDinItjR@u~yh$@(FZigkzWl(~1=MLJ#)v$Kv*gd&745|O=1Tjl%qPte3J
zh0=w*G_2FFm?(iuxW{*l2!zx-LZL!spA}B}f!G$y%KrF7QmgN+SKPgZZCjr;%cGn7
z9ynNt<>Ec#9lzo^cFldxJaVA6eXYZKvt}j4dy?03?+Z`+uE=b}d!)D)nB4XPhK3A#
zp<<z}LLQ?f;AOT;xd>X-ppUpEj+wo3VX=27o?w1;c=&Qo&fb~4(ij=ZYT!>AnpFz1
zBb|}Z{;@PHJa9zikE>7Br%{#QzewOt7vn}y^acOl$iJrlg0D(S_@_|;s5Ag{QYIYS
zfAl>(qHVK_7U6AnV>5r~|LA+6;T|&KpD^YrIx$>QtLFw55A&&X7MG{b*N=UQ0IvyV
zUw%$crO#50wk8U29fO4`yRK55JOdX#f(|3Y=R7(}`cMi_Qp&b|lKwT+C4JQ=5<jO*
zp9IP?w&829Nk>eegqxAkR7Q_XQ@wA{cC`-yR6f4_#H<ozEG{h3=AXQi?s(LPe9t!5
z5><BFx*FiwH<OXdFgL4+;c5!NW!M}O{-~Y8uhioVn!KyKKh-GnF7zZsB?eGFLeKP?
z6;!9gbq~LWiT_Quuf#KUt361yP#2_JL?VRi8bQ=s)XxaiTs?f-xcA)obzYb8OWAKp
zfHv4aqixir<p#a*EfBZ$Mg%(HEw_%P_hsOi1CZEO@`8l)(fUgWM+*u2{((4@2nmOt
z(m_-N**k?}Xyz*X87?lhNaaZkW&XMC{YPkj0Hs+c_15sXHDN>ByBAhE90YZl7x51q
za;Aj5SdC2JE^w0|yDr6rBjc=bh}9J*LOkKU&~1Rxd83`6Bd3j)>`T$9z*DN9)&6l0
z+MWq9TPa>#{)41h4)S7exxAw<GVN9e2maUS&p2YeA^0v5&^I#Urb~@b-_eSkKX_Hd
zay49mmF)<(^=CO5srC`J@Pz<~d%9Vx$SJA%{?JJvN5mB%i)+B~2Blz#XsG9#+y<Gh
zz1mZfnQ2F&fp#0sFU!OFD&2C&5E}!XQz~5t8INpvg-@|<l0kSr^_2}<!+Wh@3^vEN
z3)JXkq-Ywj;ML^#-%gg!#<<o&XwoQX!2htKfwMH3>p#&LhW!646)Y_5zi5{z>CeAp
zw}uuoskR&$7^9}AgD!#LKMct+&?u>DOMAw?hz3psg@O8R8Ldeb|5M0LR3>bbNNeTq
z&?b^}mHzX6`}BU1{^QVkv-a<YvI{o{@7dg$FC`!IevOywQ~keFSzgBzTvuFomxN#M
zw>W~x)`-&td>JP|l-%95&f5EDLEX$4k0G`WWj5JMAa-*~`AYlG4ied3J)tPG%i_lR
znWIhZ!5HKT=XuQR8*3`H-Nj@gzlr+?HygeZxbyp(i`=Soa_kLe1-E%sO|pKpKBh`E
zEv%6JIW5zxtFwzUg;QgqPe#Zg6#5l533Lram48M+MLG?yI+M66U7XuSgL-35VsxI<
zLwA=F2+RC8cOT&&Xs<|~nx250RH;qd74-LY=FH8UG8+OF53?jCiJ)_VR!Whpy+G;i
zqEZ_QaW2#7v22n&@{Vb~(r6pwpm7V?JeFD=L^=1x7JY46PiBZd`&*ZkjzcE>6oOW(
zwWn&GyHvmFvE?VmzkC*&Adf(zc*`DCA@oOJSl;jSJg-b-D40IZ@FQ4a&k|H5OC#9q
zf`#+%8SKoH85os80Ffwq-F{SWbGqlC;jWBxLJyjtr&*jKRJ@p<(SCD>PN1cMiztKb
zYW|U5>Q%Rn)_%zu-AT5{yAYuMj+w$85$K{Vdez^m#;zoV+#JCd9m;sUQoa~NaE)R>
z6yXBI;_Q>Mq;W@brlzEpO`qRWj5pm14Rmq1sXW9#u)o`VFW*89PK>~4CvCGTx1tWY
z{9={=V1?>h2&^8)pYF2qJf!Ph5+*h%nZ+8S$|7Q>-Y8h#WxTf^G9TZd3h!VuvNDE|
z9y-emPiz3hCnH||d7+l<eR(k1fTbS;2I>EyK)i|B2g#`<x28KuH$~QV=DlTHk19Dv
z7*UVYjX$bZpIc|!HeD317dvYlE@g-%iHz&2YP6}gY0<fy!M8VLlq+%T7ErglQY<#B
zW`3pHpTqAmr#LRTQ}TlvcxKp|MA(`Oh+Bgc$ci*Ph&Fq;azhgaVf+7lO-LF8-<`{!
zO0$^l;XR{wJ^km&gW1z#cV6?$qqNRwvISpS$`$-mHf(I<4m9ZYIeio8%>n_tm!-RC
zBoyc!$5#%CjANhN_909WnWV%KRTU2#QAV->1Cn*iA!Ze@m?8JBxE?rgFN5rUd1g=s
ziN67=5|^tB^>h)Fd5AS@qoatxMn+D_ul)68%n4<{z0OF)n?9sj<E023w8#uGM1Qa7
z+hZ2VuP`bnOyy$h7{d>qjro?Rv343<HLsMbxdg4(&3NXq@&oG>>|I&uU2%?xC}DxF
zpT^2I0Uu0M0j5@|YtjZFj}NZ^@xsx2cPsaaT!>jyC+t}bPE9<mp}Yg20_Qu#0eYX$
z`O5yvz6r7@ZmJ{g^E1?fr7u(jmgG{e!c5?l+O+|OB7|QWkA5z)F6Y`Sez&wc-UT*n
z_rR{EBOIYXf0HKTT0_XEh2&RwA#09~@DUYG4_xiB!>4bkEz>hi@}A_+AGD%ji8KKH
zp%Vw4zioPd_i-O1jGZbaO`viaOwP!P(|(Hc_z&UrtKdn^g*QHXWQ{2qmQ9gya^&{B
zblmymGR18fjlJsN2;4Lv$D1L8fBpBS=8??2)&0{q6WIUGE}qLt{|VZ<JGvU+(>=+3
z?o`wAx1u1asPsA>&iWjVH`uy1WJaT8GEQmO=!87?g(>-zY`bBb=?hqQKqpvBtGeAE
z+7ucF-R^+2?(m0gE<xk^1>K3y<J>EOi>q~>o{xw9X|Q4=W?rxNXZza<NBPCa)}pZE
zer<j{1RM7{(_iHlz!mjQ%k!-F?;LGs&abTn?M`-KHa_-kC!piI^3z+*R@HE<Mdb|?
zE@u}Pm9=|Xqij<aegk$n=T;tT-$?y7HAdPg{C?_qk6a%5MPi_{vpF;N@{9lTIT#=~
zt8P4Y$N@lZ0lO+sq~xf&c>p)bisqp@eE3?fM_ZnnlkbZLd`BGiSoC8vDpx0}OJ6_C
zpva5c{iTPt-%1n5oKrgHNUR2t%GWQup}LvfsI6@Xpyk>)Ol{E$^XOyVKxYiYy6~&+
z2|~IJ%PFAe33X1$A7$D=Yx&E0R*<|KInpiG&)jK)STfXMn$tSGgPYr0vI78_O2RTD
zy4_Rl7DgKZAu%Cmw&V1(E(MjC;VewEFe$Miz#odii|o6^T->Y_ge8Z>P;a22p)Tz}
z0lQ8T54IAnyt8w+RUn{HFC~4Hv<YJG)D;>zfK+)B+D^%?{S7`p9O<8*4c;zqQ($*#
zL6JyD_mtQv<{ov(>yi%&!3K?gktLA3s}E(Z=(Yj>{4+uu?1o9`P*S=nPEdDtd*$bn
zeZ-Th)bp^TH&bxje0sy3p!1-aCqOd8c=K=?-AA*XCgOY*vDQ>uA=9KzlU&kX>2b5|
z14z=i<m*(23b%MFBI3!cGNLTF29+(tnLIli8QM|BaRnU#$}uy!JXPA2ig93=r^5Az
zJq9q(N?9_B8yC@*Hh`y)Xxcuf-8~0)6k|h7JjA!q5UPTiDsHM*c7J3lOng(b^uu@2
z?;=d`8T>f}XL?;;iA=oO-Rix!N9DG>;LY==3EX;e^%hLO@v`4DFp@;umy}J}5-Y`Z
zaR5s(l-wC{_eXR1OOQ4DlhH-q5N;58jyUkFNZ6#{QgfufD}L&3A%GuSP(Qpw=BX*l
zTmm{wNWv-Q(pq-*Qs(|^XE?r9e*^~&OVUmahei*X4RW)BQ+}Gy`z<x!+v<ZHXVkof
zhEr+KkzK8~>;xH5wpUp@o#59!*sVAyW)wEs?HYcgdJjd8-QACdJ&(xXR211}+YSu!
zK&}%Ei1EaCyq6%|5~Q7cLuPayBIFskU79Zt=m~p%Kp<k{9#<~m*Pc(HUaCLG+_+}w
z{zC_HtyHo<)2&RWdw_H%ZS@bIq{|?A&ST8qQ{wQ8Qi$`9!`s`pXkr!-Zi`_?VC~Lb
zf*i!(d3Uj`BHTfvD}&JeO}6=jUa0){5yX&qBf-*DC(DQnj8({t;O{?<5p75=4O@zU
zMG|jnN^68U@5$%5t%T2ch+;kOwj|dKSM-JI=vh#%U5n?t{`e0k+8znD^8S;S-TzBv
z`*?VOlhXZyD4$E^Wlf)rXNw}=^NkVJl9k0!dZR)kgLa%c(u-|4q*mqNi64c05s--~
zpTYQ(Iq5v_m?xeZwkQ5RO%G!QKvW`hMh|mLQuNR)2F#5(yp$hby->@5)<$$Ktl~{k
znH)yrT?dQ}+65n^kaQC`dlr+1W^)9hgGIjsA^1j52nabAdQpAs?ymf57(sB$X+pt7
zMRoEKmGUO$5~ldm#@%he)@?*$oR?`c*uXJ6bxpCfwfH~k=KGAz%*+_n1^qTw_+nUE
zi6gAmF8UUnTC4q)f6jvOMrTG?zw>OuD7S@q1->M(LU9GgJgPD{+x5BF9Gd8KyoVqe
zm2fY<r2oVE$JLSWKWMHMF*V<YuZ-G)FjXrkO^m*|l)_EuUw2tDUO&e{S)<#nMM&W+
zvx#R?I>9V>Ty59gN2I(}cvN0?=Y7J<Zjx2AP=5R;;wqN0$}0a@Nag=-=kStp(2<i`
zE0}<8DmpIn;uxRo><PvbMfrtT_L16>#KvV((u`8A88gCs7>qN4xAm#Z^@3O)9@+6m
zBVVOJ!MC;DUPeZ{?Y9Cz>;U6#qP6(krN`9El*eP%$JN6)5RCTsDC5RjyBct>(d$~W
z5Z_`Iu6-&C-Bd~-vMsj0G1U}bs1>7bM;aJkH>^f?60wtjLpr8)d8--0RYJIgwpAm>
zCE;Ub#jnXJ)?NQe-^~+l0<Idjd}Kv4$0!{duY`lvPG6X>8?xLbR-=C&?si-TH>7A~
z27w(;qeKg^PDlJuyp^YYr(6^+=6&oiy>)Qh?4a|S>faZqmzRVv1AQRBa6g&kfPkOV
z7h%LR&_meekse|MF4+_VKE}mu7fW+(r75cldB`hU#?aJ=;)P3z-CL%VlM`Dt`H_5>
ze~0v;k1|&j#3(0=)O$qRhaDYDOfk%M1qmLw#P}GQMj4O1$h%D$gJ~Cer7`>So=kB0
z=ymp50wp1o7=2?zxcZIeZhpq`NdxN^7Kj}%A9X&d>b(ifo<TqSFWox@B~Mw4^x2tY
zFwMqfPAz4#-fK_fio}e657qKuyn-fPh0i9bePva5b~`+_An*tMSr9yF5os0aJhTzj
z?@ZREF}L>@Ab-?}MswSk;|jA|PBi=6c0YaRE6a~%@zNVF^d^z!Sp_lIjRALTJM?2r
zP;Z~}5n&=EAJ+B-@9$>W9b<bl`KyaBBv-A9?d*?(ja;zr^WBV+8a5hPte&h?|Go>J
zw9+$1d$6QCPCA;0>3^=hdmgwi`N75LKAGj~#LP+NzU9ug>I`DOEB1Q5k0{#D*cq=Z
z7mmC5#W#j_POjHcDi~oQ9srU1A!WU>t7k8f`-V??4r6N_!v8e!<L>UDJn5ZB89U84
zb>r-gpzH&U*P3Eub`a~%w6}lk<lAIZqAWL=!<&vZg`bUF{c1eYH~hqwkE=D#rnBwX
z=+WPO@4DS)ykwKHA8+@(g<8tlKkEst&OPCg^0pkaR2`NyfNN0{*TgU+tB=jQhyEWr
zSY~4^|Mu@fB<sIqLs9}cQAiM|*eky-h~lS%CM&Egndcke69{V(T22Wb5~AosUA`uL
z-?=55MRxAiXe06SALkXAVWEJ8iN$*^EjNiOhk0Zy@Vc7JT=jZ&`2sV<!UgZCuIWLl
z=@TudT2*Q#EO%<fFXzp)B0<PrryQ3UXeAMuLr+3KC1E3CdoVld|EL49<}~+f;g~u9
zI2|KdUB@lmM6Pt}2Y&3&0ifSS#UbcNi`US&>{P^$4|u1IeOvGREdVi=1fRM=D3-u!
znUa$vc2dXq4p#YWJnYCOx)Cj_Jtmd9(Z%Gdy*R9~Wc}%LkV(<Vn~Ig0G`*mR;e+m!
znJp<z59x7XBv=%9R2XpWY){hA$mP5;n5=OPcIL;4*)4M(dXmqpwl(!c(VwBC<2BJ^
zC%KV<ncgMrD1$%W^buIq)ZA+$mzdRO&^6zBAZuhA&c?niLE=#OQX|eBoG$u6Dbe-c
z&}r~Z1-Uc;qYg8*XM|xkEnYWSy5@kQEx<4i@SfRcr+&j=F+HqGmQjOBKdjIHG;9)>
z9US&g!yx{T=R%3d0+sasBe^7@gZ0#~gICB)X+fLShNMVr-G;KVj5s)~ep&JkEf5V2
znX9YafES`q_#A2Ch#K-w%6(cWHp@NIq)|SXDZZx(->;iPngFCqMqhs34Ld(XZ(Y3j
zOBkI%0A!3{p%gi03-h8;;^XKp2;(Me<1qd>50J<?5(OkhZid!9T!5|Tl=b{ERxjb;
z;-Y8E>!Lf)y^IWBgcpzO)p{vCSGOQ4ezuZF!rXS}>{;>BxC;Nq3eP_o#H7k&Wdzxk
z7zxlWizryR?#?f*RTfj$Va}*H3EtHbKPsB2O6bbR^PMieQ0<tC-OKA^?3tF}Rn{Gz
zUEkt|I|mwpjI?AWu?i6t&Ui||)5VK?e2!Z>O~%{SE6^pAVjkTMTCm>*Y>?GJ>Bq`4
zZ$WwLUtynJ$b=f@zxvfc<4miuKFb48dgV2ra!*Wgp^3g98>hCc$TCwqX`M+4@eov7
zP9}b|3alIef)9b2Q^A(<(p~ocMmasiC;JBkA!Waf!LCHt+`RgW?w0x>D^JR_@j$H>
zY=ZXk2>9X+>@36Tb-%l3!19phJ7^Gnq1`5i$(~?;3V<AoBVlot=m)1F@E@ulQd2tW
z`&Zh6|0}Jk7(Z~_9$g5fk|>UCC>~2{r`@rZq(<XAaXs3=H&Xe3cS3sst&PJM51b7R
z73p<cKW~YAA+YFwI_*F_Q;M#C`-YZg<>sd5HaYP`XwdVGb4V`~IW3I==4uZ06v2J}
zo^>&)G4rgvGN#CqIxS`K7u1t&I{3JwG|{}u5|)uZ=-w45%<jlh6;)Zt%_0*wJ1S*B
zD1cE-_`alYv;>b*ocvH^rU4lK8$$!BSBqRPb1ifw<Paa@mC)@VNW~hqxMAaOPD|rT
zZEz4;Qg`@XRnl&rD^OMr$Y-4%Z8ah#T;0B+(9~GTnGJH5sU9(iHm@`Zk_!#Sv@Z8O
zJuTJsjv@yNi5T4_IFa+KYub3|H_Z&hkfSx43TnIHV_r5*e=X%^f2}e_kFRIB>C@op
zhfdH=X7i>@drLTYv)m%texaXBCmL!HQBlFOQT}cDvRLc0`^!-m1`+yDa$9_2BGN~t
zo7U4wt~NL3CDD#wCVe(Ei?#6%S@~OM<&|v<{WSxBp|GRl4m*rc1F|W|^cwwt5_#5o
z&ma4*N(BE`B}oZIppwJ9I>zVa+(MO;j5IE#YW!jWEu5SPLP%vGk~%0EZK+I1EP=cZ
z_if1Od}Vh{J^`ikdZ<6g(+GKeKPO>H*=}wKJ*oMN^+Fe-AQNmd)%V{pb{z8@`*s80
zAMR?vQm?uCJ&*}1HLlX_?Cs#T+0*1IOr|o`XU;na;x_&O86LoO6m{Vht`%p@)56Fq
zXez51FGG)<!+i37alFZw4Zo3T99n8nM=i~H^^KjK-(|1dQKGneStX?QdFUFzp1yt;
zgAoP|h~1p^t%h2U{(!jqgarg|AsSmn*!)AW)`6~Lu?Ni*W9x}eZ^EfH(Cgh;j&BEQ
zv%7UzUHU*E8H7Y6qwT+v`Vz4rGMTc!1f=m@@*Flj7S|FZ^&|G{?{Eq;Pq1zY&q%V{
zAd;}h{MkjtbUwBF^Q8k<#66d0yaVm@j4ZC0<UjD|Om$jp*`q)KTmE2MMbRjjD22fm
z0FV$51HnO%0Pw|dlAvAj6!n(^0+|l+jYigLRx*I7aeIzMGA=0WBHTUg+ADzW4dGkH
z=pO8OBmy@!Jc@FHo{HZO-g)*v!;syw{!~VGbO*-iS1Wwl3`|OnR_tN~v+wBBE^(`h
zcI#WdW2vyjO9%}QQ!?ZESxn;`S#eYEsjOPuzTGOa)Kgs!^tFiE3G}8wPOj(tOoU2y
zOLhc;ByVZ1gy^Uiv_K{fDCc#AZG1O_dNTKmT{Dh3M&3X;jt=G(dF4)w!=PCBa?;a2
z*i<CEL8ffi))B_^ET>>+KRW~NIUmc=OZfg?XuTMQeSMvgOlra(r&;1-g^YQm<PO4c
zS(akAi64Sxpy2y1*$O-mCAjPl9Rq>>ym=tcFJm6gthL_zdC@&MwMm-mTtG3F=Pz8p
zcfM|_&yfC}f|Oa7$G-&|1%~h}I@`teSG^nky5djv9y%%a=&EoW*>Yb2&P<u)K<dn`
z{!=|#^CRlhV@k964o;6KSm40QgMp$IX6|m%wsS*VuAyu%@*=E{OhQw2&mT)Bjt-tE
z8HKWG>?~n~Tq;yFpKr@(9gz<M?57p9{g~9=S?11J?_6gdNxrXyNmhlQ|M`qKR(@CN
ze?H^jKc9ghBLZAko>#=s3)7K-)j%D<#ZjCW*7?@!j2cL+9}xJ>=<oFo-kb=oWRiDc
zP&5hQ9?WxeY^stuUasp<ob$%+UgIG4s7PYN)0$6J!?d*j$LA}Opny5{*2M+g;I`%Y
z#tNFdH12FPQk4cvmhDtys|B|^>3JdKU{Nik2NW60Mhp;uZDiZ_QdtpW>o|_trA?1N
zdaFBd?^B74^nm>l9FlS~{~FV2ru1j>T9S}1G@IRysL-l}s-3P-Mi(Pa0w(`PQrgzW
zA=nUctUf6X^oxnE7sbt#J2jQpEMg`0pe-xD&dOrA887EdKY8kWbF?!Jwb=q^!^IR#
z4bd*sHxoE)yE{1M%!Vj;S$!TstENmbjX^K6zk$ksm9B1^b1aT+JtVt+KZLD)U$1MK
zlBbMZRj&A(8uquo7)n!9sW^#<gtlkYhMNaoI(2@r9kc6cURzK5Clc`y`B^Qg{$Z$0
zQ0~={CAhbf(I}{0Ccc20{`catYeL=|FXp#K7F8evJzb|H^9DbI6b$|H9$IyBcoB=9
zRz`thon|D;Cr<TSJ~#Hlo-7y#_St)&)UXTUu(2f{U2|)8ES*ocN~sW5JEmpp;EaAw
z_E@I6^vvj%((i&C`6-X^Y~%0~3!Ur>e`N(yqx)w%?@|BREQbnAjgg=Eh(gm`&=sxc
zG_%0jVMPPuC@|=eAB|WzCQMg-uf>d=Xj@6~kwS=zy9Af>6Ju&nj1x1CwEGKGLh(E!
z*2n<vFOvc=f;m$@iiBNfW$Es5#iFn!G-`6DB11^Hj01t8hE&eS2NEdsUrMvlKfZQy
z6upA@E$<UXA@0$Ql8L70b)dRvN(<gtw3~pl?Lj%xoL&K-oN3EfurKRJo@~QM#ZYPQ
zF~@Iqgia59?0uu)_823;+!<F`zSX;1usm>LI;M8anJ=gtc;8`3=T8_=|KaaC=9#|=
z3ysm!1jfWt81r2rKAnX8f95|(=>CRxfv5amV)BN2dVKURF+qj;|B1<eM`*tC3_uMy
zUpzJJuO3qlo=tnA)#kvW##o}fHuw2;)<EGTeIgj5%tCs)rP0fA^Nh`OGjn#B6z`w<
z0g)1PYD%5dk!!G<tfIfItuT>AZ$!lg-}n`8^8FpmIW|dc{wmy!JM_GCKXvc>Ex&D<
zOba|S2DovKJ09%x<_tk#LP)#*vH{jb7Dt{KiusADDikk-7?-vGkUe9PcMYa!HFnm<
zQ=Tw%4VMU;be*fT#8E{fuc?t743;9pR1J*|l*?QaU$!gk5;utjGG<Gn^x`Q8*}xrY
z>n?I~sM5(VpxXZ`j5>+Qd&nCyjE+;?pbcd5?Dt*^zs0u>VyT>o@f6umGzP+LF<MiW
zVQ}CypB88fYZw!>0;Hd4NTfxCXZMhnzyCc}8V^PTC58~hxdcD+z{8%@Vr52fnVmQV
zXPSpuYwMyTYWy%Bv8vn{f=O}h8{6G<SqYVN$?8sO6pl_ElLH~}*y7HoW>}u6DmR{j
z$LJKaGi_9mx8*bgG;#aIlz@69HJZC#;AiD`q**$a)uSX=$`eEqo~yk1F#gV?nB~RV
zI)KOun^!+g(4ju97*~J2a6R9@$Z#*iEINz}TT?x|CR%cmUpEL-AJUPkKT%7DppsaB
zaSvpCdN6mZ)oG{24HtjYH|Y6|8t{I%%vWl9t$5^i!!+Lf>P<*L3_Kew6=n;TX&4=M
zuD@drAYIOv|65_9$vys*vOXBW3!5OYw_$y}&tHk^gIk+w+k9V3cI#5D8z$|%Y!Zw`
zU|ZNVuvJ4kw-JWL1&%X1k_>BZ^5C0vqyoRT8Dfr_LIYS*V~B5q+S^i}XP~8d66(tr
zbKJKk^wlKp)&^vJ0pkiE4RQO+LnoYWt-`R@>*iq?ejrrY@#_X43~KQ77bUL;Tl3mE
zCi1g)v)Lgj*_SDGY(LLXCC<js!?%_p-tvnyv8|O9DqEeLTaCZagfTzgIw5-lekjTI
zEtDi;B<rJ=F}_NYDtVk1ANJdaJsO8CRpH9(CloE4#A&W(0`-(Ci3s)g{%#!)ytcD)
zP-<a>asH|O70!c5mQxt~jN)>#P^Y|jhkoo!Y4?Sjx&PLx$UopX+V+sc%EdX_5+~**
z?YSEKp^C(VVO_zrI(L|C{7aX7SxS;|f!@~bDn2ic8Uik7vBc|N+PY@rkJz`LQ51bh
z)tSJ(8E;l345UK6=TE{#o6y?qvzNDu6xL-;A4kBD?`6gwTrrL|%<`^?cQ~Tq{DY!R
zxqeLk`-GK41*SY_z9>7mdm}2?6Y8NhJ$TB<4^vN*yrrH^lwee5T}#I<ux6-Ae<Nr)
zUXbjEjgl-IcgGKa_0fSJ|I%!^4NhACdm<<E8kZ@h4^VRWo5L?RD(<@b9d~6eACDH}
z3|F{8(#{0>+%`NqD>hX0!7p=$ON?dF2*WvJ#9r_+<{mBc7b;DM!S#^v78R^gdp*y6
zo`IqMJ&OVr!#z>EwcnThJlWtrSi$Sx+d?`<$^A_-%uzvyq0C{IQBQjW43~f20QQ?*
zO(hjoHo%e%i$rBF4F`u7+c$$8d@!vN9!+&ttwmXaA`qE`g)jXWdFmud`mclRW|2dH
zo3seNWE3A!+j>q0WM<i1@4<a^pQB_S3;_JAF3J0vs2nOo?<kA1W=SC0r;9T(P7xcf
z-%X@zv{|Rm?*RE&6pf$W`AL6w#6*?k7_y0+5_m%3n+TuOX=8%#3SfGMG~e{}lEFxa
zaomV{OBgj*m&A|?cfFCrCC&P2g23#3{qw<emo{@m@xg$3cuV|@KQyfK*HFKzw&|fe
zo%9_k*`riRzlSq7`{C{)RN+NB1)V{6FAO@yD6|AP)hi-D&6Hc@?q1t*d6tq-M%JKR
zA&`TIK=K(+WH#pqGQqg>kHo89EGpu1_I%{|rrI_^&?VQj`;!^(<zU)1=GaH~7Jjcd
zoPisCQL2;7MA%{Idwa=X7{!fS!soVO{2-`qMw1y8N3luMGSir9$uqKro27*FxW#fz
z2DRpp^S9U{hKX*U$8F|z<&T42k1{BwJK%X9^FeV+HbEIp4Sx-fV&UD>O(WKJKQh36
z#LZHP4hnueSwhXmGO$lgPHUcSRklRgwPBu2qS47)dSv<DLwWauk^^Cl{9sdApjbpS
zMU+*phL9d-YKc>-=+mTR0QP}5yYsH$?;q4LeqGXcVjZo#gafX<8q1)W$@pT@HekrM
zA~-s8!!wVC5>vhi+UHMmq_<xMXrH1A0c>cWvQH8ztBPi0i)!W#9|lQJRJ%3FO2O?3
zs+C;WYCpdaOcy5b-Z<X%NQVS0W9^FuemG!wXSx+7L2R60KJhNi@gC(-6d;%x=NHy6
zGp(-1A4%iR`AXD=sLQ~aJYyNXDFS7A1zX*5WJoTOS}B85R9d6+3hd$85Iu}o{2;OA
z^NG+-v--F}i0p21MlAi<l9hLqsSE3X1Rk5<2W;K8x06+srs1ETmh8i+mGx|ex|9`_
zF@HCCA}Y>eO>91#8s$xV3cKvlI;`XNGg5|U6MCD_*`J7A_uFZo=t3e$^nq+Kj-rwy
zzk9N0w<Il~Ic!IFisY&h^W`oPp);ke&(AcVb-#K1HbpzDd$dB7cpqJpDkP{2r7dm=
z6e6H%$RixL)0Dp=`KDo*f@G#^-cRivi9p#Y+3&FQJNtk~ytexBTjOgL)rP9*zpv}k
zR#&W&<@OCl70GYL&^<3gE`SNgr^`{qs&h})L1v!#`d6@KFryM=kPNkh8|G155j@0t
z?4QMWTL;`R<zOEp^Q|ms8ypcWrjDhJRKXqK2caU^c&FU(W%R)w9#GSN*n|u|KA--M
z?|ew?kZ9?A5KinAe8x2)e189;AZOa8n3fYKmZSetg^qg`(0fO@oCfa9lDB+C{}H$%
z=2iatCHyP=8%Kee0<;3kB0Ag;2j{n*)LxFXj;GmMbW@@-gC3rpTcFN0f6DZDJ*|#y
zYzh~sz=E)*rV4?3$l|&mj>2-9Q%ENS;-Em~8P2|+2$x`Jlf4t>Y1J|4op`5U!9EI>
zU#d&-Psw#7Qf_YpyDRYBKpsj&P4-1iG>~q{#j(yfKV`RMB_8S8$n(OqP0uvb@oU=U
z(gACQ!9_FdkAHSQH`L=g-V#~ub}mAu;1_3byA0Vb0$NW?+5h9|oPsm!x@et_ZQHhO
z+j!%S-7z}J8{4*R+qSKat&W}3|94KEi@jFWthKIo?W$d4j`@tDwQt+Cqi?x20{B#L
zJ!7Rlf)wk)VhYziRVAObZ@s)j@UQgBil1)`qJMk;(_i+A4@4l%VL(7=QUB`?RA~zV
z|2NP~x9yv!t)i@MszD92iGVE=I0RnYCx%c`OfJZ=xV?F`@Hug5kHB&#_JK759!>cL
z0!;ebVi~m`$i(J6v*mo#?tZ-aJZt!)%0y;&`^>8GN%BV4M%cgF;apS6aJhOeR!@o2
z9vj=&674>MKY``1nc+ytGL;Q-sc#j~;i(8~v4W5%go$jB;ONxewo2zBmPd2h_w0B1
z2@A?|as5af=qN&15+3&yqRg;f<SXD&rP+Lqed&)iGH9@78f~PTek^#3*il+cLW|U~
z4MkyCQae}3Roas8sTvtPlvR?LrqP==V)5B{9}7~)s3`@HJnYofl6&iB^xzE8!1;Hn
z%1x8*qq)WRu7rNx)=RY|1(}5scoV~<GZ>dAZCrU3KFrh?!2`XkK&Cn(h5vZ9qb*FT
z3cV4m7Wf^FZspT@W=JKl%{qGs=9NbejhZ*9OP%C7F$<brgOOLKT{`&}0T*mqKRp&9
z0$CkI)c3;I!xWAE{>s=Xzq_@W=B!lZ9%3OmKN3b-`A6dm=yh~bB!%VJi6hK2M8oWB
zePblN(?>tJ#YyL18L=M{J4CF25%65USEe+tN0h~*JF2PdJ-1gzCW|?t-TvQ3^pm%|
z{!>W*6LPAR-;&n<2{{e_SI9X9@Brbw@y(irES^{z6R+qplNgK5WOO^N8ekaWT69%2
zv^JYEo7fS|-t*+$sKytzv+MXaIm<jCX!BO#3@{j+x+9Fd^N3qAg@Z_~MI=;~Dye(A
z4Te`AgJETFzBAVq8pcbO{#?~wU3&lFIpMn*<udeooF5IhjArk1d5-3~1^}PmG6Wgi
zq?JZ(1~}@!GTt)M;&ElkIoOPg#AwKBOauz4Tp21&oRud-eg=A7Ds!eztOUI`n`+k9
z;^0CTH{~mf&Yjv=0|<1Tag5k5B3?e*O;O?2MHrfJYrVXP<5wQ#Nd^3t2fZjG8|!*%
z_7Xx|^V@vej-z2&5;sf^S%EA*&ZOmR3|y>W(O@_XIZJr4rcL=I0*h_KUfU+U|BQJ}
z@`@#|t5%`SBSk5MmRs}g*@SFnPHa4CYZd_PEv)pd8x{yOJnPz@8C>lfDN7AH>FSh!
z{Oqr%uqng*hTR5BRM4uLtxO-a855a9@k$46Zxd3F%hW}j(^GN?G=U|r^3K1M@siBs
zrd;}?$SB=Kx)Qu;8S-dLBpOA=o8rnrP01vuSSiuf$TL=^M|Sj4kOAVp$uoub>0N5>
zrX7CcX1Lv*ycT(`pmsF+WecdVNd>MG>Vt><=>oU$=tE_+1&YfpsVR%F$tm*}M#;X|
zTKPud%eLI<nk?;)7eMD*mXdQL(+(Z3rRzskfnfEDLddm=V{&75*o<gC4rgS^uC(zV
zA-h8Tsw5Gt3c*k|Hm9h`nv2Eq$!yPN)}V4F#=j4P3_wUV{kmgTwB`V?SdXe}@n=qy
zIxnbU9#(}6Ul@6=o}}5#T#9H819aU>qSdq<YMIq5*#JqUOrXIzGI)knqe7Fe+?m0K
zb#1@F^(VrrRr(RET__kkycs-rX!=|utgC-*lwi`5xUyNp+(ZZKNy=VP7K;0vV*V>#
zx@Ha@id+_9|DpZno}FV*K$i<fH5T9RG*C5AffV_^Vl^5Df>>fR5Rys@(};mGk<1;z
z<fjE+Z9_TAXdqelnV8jqwAX0dFAoodL9v?rK*Bz~$krdhZ$@019@J2Pd=WB;??^G5
zkvIYhn@RJqu}i)6QW3IGcH%Z1{z`bxCi&HVOn^CYY5=So5>kIIrg%v)ah$yBgjguF
z?cYaO1QP1nSqc}me0a?bi~tzAhCv-QrQo1^4BjdBRUm018`}7YG->3eJG$uOsd*nH
zJUahRZledNDG`CXtBM+7We03a=%5X?!Jn->9NyY;#}6Bj!S;PHjskd-<gjn$^e6BR
zd0eo94)i1Su3mDKg$QJj-w+$i4FOms7!(@}kWNKOX2@OP_L^tYE|c>507c~70+sX~
z&?5!aHDHAq6iJPID@o<1=5!0<X4QZSX>pwX26D`Ax^4yT@!lEYAiMN01W;{Qe>nzN
z#iN#KY04{8L{j$!KJ|{kuk3LmdL)zg%TD!<>>UPc6;sGnh`8r67rO4$^0VduW6#PR
z2h+=6*W-^EPi7sNR&uxWiZ&(=X^1Rh?GV1#D!?<J2cqF3%k`SYB{o2=wEg#Z5&2N2
zm1&T=8pe{2cBq%2^t0w1)Tx*REyX+QcC2m4Q-Q9KHDE7#jvzl)eJ=E@unf)0roAZ#
zy=zpCs1yo(iz@BhP|fhEaCAxj*B9{zM=`?lna6AzA1t8(Cr)6t()=K;fOxKXf+$I_
zB9JxM;Jz)z7g~EviZwa{gj*|Hs9*tG0Jb_v^u5MPP`Px@;x=JH9(}bcl@M!dX`Uu2
z#I}Y>_t(w2k;S_0r;eAZFc2|)RXSC=^BG^R&nCheEvvu~{~dytLH!ARF#||wSi(e_
ziLr*^JD=bmgatM0pQ_5(BR^aAK=B4!285^`Tfux-->Q?%x5!@*=dB^yo=0K|yyNYD
zaP?9=J;xhJ<+D&bX$2nx=F4y_Fa)#DECFVmzjW+-#b)8`dm}-O9qH1VJ$!zw+whzR
zP@nuNeG=CkGTf3As*~G7im!mf&IbeC8y)_d+b=B+TaO<P^LsCs6+$a+BsDKm0J0aX
zU%l0(`ZD5H@SOtFW-=LNZ5ZRDBH!NS(22nNYSq0|nken(fu$;9VrIj+!SLjt44;Z|
zFNTLmi*;Px4^Z=CUDCjy`Z+RU2F&G)VxdK;AajF;CPWTI3Rkr5K|{OyFN7>|7TvT!
z%`ZO^!~9-2x=%1x+%x;aIV_JeVAR~L7;?a|u1m!6sq|<!eR$43iCa=jk>**_y2hy<
zWk$srgt3!FV5*s>x?7_ZHF`wPhhCS7Bxjl}(^_OjpL3dlyFEASte9w+Jl$9@=x-{f
z+gtA%dd`_*5LT^nJq9NZE;{cWdLES_SQEc86L{nz<`BqHWqU7O9qGkJV9IBL-i#bh
z;V?ned_hH)rrAi?-Utc9I63V25-cq(4=WYZ2?i~bi9D8bD61D{4%<AEBGXsFt{2Z(
zGa)tRL5M0m1e0#y@D)DlE6HX&E^BD_7WDVQKk0IBiqd|ry9*LABv{V;a65dVDTE0P
zISr37OO<yX8QxNcZkI0xIPwtCyu!lJqJxl!45`{)l<pS^b-7X~vR5~8A<?I=?H7UP
z#Tmyb??<!(2Jl*ggfM06xYL0;HaPUJKK)G=;z-R!&ITDTaYc}+>qXXyWWT<=KzPQz
zwz*h;vAaT`Phem#Vl$fA=33xrj~wkBxXkU`DPV$m$p*j5Uy2R_EOt0%AmwZcxO`y4
z*nz|gtjZC*JPJbyTQ?Kg`=B91xG@4?(i04t;|RRS!ee(u(r8PvBqCBu+e%<l#GiV!
z`al>-eJ|zp{@O@yUi_Gw)cQ-9{QK3KJ<x0>5*rL`-><vi^s@PNv-VC<kl1{uFif~@
zS0w&A11C{V0S7f0XcHS#nD!|FHtcij6>qMYvOM~5X_{MJiEpAV$c5i4<bMuGh%F&l
zHt#=V&B%`Ph(jaHGfB|VgDfWq)Lxj|XQi6tGvTRVEhI~i#Q6-1=V{`LUqFagY+IZZ
z^X?8skPP%B^bmljF$WYgaz|DjdHHhklsZMQuvEjOByO|-=R;WAvRm$AU|n85Ud`h8
z7Io0b%BO0XvW+P571^L9L=+!&VxC6Q89Ao=tI+-w-9<+^p7-hC2u89@*r(j8a-UHq
z|LNl@gb1e+w^>hZ%p7iCv=4Z}?v+S8(!?%T+1rdqWNy#Mc9S|fYF$72;fz5>XB?Bz
z2<Y9(lwoE7W*>=~2RvkdAm$rIsX5CR7ME5xHqMdWc2>cmk3b)tTKCHDJ@<jh-Sl@n
z*lOa<ZK8p7P@9ilv76ygFkG){&gPU%EP@E#9Q;=A$z*|O_i}eYtX9*87bM=~wS~RW
z)s8vt(PRR~-C)QHv$&pw?2o<XA#bhHS}%Wo7>hUqi?pxiwvjknC?R<lOYAA2rv$It
zhW*FTG23JB!9bxFWBAsr;{Ce`)n83M;!bmN(0d6n8PJ{jKgy47mK(}+s3ZirxRG=(
zx0+3Kr8ez@M@vKi&*~p#2t0^mc&K8WPbN<r2TvIY&q3W!I^qGo>?u=bXra||n<?7x
zw3iFOg*npw7SD<s3SuM5YKp7L<{}h6a90kusR+bRV2sd>znZWAS-?7&{i}64i=F8V
zu6%KhCL=lQ(!_Q0bVv(EPubn#2gN2`6&?OkY(jkVuiC-cTP^j3*Ggt<F;+L}z1sea
zaxurKzXrZDGw*3aw5X?dY^UT=@EfrX>lfHS-kIE@Ho8>Kc&gGSlt2AZOXi0Oj+Go?
zW-cCjMq?c|a6^$xpr4YI#7l(8kkHgojwXa{_Ggp0<5}gKDL(xj>W4R#A6=(>Nlhu7
z;+ieEmv#nUDBs#k$GL6NAL*+d<02o^R1s=WOWknEOVaBpP4=QVfx$^U1-DEZU%_R-
zkqYJIycER?YBVf}QoYHM%jGJwMo?(=XPd8R;ZKIegvNl0sCH3Kwm}qWnuTfGqG7?)
zFaPhdyPH=fdAu(oUs|@3M2MAaQQd{HbFGMrj>B71x4yHL5bW(Lx5wHKuH^3lrqn6C
zPAFr}q?uka4b#L9LGl7%CI~Qjw(J9l1k)JF28r}2i%LSk&%hI5prR?LGjK?X)pOuM
zfx{Man1a5>l76a2juG4&RoaRh5?+*t5bi*?f*xb++Dz}MVHGpRm_zOq!VT(cpo{Bh
z#Xyl{5)shgu))#Ju9Sh)nt+LJF*TqCMaNBArm9?ch_>4AKcE#BrUjtxQKttc4pFl*
zWJO^6lFx^m+fBr@#blxcK4E(3(Cg>Pp2*2{Eg64zD33MNK8TIeuW8Q7VU?>U2bG&5
zo`*oQZn`ZpRbFb~x9I^$;KTkF@zM#t_4UVOP+aB^WqtC~P%p!}z|+YY*N2G8Wi2_K
ztr2fHbq-=ZsTTbs9vES=&PM=OEvMnyWvt_Hg9(|BUM9AJCKqra3UeL>3goz;5TrZG
z;g5XSsFeih3ZEnS<|Q*h5xeEBRm(*Ix=to4uoQ9^@#JV{gCiv5d5>n2Q|q-Uav`i%
zfiCT|!4&W^HECfIwJyQXVYF6gYNMv-@)1lH9j;RLl^n|I&PKYEHNrqreZ3q2FBqMc
zsTL<S>M;eE6Fux3yTRmXDSYiPkBoIH?;O8$rV2dlXI)#XR#EjnnQ{7LIZZ3w0;kK5
z1-FtB5N{;!Q81~dAQ)o0ccrCsKXbD>KP&BFV)*m4maT%_$UoTiw4mX(#1=q3l_EOF
zhoThb3Pe#X>~XLs3UXl3jWNLW$wne5(6J~D3`M+~nq@&l{xSF*Hx2*p5|(0#m**Bh
zhKe}g(Oi$vjwt6i6`8J1S`GDcU^_&)kDdi?oW4$B68w!#k`|e5-;2nU4q#o|Hpl~K
z^A2GH6~SPhZ*z*Hn7J`OUO`7d?|a&8>4KLs+j{Yt8Lh`_{|DG61Nhr89FQJ>FUE<L
zYp)VG{HWm0xLj)C21j^G>J)FAtTlvB^D>&Cc<2e!OB<FHoLs{{J*noJgL!gRU`eh-
zM`v@t<e}%AZy&|@JBX86LbA+hmYYMW^Zc&KDrw__tnxhKM)%f1*Q}_4PpMO~oJ&b-
z6G(Q@#MJ==J_D%<e&vu)KVmOS6vj+w$2O|ojH?wiT$AGrFaMjM!l?WmLB~^tk3u&;
zVGN?#^F`im6%`Y`SUq3ooMj&yqBysC|1hJ{VUrXSyZByUtTlFnU;Hd2`pgo%?fXpj
zz*2JHy>WxuD>VK9E**NrpUpk<{C+gig`9{PwTS%-;vD!gmTpn^rJa+*t>~LKt~_({
zdDqV`kX>3EqEBW)*!Q(s^$A%o)XSsv#}?IZ8RWAC0dVDHVDtIrozp`V7Xxzkj;Sh4
z%tIye+3*|H_GIv(u+s{~5BT#(r&QU`EMH85;%`9=P+a0c*rF#o&$nU63e={d8&ZdR
zF^CQ0SU=#Mwlded{=vh~r5hgY*9(<5g&g19QlaqfQWBS(FQ+VT2@yL^gU<pYCZ<sR
z8p>k8UorjKo%eH@-b#R@0Udd@CcVmFgoGvyi4EJm6E?9g1w1I3g<`)VfToctQtfBs
zod$>{2DYd9-_G$HaJ5T(ljh%9*B~c_dMfFY_gg@;%gOrz85=c=@M@nf>e<Lbg$aQs
z;ko<23H*jl7Kc;LzH;cjmt~qk><#xD0p-<KO7Ge8aokR3X7Z=uC)Ygvu0QklxF28k
z{HBey%-}EP>o)g|o9`+2(4HoXXOQMS2d-|9$L;~lfn_)(K3S_$K3&F1OhRVgThzXS
zQ+B}L-dijq+1wZG8j*7W(u}(=+i|&~f;)mE+l`kqjhcFSq@rx-7`3i~J3JEtCiubd
zKl^WJb@qJb?Z>n|1q#Zk34Gb3?l?SGV)$}!Pqf(qLNk*Eh4@5A{%GE1Hd$&QNXxmq
z^z<wvQiw5k2nQb_mRO_?Sq|VbTHDmUJnX=URuI7rp8yB62P-t}r@y-QA5WHv-m$+f
z+kM@etDTMci2kT-sgWe|i#mVUOEuf-P@+Smv-n!%+`!Ta`rcso3gJGz{JjVB>|vTE
z!a0fUkIhn$%@NY6_A6DIHq1Fu(!HiQcm&Uq%TnwWvh38+#(Yv!yrqT~Y1SlE{;UDk
zS%BLIBufoNJY09wQ5|Z15Q@-{Luc>K%Fm(3lZ1(s24tLo=SGAqlXArV!9Y>1koZY=
z@tM;>6O=<wq5g7~ljj+r6nnooA4Zh$mi?%FmU{nDl^k5CPpVkM7!*tKhcj|$m8!0u
z;A-Zc>!xIx#8@dKaJ02L2^IU~q!1L?`jr>kOC=f$R33WYqq#n29=I&k_-IUu1^UYC
zUhLOhrsfvx44jLuc3$UKAACfXVHh&41O^%&y}GB6ee!I4qBBSo1&+|Ybo%88a#H?<
zF5mogdWL2ak2nwUndNWt2@>#qW%ns%Wa8NqoC`So5#stmr)0F%Dp7qegCPneCK0#m
zrVv;7Y-6X|;GmtZo|Q|UuUTa8{c=2klCE~II>RNwa$n9Z**;L!Z~=lNFMC?4q~5at
zP+gavqh#dnRgKgEoRrl=<9UP=a+USEDAC;B3lsu^XR1}TgAq~58Uj(R(ZBChCrg8N
zs*bK=c>S8IaT8mhlc$YxI+cJJuJ8vhMT(Q$LbGxxxl0UHmozG`70N2QXqLW@c}g2r
zr4qSKHmGi(eQa=jZa?-C-D+`@pRzIr90j;zFnMw)$9wiWg5jrZ6jd;IL)s&>I#Mtf
zonU2sW}vdEjx37XoTofDyaW$EYCJkBw<5Qt!nZ27DyvTb?rUE5E)Kw!oXqX)YZ3l`
zgsT<j)_2^C^%KIT90xa|MBTsq$32Syz|wcdze&1Bj2G={*Y!EwcYcpuiaj#?^P>+3
zy^tIBkDM1W1=)vr-G}4^0!jf}>`^l(3a6es{st!osxU`Mg0co)e#dix?5R1$o)7rb
z7Ri{uC^TeqiE|&QHDrLLWdN@POx~0^&lnH}rz+y!!ju_z_W7Suc>23*GIIEVO-u15
za0IQ&eU5nghcA%J+y(_^ick#h6HNm=u?8nqMaeV75ZRCF7hOr3JgchNjlt*HT54mS
zez;jI)-HsFk=f7l)+f-_j)Kyu+`V$CyoLpnS+&Y&lGn{OM@_mj7zK|tku;a*MF=$n
zF70#@(=~%l^BnS8Z98(AdPu5~oe_X-oAPNNtme*}62#~GCY>Eo-NV*J%~zWxnqJ|}
zLm?3@?Dc%6aQttm|7onF8X#g67$6`MH2*2;qmC><1aDmpjPE~1)4zRu-Yq-b<eryZ
z@m%Z{?E_O#MvPqKX^W#=3xg0QZSFF97{=+wCp-L!X-P?;Ny|3lnBpS}K;5kJqyCbB
zg#@Sxi?~1|st8M<qsM#BC^VGlbFThj61drly?34c%yoYD{@5J^!Hi4>-DK>veN2$6
z=#1V4O0r>AJZVAwuDGZSbZeT8z>YB+^;Y3CUGUh7N|PKY8aE)@gL}&8j}A9wSGl@j
zA%$t|>0r8y#Pt!3G;`tNVuEF~FKGTtvHmGAE*%7k+8yG6Qg2RgJ1oy;KRm$RF&;%F
zjTOyg#a&|@&SYv|(W4%WJjZ)!%5PcIL|W1Zgy$o)haZhr9<sfR#q;qo@2clW`4uH?
zx<d*90h-8#of$O}h62Zxv)$bf&kM^B%64SAP)`~y!iOn8a$r7XWt(p&={}^Mw=kk0
zX=*Tph#P-j-P6<(Zs(L~#>EOu5N4@`(SflD#=xSUbaJfZ8;=Lz#o}+Fvt^GoSL#{;
z)nJ&&ss%K;aZ*t*wC7Sr<7e3I#`R_21r%$O(^})QW?N|v1Zs7yhv_ZSg}cnFwqM(-
zJf%=QmpB=@wWMHVBbCFP2yi1_Z7L82K981JexSYDbi~M{O&PL5Y;kne!Z&hIm!VSU
z&8dBqEYVxy0YeV6b1s4cJVDV0N*e#U?E~d=R}L>ns!Dld`s;Cz3nh)t%f=8xov)jU
zFksRhA)0Z|wYx?4H=@gUb^;!pP>;pH;B1Pdo#B6y{4ku(heO)VRFNRXG-k2ki^+1R
z<EpSkRVLu;mK}wu%0rX`KRy=dX91X=e%K<P6es6J6$!8ZWnis4x!}f`^msxCvaZV3
zp%Y9lij~61lUk&@Q(a0guxQ~Z*2Z91-6&#}@q5cszkusYlVP)?CB?(hPz`cOP33)`
z45M()PR?OM;zsDx36}4{XVLt+RIyk6g{hNi;1NPl43aesvmT>iVpL!vH^5Q|tEqN4
z#l3xT7ieBfN=MMJ%wAyHk6Xn66or~8=G!sRjyK)nkK8v3qA`=br<n4Du4}o6p}B)r
zuggiOiG?B!f<Agx4M%)cJ6-togR#g29tDK&P{REUJ1~jgC5i!sES?y{Bta7~0fy4+
z#Vz<Ais6r$rcpdgd)dmo4ZXefwX~$Gt!XT$pMCj?2^)2$Vx5+e+m6dLP!#?*O5k+p
zs+2)mri`1Y6#o@Ox`80<41*iFsFgeb4K@K(!n|pAeL<3sdPE25NS2Tc>b+iPkWzUC
zOTsc}IdLc<1L9)Dq@Uu2{i2ioH?Hc$oyS((K8CmC;87HqJsCQ#J3bEbzV0KBch0K5
z2oLiLCWO|4r*@2taT85Akak3SGXsZ;uVx@M;;)3B0wMu#?Jlk?Y(?$WvANW!R$UeL
z>OL>%Xd3<t?eSe70{Une0b*v6rB@H%5+#+)W^`M580fd_ofkwYQn7{xH5`TpZO=IK
z!f;)qLf>y~8Cd(0u{c?R*4sOWJ<SLYUJ^3~dYn{H{K`#7D5AGkAWWC@z09b48?J4i
zzK;5=X+*#cY6aiZT};Z#3O%)NtmB!zcP^={K)`aNS@1Sd<eFp|#iAcH`%ycuRA8=9
zAJTdckqRf336`#po!$ph>NFHVVf6E!@6OAC%e?f#Nla5V4X%y!7+&Gew6r!E>dtWD
zg16gd(%)(>{9!05z&m8m%w;b?L+NN#X8v*s$;I-Zi{g6winbvu7}ffjR6{eP$*&ny
zh}a_@Y8`3cf;~rm66H3xY1u!h7)r29F^p63j%%t9O(9bCp^m4!Elo1%uesK1!MXDo
zBsBS)=N~Toqa>TbxrrM_LyB`_Ol>%8!G;Nu3~sEb6%p%-Kn<iod5rDw9a>O=iFGXM
zvwKr(P8Rf!i2WR9uc>Cofd(CpgI!DSDZ_zDT;J$FQFJHka=;;{FWnxVUNmF`S_6uc
zv7;b@`^5NKGe^m5y+yp%_r>aCqBhEO#S)iOkHEq@A|QF@mAF_GFER$OAYmpQqjj7m
zwC^gd(3*V=Sk!vkBFS-{Z5u3ifJVjnkE!8jV>jAwoy;c1_h<M|<SkbhR|}_XJM5PX
zB#&F>w$gII4oD&7(Zra|9Mnr{$n#$Zr`kUe!Ixh_5#P#1Wh8F!bdp8_0;{bl24p+N
z21)ED{p?{MSVZ?<VCc>EbSXT}8gqk28>fu0=&j`Iz#PRko?@@F?feMQfoimj4E6jt
z6FtW0G=j!415Z1Nc-!AWBYxf2%<T*=3g}@l<cVI9ZG*!ktIJV$i7qTM^2f;(E|ZAq
zn&LR2eRWyMdW2<CHp>$2WphL5EXfrx=_$_Br>G|`jqT4$SOzNNnI*9_rsV9_+=zTa
zYG{q7Kp_Dk7NHW@x4VZi9sgp_1<P$?XWuHL1wDr21Y4F^40@bIs-!<I)fkTSKRk|I
zlL>MED3nUctbnRihU2P8nFa9@pLZts#4vh;gRpN1-?G7iz$})ta%J`x4RV!5)QB(1
z-rBJA`w6Ei(3>`sud!@S`>tO^3^#NmFIj8F0IdzPqj)rz_<fw`E)%C?EEmMtQhU;M
z9+<^6+J`GDLW|-domvYfWa9)h9<mxmHPo37^#W->bO>0D*yp90#_$Q`MukOYh8nVF
z>K-q%!qs3}B;A|L4@^RwR+O;}=R}!otdDUNHxuXW*?L0A#M{)R6^JA-gA?Um1R#-@
zfow@TKNA+@<W;@efBc$%W0lXxdWPM%w(1Q%t=i~&d)x^iC@b6aw|eALKHK!i*%=^6
z;|St;_Wzbuj&48m3Eq^Ul5scG;tP27Z`lx$mox5%J_l{q7b{D>96*m@vMT}7WN`--
z2bRh2Emd1q$mN^S;aVy|eA0r^RN+hN0(YxKvd}F5Ak6yx{<-~mN=|a2%B%|Qx&jG$
zVZ~9MwjvmY^98zb%!EHw<@ZM|SJdHzxWIRKyUHsg(p$9yP-7pgd2^3h^eeuV8NvcD
zBGj?okU*I3J{98QJhAAakI%prJQeC=16lC>mveom4%6yn<V~M#Eue-8@r6pd5E$8=
zk=oNU=NZfhiP&|%{86Fh17e6N4b)?*!x;U$x(ZI1ANRu1@QsI$T)U#t;R?MuKJ7xU
z+GdCC?uLl(k#Tts|C2cQx3_^A_H%=A;Nb{}!3{mr-B!#=*F@r)8j}{pM+AE5FF!Tx
z{ZqlX<hI4y80l(*<;qu9sXe(`Jz!d6!i+yCYk<E0W7olaA2cBqTxebALpcdQTabm?
z+J%;y$4=#2@{cCxzKAaVx=O*gN9i+KpLl-U5jvVny3bFM)`oj)t+R`T11=;*m|oSn
zsuZktMtF9tZPJgU^Ojh?MjGK>9Mv@eo^WFJ9K;v67eBdg{;1xqSYXkuG4M=^2C>Bg
zgh@IT&c|#(!Z-X0MFsixa_HUPueFYDmk})|CV(~H4W0A1YC+r9;xY?4Wr;YAnS!kR
zW(4?Xes<xmRu?;a;X^qi>^hr4@IEsscW20uZN#wwpbn42Kq)=#Knu=I6y_yz%b+;0
zKtBof{*2zxim1=@O`{>t1bA9Fz(s$qRuCT`oONz;z8U@RFT*wowsT^rz%g9KP&XBI
z)P3R|jnql8^JWKS9)EX|nOt#g_|I7(0~*yt_xr?<OnPInCw)ojpu#@CBWv@uyPOvi
zM~^(zU%#SQmBmpPq@3gjv&+N>j?2^s1#6--U+Lyl>Sb+(1sL_7G@xb#Pl9G78ijyP
zRSG-p+fd~`x?_Bs>_X*mbAka=i=0;@cFF@uz1BkazGpoVGE+n<d9PvD@RDovh2%4M
zz1{-p{QkyuhsK?JdhfJr>0vsn&@OHgzuIxA9+GSh%{`xftn|Mvwmm2AUoqFIo7A&p
z>c+X7<lokN<ptFGcM&-I=>PBHcYdexoqV`^Y8zczYLW-&)FKQ&S6+gj)~-D0u3}p~
zBE-WXQ;~ZKlol%V9}o<8lrmp%1$rqK|0>3TG~$A^Q$UDJ4M*B#2M9$Cv8=vvQaj@?
z`m=RXCzEh6Us(CIfxNRr(5juBfIZB^_4j`s8%3BnlEEW55Rh+-|L3v6O5AaTPTZ-*
z1DeHe{x1R~<XgMBxn{+y<F7pizpH))wZt%<2s*lm$Sv!(V(a{+zo{<MkYJd@UNE%5
ze}m7u7$`VnQy;I#O42(*27f?oe;Vx8|LL{d>QunlQr&WL-_E;Q*&+^CEjBAjSc^=+
zthbj=Y#PcWu<Fhe>#x3&T-mmhvnvN4m*iuOFR8UlIa`zx+S;?(;0oPe)vVC3#XOvE
zsp40pjg@hmHcO4%=~QuXws7JaM0)+>XNcx`r@JT!OUWkoIsFtBVs9uO?`30E7=NLv
zpDtRF`}4}&tBo=Us>ano<->3=C*-iB9EZU&;cIv>Dl_DpSPCXd;d|XXDyj>l-R5wS
zT$zXqKU*|Rouuz&P%C_=)m-=Q+n+ED{JuR;7B)6}obV4EXN@T1rZ%>PCoAKnHsP-|
z2M<AdO;$cB853d)vQ~7|n8uk280-hHb>3pg>-(X;Qd4Wl-24@Fw!vne>-PhIt&J}D
z-^&os;RCh#=YTo+_bAIHHYZ^xHu^CEVLb3gU46wsz}o^46ADaE>sFI2{kf$HP-w(j
z@Ch3fPzumhrHsZ?Qu_k*VAjmsuo5g+WjDsGVp^<FOT&{!oVHh7bg7~NFhzyp=NO%?
zi$zw8MHU+)_8TQy89Skc9}XaK#4r<9g-S%`7RS?5na^L(y<FZ$e7QY};+qmc#kpbU
zlMr`-9o~v!r8Dyqj`@t4mJz_BrtiR*RgH1_->&3&7W)exeP<W>7#l@?ftpe!p5U&<
zj4^8-sn}-4sNwq!@vU6}$<B_J;?|p>s_x1LLEW(<=G`cpzjmkR$7#mr9d>CZ*aFp?
zh%*B(H8BJPo%=YSE*EG&Py>>HD3wN~kMGf0jF#DEv92-e0LoJLociW)nC)wPW&*9r
zqmM(3rt=~<z{Ql+vG$4oe4^LJqgr>~TNVdr$!5R`l}(k>#Q1gqD9%MxdSg>mUUW0~
z`{W|Berc}432clb;Cwkz@gk<tkd4E0qI)?KVR6|`ZPL}8WG%gMq4XDUZ>C$0arF4{
z8M|cf8s*{F3+CI7>L4Hyio?BY)bZiN5^-`f7Wyt|GZx$mqFQxKDLTLnNaXciu9LsK
zgk40;;6O}N4WsIZ`*P7jOw$zAyV9SXq1Wtru~Ho{Vr@`&IkzoyCO>$7I5;72wt<qW
z(%AWl8OfEpDHuZY?j{d(e|O3_fVM_#)w-g9a)&x|>j<pQgN4;3x+vA;78kPNt|3Es
zQjX(P%M{H#WfWmhZQ8|cpAn=>1>5m69#t|HLGbb&$d><^omVmuu9`6V%P6P-wpk6n
zfG6tKm^+_k%h&d+J8(%P+nexmnZH#o*3QQ1w~(EdB~+(F`rZQ&k29(6a-8^z-fA79
zx*48$8&#1JK4#lHQ{RQFRtXxwVkjlFO*ZDh{ri<vWJAnu^3<S1X|51SI<XQ5dVR#w
zpQ+m3%DJTsN6uY+(P_EKtRus?B7+B}K0z_$+NJFGtYTiFh5D*$V@SHnV<TW=TA^ao
z{D_hdbcu~AN$v~yq(-C{-+b8xnYlw?03T+;Vc(`rEB*V-H~8)Bhlp;E6!@!^@Lb6)
z9;s@`VxH(bHO<%scI+7{JD3P=0hn!1VAwguv{p+7*nzh7*SAflF+NOF<0#YymM*z;
z=qYpM0C*gmB-n%I2+V_Bt#OpWq*HzgXFX9wbXx|3=2{nUT4@xWcP7my*8xp!l8vKH
zo|)s<2XwBB=v)t%Br;L$y7#gUeL08bUQb3IhcuC-TZ1Uj=V*)E(gGo=s~+vgdpy+d
z{Y`f_2xvq-CJB52{W=8q24|sDxTsZ!s55+W6KMW4-GX6xF>l>ywn^WzZYX(^Iho**
zv!uM{<qZU28X5$a?kQkL$<sXabt3iFoW^uPJeYu)%K-;90n5+`#PCI%No>A2Kol`s
zk{yGRH3KgDGYuDe_iAQ=+~y8@Xpv`fKJWo7iwNHfbRVaji4$Dz5%TQn0WsyXKVn6L
z>zV<(9o{0?oz^ACe}S8d#czp}ZKTtPchyT-NEZNXgsyM=@ow)GD=H*^bEF>A(NBQ1
z5IgrHW{+qXS!{UdlQZZYvzC!AKw(EoXr{wkSlQbOiJ|^Ztm}@Z2xYb6w1ZbqZ8<kD
zw(e4j$EK^=Z-QDHE8Y10%*0lBNtx01?Jp{i5Q8N}-6Gq$c6&gja|q%BTh}1v8;yz<
zFvu8aS7e4$0$2z9$TR04CULgNTsJRKrdduJw@Ey2a|38exo)fLGsMn8#%8f>{f*&l
zoMmkc$=2F-oF0y?u`f5^XRRSYmV|v}I1jQj&gUy9#ie@v2M!yWG@Vz;fzm10<0uOW
z+-*)zkAr6I5?{70(?nFmmM7FQs4=&ri=_s-Uj+=(pNw_X1~RP}`lJuKG3K}MU^Cnl
zQdTE~%MLcO>(Hp6B>*<2a+=^m)e$O>!pTBR+Roc96uHA^Si#(waZ==V+JCkt!jy}1
zsy?p6JjEmj*TQEh+X>!23AdP5t3W0Jei;!eC>$iT**9CtySnJ}N^t0fR{Ly#fQSGc
zg`y*z5p4z`7CG*Ctyz2mR$tF7u!^2N&n#v0Pfk6Pa42r`#mhv<kx0s%8?>#`tA&rj
z-XY$=2k#O^-aOwRAcnU}g;5~xS-_^8rKYF2M^*1>DXLDr$I_@Zw6xGWCbo`N6;d0s
z^5(jJTGi@|U9>zfx}=rhqyQavd^Lciz8xW91NWxAW*5Jmy$Cx=L4+oYCoN8SPe+z!
zJC4GGN%%8~fWf}W!$1U2v-p+Y`Nu`MzF@dyze3}#10GPJE>BL)kS7x$*h8O4bPp_I
zG-+wlK!9+|C52{YyY~hG*KavxFtT5qJ_h+(r|vJNOCFD}YGprut^Q$PnM?%=hhk7Y
zU^eK)JcB{B(lUMY<ZV`Lvjd-y(BEL+DcDcet^HY>zLfKs7K!qml3;$hX)6E2n{2uy
zPfpFMw$0|w<u=%S!yA;l=H-6j|KbZggbDnnI4SGRtG%B^>w;~UiB~qI9D_JZJx#^Q
z2S(F2%+eB{wiU#ITKj#ayy5`=?jC6)&i#Qyg{}t<>8E<zzMkpo(d(Fqym5{$3N7{$
zW5EaFrMZAUI3yp^`M6kawai!+!ry%R{j5{q*@imn#isq1`PR>_LQ;pg`xYg{V9e?4
z$RsqRt&`ur;^*fl2D9O55rWp_*j|A1)M)b&*$#e(5f)uyVFXb%90dnXwE6u@SNqgZ
z$4B;E;%)WNc#{A#n)MK{#S5@UVwyAe<)Tgr&m%>z_ZAt@Z(yyJZTm@)MXsqqXmTX*
zSpak1xw5xsx-21=D1+YyXreCAsY>sqKf`MMQ6R05bvCs?h7i<Y^tpxa2B2D@BPHkb
z1HJV)U&bffRs-1!^pFFVo7db`Z@HIGBh&1=IYQ}z#!gc1vgwcIpYmRwy3Jy{!AEH3
zfi7n5dJ{%Z?)h0(BF_~leEx)MadL6T=76Ma2s|2!f|^c%xCs~{-jEPSF-8fts{6*7
z6m*4_8K(8a8WvU_l8^#(ITx?#<2fp{py)DY#2n_V&wgI>7bpU<0!rvn(D~%l@=BWb
zC`=44f2MctO|f`}ME<6dgUDHn21QDIp85?#+T;ScPY6O(%s$w|-V`?_S9p7vDG^J0
zjn=Jg#I5JK;bsiFETa4nNW;>&D)r%jfublnL(qs)_3^blEdiX;!A8k^f2`6RYft{_
zhnRHy@>?5q!_NYKuO@$ANcz?j@zknv?-3khX7xDgsi(Sr_V`>zgYD;$h79TUnKl;B
z<4mhWx9hrt4~2==F5b_DBV(W=OZA(!c()NW1dtB5`y>kU%xO;}G_b>k9SG~U@5-0i
zk1tzu6BF+3cS@ca5X{Fqi62xSkMmvqh{r^4=TNuMX-Wdx1R-`yU?y?np^{-XSVAN^
zlhgM7vx(AyvFfF>%lnkY5iMVdbz#_vY2FTQ5?UYjD(+Rre{)i75;I6$K*4Ly$^JT)
zd1w*diFETJclFN5sF^=s+GTGRuUXhQ)qowYS$La76+~$A=S;y2hpH<gylSv4l6EI#
zSV)O1no<UO|BASd#I(}2zBQ}J?Rc#o<JgFoRb0%hx%unjsoRB@TO1vadGn+`pjC7Y
zS0pa>vgY&9r6s@Z&B2T98NWk+3R=E1n;^t-8XnF5C~1D$-*3~zl#Cv4wIL)y<d2TL
z+pW&P*&uC8y6+huvy#8E9`skCT%C0xDWfDb?-BwCEA_9RCRsc0sCjGrK%_unSdct_
zv13t2a=tDoVer@K5v4FPMw^ij#b5D3jX55<^cK&*`@;AjP(8G?FjR3+`zACwcjOek
z>YMiC&Mxhq@(`C=A-zH6f@L=6UG&oI&cJ?RM%n%pH@!TFi&w$HMo%Ia=HKi*lkTN_
zMdcUJ$~q#{J16ChR6r2IW-%0Se!*D3-iwLk8R=3ZEfn;4Qtz9Q^WgFd@cw%-t18ts
z+*%lKpOcyYT#TyyVbXTf5a+(ULh5r%-7-2C8k_UnPhuGHR}f28OyX@EPMIcyc7cNX
zeZ43*I)OLm){B&E=QNCoQ<aFw>McF4)ifV?qFOgQyB!DE@`C_a5?l>Ua}o<UZ^rz|
zZhQj#fFZhk{IPa{;m!5yRbSGA$(-M^lXSt*k-c}!e&e#;T@1Z-y)P$PoXa-U#NzZ$
z;?C26+YoBoFz~P#Yobr0UcJRpi-$L-TT)A{{8PD6yGV)c+MfA(=HOrzg806D3Hb&H
zzc?ECkjeG{0h7gKkeBRT{)dm(^*&O~g&wn4($IXowrGuQ@nJd6A>*q}+EC5|uN&^;
zkp-ahcePTDs~1NpIr{<kOKIDC)Cioa+l@@KsJCNEhzmI%cE4E*VA*WDnn1g$X`N`7
z)?xaa>ni@rV1sItoFMLsnIQGbk@pAi0@W%h`HEYofno05bh4NJS>&zER?b&t7s&{%
z(RDY*LESctrPnknaDEN`bNXmWncOv4G^*(|yu?9q@y`#EKIKKBT`JA5FRBj^S&6sR
z2Fnle#a_Aj@AT|;|3>Jqa;V>Ix;{`Sq)Js_!s+cp$=c);VxG(Z^qht8J~tI$UjmUm
z=3{YnQ6(b*0}(pkJUuA4m1Grl#7G3<Md;d=5#ye*dqj{Hxwon*LqI@x#%-hSkGR?f
zsbNV;zWs>rQf|hfY>E1Ioh{b_>YrLeD+L~jA6JYK;sdMLA@|Q%!`=EjA=koUt*Cdy
z<gfu@%I=a67{i}fXY(8r8NzbF+wp_#AJurdxPqFIP<IGQK3M@aNtic@O8Q03e>wQe
z+@Wg1$U|1BC0Ow9M)?^;K*HTmH9Nr6xN>peU(t4GoF?q{al3P@F+)p+_weT9gbpJO
zQKT}4bsaxpFZ%-hsWWLooeBB8a4x%@<5KIljaJS7GSkC~B1cc}g9{!2?;;APN!1!$
zOaW2bWjn7Fu*_St!CfB^wOyF)A|$wli9gk`8+^cfrWbYAPg343&K&D;eC)aMzTLbO
zpW2VU?jK<OSI;e)Y?x(u=J9I(w;C4AP71beee?Q={qM*HHORl}+W;AEJCpA9sCet8
z^W<lfhwQmdL?jty-Zw+vIhi_D!Xb*)L$GN%@16I5p`|RO0dlYZazi}u|I;q;6F7kN
zeWEles={@7ZNAOHW(<-G$|gUh|HU10tQZ~sarwQ*cqz4x6vg61q8E%iJVa#Rhh@eu
z78y4el6`qOlm5(eBR?~h+uQ34rX5K0%iHCl<W0sw)+YBOr6*sv^DV+2!eG?V>=L|Z
z4}xLeLz;0s%%g#UY|uKfnTW!m$l($w%T<8UZGx9`i5)XBuV+}RZKI@(r#btwJ><%R
z++3`(NAlWofEFC%;QSCb5Z29YpzqTK-~hOk0SSYVrMUvgn@)od68gN6H%bU5Qsj<9
zmECyJGama|XqK4CncJz5iqB;Ka2j$vk411qLCfb#<+AOynl4fx6oL*yg^K~}{nk*h
zJ<nehKje+d+SE2Mr7`3-aZG;+ARw&6FJKc5GCT1fK(_SB*ZbzQqEz}Up}QL+M8~Sg
z=Y-&x2L$<;cZ8v()#?zjNi0;F{Q`3~NgM7G?uiu^6A`{B^SiL93p-=S{1ur>uhdF*
zd%6$c++?+#6A|r^Xjbk1b8G_yJ=Pd2mS7ao>T!oyfo#y#1w)|I67!)aqMi)Zd)Ytk
zn{xg>c_XK;1fSGfRuBvZUFRk0NDW^tx~(2i*~_p-#y;RGjhK4=nfA?=w!5=CPhaB*
zws7<;#G>=!UtX)Mgy<>%%pROWsrwaEZc@~{cYFt9p9_=vtCWiVF{oX<=2sV8*K^HB
za3E;qR_rYnz3SR0VM`Q=y>L&Y0=2F2U-02cqjPk6geSTzqa)UlR6muY%(wq~<CicW
z5d8lj0EGV-80x@(z`qd-h3_GNM6U3<8l8d|U5fHQ;9p`M^+V6Pe4-s!W?kk=;2P9l
z27VYqZxABctT4i?;MW)5_i6g~*T=6PASP=jw+-uCQcC=oPT`b$YK$k|eP;2gvXQbF
zlw*<L;krxI_zPx~dc<r=a;*~txii6T+`DGDhXwHJ-DJQVc}XX4SslF3=~*oR+OKqI
zNz?hF31WbmYJp8t%nm6bf>MY|+-`=@dmpw7VMKDWM>RVuH?1vhi6%MjpcLH%s+|W_
z#pMFelu2|80s`baTs>w!CMANy0mMWF0s~~VvzfYU|8AZ8J({wFwu8X?%^Mq}L9Nh5
z08%z$lQCVW$U#I82$^L<b>#eC<IFe4b}-f0CeIJZ?bScR2rYf@|8YYum~}tM6X{b-
zfr>J0j;H|H{3KdVga{IH@v>oPyJc0{H4u!tG_U@|aT!+TbeviFJo@HJpIfOWq_?$I
z!QhrEGa~Q%?LTusl4~?Zm>;R;)#Fp^sSbuSt<Sl@-VcI4YW@%^Btm*q->9SZddf>t
zTYhtNlkv1Yb-l&?p0l;`2sLE#|K+X#(TeDunaq-c>yI_)3~al`7?j9O?EfL8?I+Z+
zU+e2pOdep@C#HIU_0~G%w-fvvqEg1G^19Gg8x#pOaAzv?2^JwtNEWIP^@Q&{;3IiV
zyc$+vx+N6Y`!V#zatT=U@jG!_uEFwu;t{*O)jTH5Gd7Eoa6#b-D!sEy8SGPm3-_-Y
z#xJ-5@D_3dhFcHbDpnq>dQlb^D<z4V%xHm~qZJN-Go5QiX7P+iT$hl%v#XM2OrkC<
z5%4SC0q)_s?b~b@`bbhWyPOcjkhrq8FG>>DtngOI@H{jN*DMh%F)gv>F||P+*x$=d
z3g2D=m)p=Yg<4WbjLZ-07ThMlP7UCEYJe7dS8+izy0*KIt`rd?D>!{97WNERRK~|e
zODeLO@f(gJZpuM8^p1xAJG1awv|eeuR*5S6kSlyeQGm@)XO)-gqlB;t0#Q}}66_76
za`vKfjS?pEXM*ux*Ks#fIawf*%(x@(ZBuie>a}~Yfs(e_XwRR}g5tk{*d}Aj&73f0
z!|!DZ=p<8)^3<J`N&Yv=P+|GiEuE?j-7&GQmM=jhmju78xr6XR*II3A_9*Aq@7o``
z%@&!^l=h`qFcR(e*a+0p%smDxkGs3kI}X@Jk8gSG=`QFWHwwyC`-Y;@p^uqs(cMq=
zRJoXug#g#}1loNC9Vrw*CvsF~(-_B(TxIwAs<2y(!Ltg5%s%=IeuwZk5b*<s4<TNp
z=iBCtPzP*A_CBnN76;9tB_FXi>jrl3R;90!nXR%6O%c0*8=SY&A{SGaLi)?HpS<OT
z*Zt}ek?hE;qGR8a(Mwdtd4YlE0%a{R3XKVGvG#-$0kSmtRmAeZM=5U^e6(_z2KAJg
zkn<%254llT+NN&AW9Oc7-%xG=8Jm=jtm0~3t?I*IJ=JS}Ic^zn4WXZCq7Td;!lkRw
z36L)gDuZWKb2)|Y>zrOr?U$H4Tat$MZq(^=wj_W-K8~)|=>DxMhPc1CaNd2)ncn`f
z*n}oof;B9M$JQ^vCg+Bb^ijTAwTEq#8e>i_!m_<cL-#M)2gnfVHwqf-F$SUSSF*qO
ze*`B5C8%XiYg_6QHX&yzG<l;L&~3D<jqNPqp6Fy7BHLcj^d3k7K&koI&?GM*$n%rX
zm*Ow;IC6nt&W(W~x2!(0H%ipR2k?!r|3qtj$~T86uz$SNC&>TbK|pALO028L2l^!1
z{X^j)k6Pr<sm3l~A{Ws*h57iY>gH(*Cs8GX4>tw)$Hm!ob`$E|WOUMz<GvF6LK<5B
zG}(s}@*|qy-t1glAZ!_*zMT2~M>T4Ezj%(#1&Q-l0L^7&x^GAN8J{wf2Ea@mR+Y#?
zlLJ&U(k&%%aOf;fz@NC5Fk3Uj12xOz={0oDrYx7>9ot1Q0;j`WX><x7i>92>8`oWE
z8iN1=C%4HV1-n5i#pCRV>9pgtCLL9>+`ngBz*Yxdw>}2E8FkE0_N9oBLB9f4=HxEh
ztC&Gm6jD_a6enTj^iP`%EWFOM&A2$4N#zi_n=P0;puv^Scob;VlU08Y1JyKHyXTaI
zsV76qCx;<dQJ^nd)M?q&-e0pZiZ%}LJd8m1wt?xelz$vcuMs#Z!6i3KVKp*zCNOb1
zKzE*<wkL)J<na11nAkrrtMyC(gXF?)&{5fH5{znzcFhzUs~Ay)D5r+W8tZywb9j+N
z(9EEPzPAGkTN9BVZ!6bNz;Rz=KH#0x&2kIU2*mAR^pDd(7|=k)@|Q1oqAg6}x&U_w
zXzd+=A0hNg=)}+@*V|ac@Pk{wg^k9Hj#rWwf`4k+jB*_X{-{wx#!jg@uLg}8+P5FZ
z=iC}9thcxO$m46)n4iI4x%3Eqa?l0GZkp-zBR#-HF%UY8&3bx`20r;?)Th*wtq=#r
zuM%7h=NJcy{qstpZSI9;2%qkDJds6X84bL|4x#bwTk&VUY!FAE-0j1SVh!mA5bizy
zBd2d7Zg3iHl5GCG*TvM0<qRX-VgIn-wfxbD+B843xA*t2J2u=OYf*CVQkcZ8%>5k~
zYFyias8X2u+CCsj7*J$O5jlkL1MGpyJd^oi=!Dp6RLt@f)F<2l`SoY$3CU526#hp(
zo#5H7mAm&sKU>X9K_FB6K_p_1>u@RlM?9b4(Jqgc_eMWa=fNUk4?G>?%ajFQ7pzjp
zEwtNc|LSfz9HHy2McsACX7upy@IQp7pZ|rzt4_2@-++REfhhmqZ-OI-3;6DiCV~DH
zB8V#L!Oq|?haKEvwQw5;fGunC(|jwSF^cfpG)-XK{uj2OpeuY^o%iA!@FFgPj)C5S
zA?|yN?|U12=V8HRmB9J<OHuK9X6p0$pp(u0I2Y*f1z`kc&z8mK+0gswVI&<9`-=m`
z5^gBbUzxb3n5}^{y`dyz5eNua?3%$~#L2=8r69v6I{u47mdOcfCnLk+K^-R(yr@b^
z4~Hklz;JPZ#~EL<lQBxw7$J%_QipD!Bvw;mn(VBvsm9JX;Tq^Y?`?BGa=h{@AQn=w
ztsk3Tg`slvl~HF8{)d8+glb2UvWKaBDl1Nn)Dxf633sf8f`WT~0?>FK#Y#PbIw2$C
z0g+(OaWUAMHF=(6f!)lWnf|Q7wV|X+{H^4;m6@K}l1CAXJEH*;#blu@#>QGzk%irD
znoudUI&s+!5yG;vYT~#M{t==0X<~G~EjGU(-!T^pu5Jtr%Np7<c1N%5F%OZ$z=H+I
zSW!0w$8{W0Yi8iV3{>*2HoC<e-5a2VO^BTgv0AHv>TW}N{#}RbyDvOnBu>K51gd>X
zLWlH!$~yOWsL}?GAJgPgOj=Bf6S?0nFCt_tL$1Tx9d{BUlS_@Z&|q?VZNsn}rkj*P
zUe}pyB=Ndsx*$SXYHMm&O-xuNtBXBOKEr9}^O=9<`Ofb-&vP!H^E~G{zn@9pqn4sE
zJLBMq8a>IQQq16uOP4FFX7NT3_tgO-GCOYd6I@<a^JiPNx7;>;?x>dDMU^2&dkvU7
zT|F2dTwIhq*>oUDTkjjKWe2Q4;|HpWyJMbpH=W`tIdvCbw(EJ2yRL;A?Sr*WrTD|7
z!Q6L}o2B-K6_iz$kpo9!)s*nwV-6CUjG_s?WXqg5F}8Yy;Wr!Bc=3O@Sjl-T3HQS3
zWcGj0s0=9lq%$ALAsKrHHatAdFASy1538neIl-9^2nK0{JK(W!ZXdQMeOqe@w)8Z=
zpYA{NQ!T+UHK%S*c7@crfJ?vqsu(PJukuW3z`ILa&eMDBze}~{OR^xFbSO1GqVM&=
z4vC{i=ZnJQHC_9&tVbt2+cH(bB2$l{Fc0?(vshV@?Tcqy@VxDR;XHZUJ=Dc)&9V|I
zWpJggWa7BZV{rIwfrw@QwOWeukcZI^-{R?3Cd3HhmD6L4tp)OeIfZadXKgQvcNC^L
z)X$Ff-i1-}i#tJ3lvtKCA0kG4ChABWW7HZGTz7^0lw2n5?WK}C@(YfYVL$ngmPZ}S
z<0kb|eD0fOTK!sEI9qd;zm3^@VJhykz1{-+O1_{WBz(l8m3p<j+uHFc&+&DL3yJRO
z7WsD@^<wl=-S?kw-puvgohZ>@f?cL(OG!?RpEh$4bn}NBXooR}278UFWGj-+hEk~a
z`D9anC^ue5&=r`aRCvfGufN%5S4Kir4XafnC^7#wK6i*<*pZ_@;X~-iR=Sy=|5rhA
z_4Qc^qIb|x59^bAkokq@`a4@3DBkoZizT74Ek0hKlT%cJQtz<aoaXagU0ENv`;Uy-
zcIA(Izg3i1It7_{E=F97X*-#b-1dLGd(5`!R5#xOcy-#7#k|f4+A9(x@}a-^#hmNv
zjHL~8L4JbrR&|YfhO+!)c^8W+?MZzpcnVGK<8-IzV%8?hfYhm0s&~h|_a!;>MN;N0
z%|%>rcF%p?aV3i?w=tDJA|oX-a6GK04SQCsxILrPhg@xV+~wW=VPcT7^u*RFe(sG|
zX})O+)VX0_=JkbG7f(!~p>%<t^KvsV*|mxMVEQSkvvQyIx93jG;9rMvN+tB$(<&_3
zA4Pov5})ZCW@hll`jmP0P~vU6J+V1UIwg)h_&mCzlQkH+Ip6=)te|`dY8i?Pv0yIQ
zXY1)Z7);OGkh(Xt+#<Fgpvc~57UJ{#oC6aF(kY>RU2|@JqbZxU!it-DjCW)+#}uPX
zt+{|G%#}Ammq##B+=!beac{@3ZV`)35?5;?AMRsusdrgd_#w{H-f8sRI^tV3<kU|+
z={n<=@T2ywv;-oa&~*5X!kr@t&WDsJk1*z(w;gv>K6o)L)dSNXaULi9-sPLXlUf>R
zbiKP!{c{Q4=S}@LJnjwM<d>I=JF8~SY2FRRY<nYJ$n#u!|4XsL(%u-i8@)#sKDFF_
z+;bx~ev=pJfsS?X21`NY13Z0bF<md^=}c+QpU*-?&h|9;y6*08Y|eb46DUe!vLDTl
zog3zOXVx`wXz^ohX7#EqB=(?#de6A-%%$T=e~u0Yle6mU3E8^l=b3TUm83mUR`ROX
zMrCo0KVHaSEF-}`K(^YXH=Lz<OLArXfCxqwkOfwwe*j3Y!byTf!A;ZPB%mUQR$-6D
zbYY)DofUY@0uHjP1R>`wJD~5`(uy(r>q&9&K)4Y$gwzCJ{}tiq1oT~{Js4dpb|w%m
zZ-Q_7Oi|@-GKkO#ycpCiqX>&_RTM^?1Hf(+D~(@e^;Rkc*XO|6pg@kiP_*>QPEZ*3
z3D=HR6j2d^%Bt#!>RL`B0H9Sn)r9cxaPB(13D}irKB&D4kCD<^S0)NASLuSnAU3#9
z&}~-ILBY1Va!Acc=oh?>V*u_b6I6Rxdcr^4(pOl4HzJ8mkVv&0rq%!{95ggURMuin
zzTOoq<5d+=IL%2JTnjDu8Z6%lO;y`%M7;K)|J2A~Y^>lPRH1`48lcc#{9k)=-WsZ@
z@l+I=Tf@&GQH|JZ3zsWG#<h0fnoTkQ5KvIC9mK5l2iF{W0l)|a6cM4$2019&5!nHX
zLKjkabI{fO42jg?p?&q@&;chSq-WM!HkzSCbzKnA75Gz~3Ao}S^u<I7PQXHeH1}0d
z3taP_0RRIOWa)!I%K@TLd%Xd;_5uZLON0WC`K^M;Nd$Tb*Hr<4Dhm7<3xnICNvbr`
zkoAjx&{bO<he2m>ZI%-NcA%6bl3@UZ?AXenaPkW7I%O2(pMz|dY2laS5}C1qkIRGb
z7kzS1F%j@3TOa%~rdt`(0e~S&EhZm<95`m+>P;?ukNb6>aUlfyG78iO*I$;jQECdO
ORzXA2f%7X@nSTIfr%7r6

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 78cb6e16a4..8a848873f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 23d15a9367..adff685a03 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
index 5eed7ee845..e509b2dd8f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From 01fc964cb63e1c83c8e440d00a37814d171d8892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 20 Nov 2025 16:36:32 +0100
Subject: [PATCH 002/113] When handling a plain text share intent, check if it
 contains Uris before handling its content.

---
 .../element/android/features/share/impl/ShareIntentHandler.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt
index 9c07b588fb..9342ef60d4 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt
@@ -58,8 +58,9 @@ class DefaultShareIntentHandler(
         onPlainText: suspend (String) -> Boolean,
     ): Boolean {
         val type = intent.resolveType(context) ?: return false
+        val uris = getIncomingUris(intent, type)
         return when {
-            type == MimeTypes.PlainText -> handlePlainText(intent, onPlainText)
+            uris.isEmpty() && type == MimeTypes.PlainText -> handlePlainText(intent, onPlainText)
             type.isMimeTypeImage() ||
                 type.isMimeTypeVideo() ||
                 type.isMimeTypeAudio() ||
@@ -67,7 +68,6 @@ class DefaultShareIntentHandler(
                 type.isMimeTypeFile() ||
                 type.isMimeTypeText() ||
                 type.isMimeTypeAny() -> {
-                val uris = getIncomingUris(intent, type)
                 val result = onUris(uris)
                 revokeUriPermissions(uris.map { it.uri })
                 result

From 7c6aa0655b4b933d31892692aad0a1898d30348b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 20 Nov 2025 16:22:56 +0100
Subject: [PATCH 003/113] item can be reordered, so hasPendingChanges should
 compare set and not list.

---
 .../rolesandpermissions/impl/roles/ChangeRolesPresenter.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
index 86012462ce..d92ecaf0a1 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
@@ -104,7 +104,7 @@ class ChangeRolesPresenter(
             }
         }
 
-        val hasPendingChanges = usersWithRole.value != selectedUsers.value
+        val hasPendingChanges = usersWithRole.value.toSet() != selectedUsers.value.toSet()
 
         val roomInfo by room.roomInfoFlow.collectAsState()
         fun canChangeMemberRole(userId: UserId): Boolean {

From c39c4260ebe64c1cbf2485edd93fef5c495af4a4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 20 Nov 2025 16:23:41 +0100
Subject: [PATCH 004/113] Comparing mutable state was wrong

---
 .../rolesandpermissions/impl/roles/ChangeRolesPresenter.kt     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
index d92ecaf0a1..6030279b98 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
@@ -134,11 +134,10 @@ class ChangeRolesPresenter(
                 is ChangeRolesEvent.Save -> {
                     val currentUserIsAdmin = roomInfo.roleOf(room.sessionId) == RoomMember.Role.Admin
                     val isModifyingAdmins = role == RoomMember.Role.Admin
-                    val hasChanges = selectedUsers != usersWithRole
                     val isConfirming = saveState.value.isConfirming()
                     val modifyingOwners = role is RoomMember.Role.Owner
 
-                    val needsConfirmation = (modifyingOwners || currentUserIsAdmin && isModifyingAdmins) && hasChanges && !isConfirming
+                    val needsConfirmation = (modifyingOwners || currentUserIsAdmin && isModifyingAdmins) && hasPendingChanges && !isConfirming
 
                     when {
                         needsConfirmation -> {

From f8cd83db24453facb5ced9b5df2a2470a1350719 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 20 Nov 2025 16:56:01 +0100
Subject: [PATCH 005/113] Improve code around confirmation.

---
 .../impl/roles/ChangeRolesPresenter.kt        | 17 +++++---
 .../impl/roles/ChangeRolesView.kt             | 40 ++++++++-----------
 .../impl/roles/ConfirmingModifyingAdmins.kt   | 12 ++++++
 .../impl/roles/ConfirmingModifyingOwners.kt   | 12 ++++++
 .../impl/roles/ChangeRolesPresenterTest.kt    |  4 +-
 5 files changed, 54 insertions(+), 31 deletions(-)
 create mode 100644 features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingAdmins.kt
 create mode 100644 features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingOwners.kt

diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
index 6030279b98..781a909f4f 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
@@ -136,13 +136,18 @@ class ChangeRolesPresenter(
                     val isModifyingAdmins = role == RoomMember.Role.Admin
                     val isConfirming = saveState.value.isConfirming()
                     val modifyingOwners = role is RoomMember.Role.Owner
-
-                    val needsConfirmation = (modifyingOwners || currentUserIsAdmin && isModifyingAdmins) && hasPendingChanges && !isConfirming
-
+                    val confirmationValue = if (hasPendingChanges && !isConfirming) {
+                        when {
+                            modifyingOwners -> ConfirmingModifyingOwners
+                            currentUserIsAdmin && isModifyingAdmins -> ConfirmingModifyingAdmins
+                            else -> null
+                        }
+                    } else {
+                        null
+                    }
                     when {
-                        needsConfirmation -> {
-                            // Confirm modifying users
-                            saveState.value = AsyncAction.ConfirmingNoParams
+                        confirmationValue != null -> {
+                            saveState.value = confirmationValue
                         }
                         !saveState.value.isLoading() -> {
                             roomCoroutineScope.save(usersWithRole.value, selectedUsers, saveState)
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
index 3a981b66b6..76cb334037 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
@@ -178,29 +178,23 @@ fun ChangeRolesView(
                             onDismiss = { state.eventSink(ChangeRolesEvent.CloseDialog) }
                         )
                     }
-                    else -> {
-                        when (state.role) {
-                            is RoomMember.Role.Owner -> {
-                                ConfirmationDialog(
-                                    title = stringResource(R.string.screen_room_change_role_confirm_change_owners_title),
-                                    content = stringResource(R.string.screen_room_change_role_confirm_change_owners_description),
-                                    submitText = stringResource(CommonStrings.action_continue),
-                                    onSubmitClick = { state.eventSink(ChangeRolesEvent.Save) },
-                                    onDismiss = { state.eventSink(ChangeRolesEvent.CloseDialog) },
-                                    destructiveSubmit = true,
-                                )
-                            }
-                            is RoomMember.Role.Admin -> {
-                                ConfirmationDialog(
-                                    title = stringResource(R.string.screen_room_change_role_confirm_add_admin_title),
-                                    content = stringResource(R.string.screen_room_change_role_confirm_add_admin_description),
-                                    onSubmitClick = { state.eventSink(ChangeRolesEvent.Save) },
-                                    onDismiss = { state.eventSink(ChangeRolesEvent.CloseDialog) }
-                                )
-                            }
-                            // No confirmation needed for Moderator or User roles
-                            else -> Unit
-                        }
+                    is ConfirmingModifyingOwners -> {
+                        ConfirmationDialog(
+                            title = stringResource(R.string.screen_room_change_role_confirm_change_owners_title),
+                            content = stringResource(R.string.screen_room_change_role_confirm_change_owners_description),
+                            submitText = stringResource(CommonStrings.action_continue),
+                            onSubmitClick = { state.eventSink(ChangeRolesEvent.Save) },
+                            onDismiss = { state.eventSink(ChangeRolesEvent.CloseDialog) },
+                            destructiveSubmit = true,
+                        )
+                    }
+                    is ConfirmingModifyingAdmins -> {
+                        ConfirmationDialog(
+                            title = stringResource(R.string.screen_room_change_role_confirm_add_admin_title),
+                            content = stringResource(R.string.screen_room_change_role_confirm_add_admin_description),
+                            onSubmitClick = { state.eventSink(ChangeRolesEvent.Save) },
+                            onDismiss = { state.eventSink(ChangeRolesEvent.CloseDialog) }
+                        )
                     }
                 }
             },
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingAdmins.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingAdmins.kt
new file mode 100644
index 0000000000..10d46abbc3
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingAdmins.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.rolesandpermissions.impl.roles
+
+import io.element.android.libraries.architecture.AsyncAction
+
+data object ConfirmingModifyingAdmins : AsyncAction.Confirming
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingOwners.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingOwners.kt
new file mode 100644
index 0000000000..9799f68408
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingOwners.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.rolesandpermissions.impl.roles
+
+import io.element.android.libraries.architecture.AsyncAction
+
+data object ConfirmingModifyingOwners : AsyncAction.Confirming
diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
index c5e28a5078..9b7a8971c3 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
@@ -358,7 +358,7 @@ class ChangeRolesPresenterTest {
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
             awaitItem().eventSink(ChangeRolesEvent.Save)
             val confirmingState = awaitItem()
-            assertThat(confirmingState.savingState).isEqualTo(AsyncAction.ConfirmingNoParams)
+            assertThat(confirmingState.savingState).isEqualTo(ConfirmingModifyingAdmins)
             confirmingState.eventSink(ChangeRolesEvent.Save)
             assertThat(awaitItem().savingState).isInstanceOf(AsyncAction.Loading::class.java)
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(true))
@@ -383,7 +383,7 @@ class ChangeRolesPresenterTest {
 
             awaitItem().eventSink(ChangeRolesEvent.Save)
             val confirmingState = awaitItem()
-            assertThat(confirmingState.savingState).isEqualTo(AsyncAction.ConfirmingNoParams)
+            assertThat(confirmingState.savingState).isEqualTo(ConfirmingModifyingAdmins)
 
             confirmingState.eventSink(ChangeRolesEvent.CloseDialog)
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Uninitialized)

From fbddfbdb0e167fb670679fe50688dc7e56b3b121 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 20 Nov 2025 17:23:21 +0100
Subject: [PATCH 006/113] Render room version in room detail screen if
 developer mode is enabled.

---
 .../roomdetails/impl/RoomDetailsPresenter.kt  |  1 +
 .../roomdetails/impl/RoomDetailsState.kt      |  1 +
 .../impl/RoomDetailsStateProvider.kt          |  1 +
 .../roomdetails/impl/RoomDetailsView.kt       | 19 ++++++++++++++++++-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
index ec805731ec..232f4d626c 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
@@ -205,6 +205,7 @@ class RoomDetailsPresenter(
             canReportRoom = canReportRoom,
             isTombstoned = roomInfo.successorRoom != null,
             showDebugInfo = isDeveloperModeEnabled,
+            roomVersion = roomInfo.roomVersion,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
index 6e8d563d4a..2332776e96 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
@@ -49,6 +49,7 @@ data class RoomDetailsState(
     val canReportRoom: Boolean,
     val isTombstoned: Boolean,
     val showDebugInfo: Boolean,
+    val roomVersion: String?,
     val eventSink: (RoomDetailsEvent) -> Unit
 ) {
     val roomBadges = buildList {
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
index cbb54071a1..783fcfaf10 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
@@ -146,6 +146,7 @@ fun aRoomDetailsState(
     canReportRoom = canReportRoom,
     isTombstoned = isTombstoned,
     showDebugInfo = showDebugInfo,
+    roomVersion = "12",
     eventSink = eventSink,
 )
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index fe4a002af8..de0a2cba1b 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -264,6 +264,7 @@ fun RoomDetailsView(
             if (state.showDebugInfo) {
                 DebugInfoSection(
                     roomId = state.roomId,
+                    roomVersion = state.roomVersion,
                 )
             }
         }
@@ -714,7 +715,10 @@ private fun OtherActionsSection(
 }
 
 @Composable
-private fun DebugInfoSection(roomId: RoomId) {
+private fun DebugInfoSection(
+    roomId: RoomId,
+    roomVersion: String?,
+) {
     val context = LocalContext.current
     PreferenceCategory(showTopDivider = true) {
         ListItem(
@@ -737,6 +741,19 @@ private fun DebugInfoSection(roomId: RoomId) {
                 )
             },
         )
+        ListItem(
+            headlineContent = {
+                Text("Room version")
+            },
+            supportingContent = {
+                Text(
+                    text = roomVersion ?: "Unknown",
+                    style = ElementTheme.typography.fontBodySmRegular,
+                    color = ElementTheme.colors.textSecondary,
+                )
+            },
+            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Info())),
+        )
     }
 }
 

From 729e5e9218759a58d5efb4ce3ccf0c69077e7e49 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 20 Nov 2025 17:29:01 +0100
Subject: [PATCH 007/113] Fix roleOf extension. Creator are Owner Role only if
 privilegedCreatorRole is true.

---
 .../matrix/test/room/RoomInfoFixture.kt       |  2 +-
 .../matrix/ui/model/RoomInfoExtension.kt      |  4 +-
 .../matrix/ui/model/RoomInfoExtensionTest.kt  | 79 +++++++++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtensionTest.kt

diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
index abb24fc153..71ed8b83be 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
@@ -53,7 +53,7 @@ fun aRoomInfo(
     notificationCount: Long = 0,
     userDefinedNotificationMode: RoomNotificationMode? = null,
     hasRoomCall: Boolean = false,
-    roomPowerLevels: RoomPowerLevels = RoomPowerLevels(
+    roomPowerLevels: RoomPowerLevels? = RoomPowerLevels(
         values = defaultRoomPowerLevelValues(),
         users = persistentMapOf(),
     ),
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt
index 52e7d43085..f9a86c9bd7 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt
@@ -23,12 +23,12 @@ fun RoomInfo.getAvatarData(size: AvatarSize) = AvatarData(
 
 /**
  * Returns the role of the user in the room.
- * If the user is a creator, returns [RoomMember.Role.Owner].
+ * If the user is a creator and [RoomInfo.privilegedCreatorRole] is true, returns [RoomMember.Role.Owner].
  * Otherwise, checks the power levels and returns the corresponding role.
  * If no specific power level is set for the user, defaults to [RoomMember.Role.User].
  */
 fun RoomInfo.roleOf(userId: UserId): RoomMember.Role {
-    return if (creators.contains(userId)) {
+    return if (privilegedCreatorRole && creators.contains(userId)) {
         RoomMember.Role.Owner(isCreator = true)
     } else {
         roomPowerLevels?.roleOf(userId) ?: RoomMember.Role.User
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtensionTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtensionTest.kt
new file mode 100644
index 0000000000..c6dcc27bba
--- /dev/null
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtensionTest.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.model
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.A_USER_ID_2
+import io.element.android.libraries.matrix.test.A_USER_ID_3
+import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.libraries.matrix.test.room.defaultRoomPowerLevelValues
+import kotlinx.collections.immutable.toImmutableMap
+import org.junit.Test
+
+class RoomInfoExtensionTest {
+    @Test
+    fun `roleOf returns Owner for creator with privilegedCreatorRole true`() {
+        val roomInfo = aRoomInfo(
+            privilegedCreatorRole = true,
+            roomCreators = listOf(A_USER_ID),
+        )
+        assertThat(roomInfo.roleOf(A_USER_ID)).isEqualTo(RoomMember.Role.Owner(isCreator = true))
+    }
+
+    @Test
+    fun `roleOf returns User for not creator with privilegedCreatorRole true`() {
+        val roomInfo = aRoomInfo(
+            privilegedCreatorRole = true,
+            roomCreators = listOf(A_USER_ID),
+        )
+        assertThat(roomInfo.roleOf(A_USER_ID_2)).isEqualTo(RoomMember.Role.User)
+    }
+
+    @Test
+    fun `roleOf returns User for creator with privilegedCreatorRole false`() {
+        val roomInfo = aRoomInfo(
+            privilegedCreatorRole = false,
+            roomCreators = listOf(A_USER_ID),
+        )
+        assertThat(roomInfo.roleOf(A_USER_ID)).isEqualTo(RoomMember.Role.User)
+    }
+
+    @Test
+    fun `roleOf returns role from the power level`() {
+        val roomInfo = aRoomInfo(
+            privilegedCreatorRole = false,
+            roomPowerLevels = RoomPowerLevels(
+                values = defaultRoomPowerLevelValues(),
+                users = mapOf(
+                    A_USER_ID to 100L, // Admin
+                    A_USER_ID_2 to 50L, // Moderator
+                    A_USER_ID_3 to 0L, // User
+                ).toImmutableMap(),
+            ),
+            roomCreators = listOf(A_USER_ID),
+        )
+        assertThat(roomInfo.roleOf(A_USER_ID)).isEqualTo(RoomMember.Role.Admin)
+        assertThat(roomInfo.roleOf(A_USER_ID_2)).isEqualTo(RoomMember.Role.Moderator)
+        assertThat(roomInfo.roleOf(A_USER_ID_3)).isEqualTo(RoomMember.Role.User)
+    }
+
+    @Test
+    fun `roleOf returns User when the power level is null`() {
+        val roomInfo = aRoomInfo(
+            privilegedCreatorRole = false,
+            roomPowerLevels = null,
+            roomCreators = listOf(A_USER_ID),
+        )
+        assertThat(roomInfo.roleOf(A_USER_ID)).isEqualTo(RoomMember.Role.User)
+        assertThat(roomInfo.roleOf(A_USER_ID_2)).isEqualTo(RoomMember.Role.User)
+        assertThat(roomInfo.roleOf(A_USER_ID_3)).isEqualTo(RoomMember.Role.User)
+    }
+}

From fafb243eb28f18039057c5ba4db9fbc9a1598760 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 20 Nov 2025 18:06:55 +0100
Subject: [PATCH 008/113] Fix and add missing preview.

---
 .../impl/roles/ChangeRolesStateProvider.kt                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
index df74b71ae1..2594681850 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
@@ -46,7 +46,7 @@ class ChangeRolesStateProvider : PreviewParameterProvider<ChangeRolesState> {
                 selectedUsers = aMatrixUserList().take(1).toImmutableList(),
             ),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.ConfirmingCancellation),
-            aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.ConfirmingNoParams),
+            aChangeRolesStateWithSelectedUsers().copy(savingState = ConfirmingModifyingAdmins),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Loading),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Success(true)),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Failure(Exception("boom"))),
@@ -58,6 +58,8 @@ class ChangeRolesStateProvider : PreviewParameterProvider<ChangeRolesState> {
                 )
             ),
             aChangeRolesStateWithOwners(role = RoomMember.Role.Owner(isCreator = false)),
+            aChangeRolesStateWithOwners(role = RoomMember.Role.Owner(isCreator = false))
+                .copy(savingState = ConfirmingModifyingOwners),
         )
 }
 

From c814bf1a73eb8db57b7e6029961834d339d40b6c Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Fri, 21 Nov 2025 08:35:49 +0000
Subject: [PATCH 009/113] Update screenshots

---
 ...olesandpermissions.impl.roles_ChangeRolesView_Day_13_en.png | 3 +++
 ...esandpermissions.impl.roles_ChangeRolesView_Night_13_en.png | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en.png

diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en.png
new file mode 100644
index 0000000000..5ae55a94d8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fbee2417fcd701fce6d3f4d20e677681de6d529e5a17f0bfffc1c1592d73398a
+size 58939
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en.png
new file mode 100644
index 0000000000..8fb608a939
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41698290446bc0f2e58fac106cdef381c1b46f3655ff51fff574ff867cd70d10
+size 57006

From f03f64ad3b0f6323897d58a0798e129a8aa7563c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 09:33:41 +0100
Subject: [PATCH 010/113] Avoid computing the boolean on each recomposition.

---
 .../rolesandpermissions/impl/roles/ChangeRolesPresenter.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
index 781a909f4f..fdb17d6e04 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
@@ -104,7 +105,11 @@ class ChangeRolesPresenter(
             }
         }
 
-        val hasPendingChanges = usersWithRole.value.toSet() != selectedUsers.value.toSet()
+        val hasPendingChanges by remember {
+            derivedStateOf {
+                usersWithRole.value.toSet() != selectedUsers.value.toSet()
+            }
+        }
 
         val roomInfo by room.roomInfoFlow.collectAsState()
         fun canChangeMemberRole(userId: UserId): Boolean {

From 37e395d480e36a5742a1fcfc56f9394faf12eff3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 09:40:32 +0100
Subject: [PATCH 011/113] Fix and add test

---
 .../impl/roles/ChangeRolesPresenterTest.kt    | 54 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
index 9b7a8971c3..5c2491e0d3 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
@@ -74,7 +74,7 @@ class ChangeRolesPresenterTest {
     }
 
     @Test
-    fun `present - canChangeRole of users with lower power level unless they are owners`() = runTest {
+    fun `present - canChangeRole of users with lower power level unless they are owners - privilegedCreatorRole is true`() = runTest {
         val creatorUserId = UserId("@creator:matrix.org")
         val superAdminUserId = UserId("@super_admin:matrix.org")
 
@@ -82,6 +82,7 @@ class ChangeRolesPresenterTest {
             // User is a creator, so they can change roles of other members. So is `creatorUserId`.
             givenRoomInfo(
                 aRoomInfo(
+                    privilegedCreatorRole = true,
                     roomCreators = listOf(sessionId, creatorUserId),
                     roomPowerLevels = RoomPowerLevels(
                         defaultRoomPowerLevelValues(),
@@ -99,7 +100,7 @@ class ChangeRolesPresenterTest {
 
             val roomMemberList = aRoomMemberList() + listOf(
                 // Owner - superadmin
-                aRoomMember(userId = superAdminUserId, role = RoomMember.Role.Owner(isCreator = true)),
+                aRoomMember(userId = superAdminUserId, role = RoomMember.Role.Owner(isCreator = false)),
                 // Owner - creator
                 aRoomMember(userId = creatorUserId, role = RoomMember.Role.Owner(isCreator = true))
             )
@@ -118,6 +119,55 @@ class ChangeRolesPresenterTest {
         }
     }
 
+    @Test
+    fun `present - canChangeRole of users with lower power level unless they are owners - privilegedCreatorRole is false`() = runTest {
+        val creatorUserId = UserId("@creator:matrix.org")
+        val superAdminUserId = UserId("@super_admin:matrix.org")
+
+        val room = FakeJoinedRoom().apply {
+            // User is a creator, so they can change roles of other members. So is `creatorUserId`.
+            givenRoomInfo(
+                aRoomInfo(
+                    privilegedCreatorRole = false,
+                    roomCreators = listOf(sessionId, creatorUserId),
+                    roomPowerLevels = RoomPowerLevels(
+                        defaultRoomPowerLevelValues(),
+                        users = persistentMapOf(
+                            // Creator is an admin
+                            sessionId to RoomMember.Role.Admin.powerLevel,
+                            creatorUserId to RoomMember.Role.Admin.powerLevel,
+                            // bob is Admin
+                            A_USER_ID_2 to RoomMember.Role.Admin.powerLevel,
+                            // carol is Moderator
+                            A_USER_ID_3 to RoomMember.Role.Moderator.powerLevel,
+                            // super_admin is Owner - Superadmin
+                            superAdminUserId to RoomMember.Role.Owner(isCreator = false).powerLevel,
+                        )
+                    )
+                )
+            )
+
+            val roomMemberList = aRoomMemberList() + listOf(
+                // Owner - superadmin
+                aRoomMember(userId = superAdminUserId, role = RoomMember.Role.Owner(isCreator = false)),
+                // Owner - creator
+                aRoomMember(userId = creatorUserId, role = RoomMember.Role.Owner(isCreator = true))
+            )
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList.toImmutableList()))
+        }
+        val presenter = createChangeRolesPresenter(room = room)
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            skipItems(1)
+            awaitItem().run {
+                assertThat(canChangeMemberRole(A_USER_ID_2)).isFalse() // Creator cannot update Admin in this case
+                assertThat(canChangeMemberRole(A_USER_ID_3)).isTrue() // Moderator
+                assertThat(canChangeMemberRole(creatorUserId)).isFalse() // Owner
+            }
+        }
+    }
+
     @Test
     fun `present - when modifying admins, creators are displayed too`() = runTest {
         val room = FakeJoinedRoom().apply {

From 2ffbd8036351e5763b639f268747619469ad12d3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 09:42:49 +0100
Subject: [PATCH 012/113] Use test extension

---
 .../impl/roles/ChangeRolesPresenterTest.kt    | 80 +++++--------------
 1 file changed, 20 insertions(+), 60 deletions(-)

diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
index 5c2491e0d3..472426ff85 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
@@ -8,9 +8,6 @@
 
 package io.element.android.features.rolesandpermissions.impl.roles
 
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.RoomModeration
 import io.element.android.libraries.architecture.AsyncAction
@@ -31,6 +28,7 @@ import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.room.defaultRoomPowerLevelValues
 import io.element.android.libraries.previewutils.room.aRoomMemberList
 import io.element.android.services.analytics.test.FakeAnalyticsService
+import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
@@ -43,9 +41,7 @@ class ChangeRolesPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createChangeRolesPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             with(awaitItem()) {
                 assertThat(role).isEqualTo(RoomMember.Role.Admin)
                 assertThat(query).isNull()
@@ -65,9 +61,7 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             assertThat(awaitItem().searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
         }
@@ -107,9 +101,7 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(roomMemberList.toImmutableList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             awaitItem().run {
                 assertThat(canChangeMemberRole(A_USER_ID_2)).isTrue() // Admin
@@ -156,9 +148,7 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(roomMemberList.toImmutableList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             awaitItem().run {
                 assertThat(canChangeMemberRole(A_USER_ID_2)).isFalse() // Creator cannot update Admin in this case
@@ -179,9 +169,7 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(memberList))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             awaitItem().searchResults.run {
                 assertThat(this).isInstanceOf(SearchBarResultState.Results::class.java)
@@ -199,9 +187,7 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
 
             initialState.eventSink(ChangeRolesEvent.ToggleSearchActive)
@@ -218,9 +204,7 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             val initialResults = (awaitItem().searchResults as? SearchBarResultState.Results)?.results
             assertThat(initialResults?.members).hasSize(8)
@@ -244,9 +228,7 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialResults = (awaitItem().searchResults as? SearchBarResultState.Results)?.results
             assertThat(initialResults?.members).hasSize(8)
@@ -271,9 +253,7 @@ class ChangeRolesPresenterTest {
             givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
@@ -293,9 +273,7 @@ class ChangeRolesPresenterTest {
             givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.hasPendingChanges).isFalse()
@@ -322,9 +300,7 @@ class ChangeRolesPresenterTest {
             givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.hasPendingChanges).isFalse()
@@ -342,9 +318,7 @@ class ChangeRolesPresenterTest {
             givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.hasPendingChanges).isFalse()
@@ -368,9 +342,7 @@ class ChangeRolesPresenterTest {
             givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.hasPendingChanges).isFalse()
@@ -399,9 +371,7 @@ class ChangeRolesPresenterTest {
             givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
         }
         val presenter = createChangeRolesPresenter(role = RoomMember.Role.Admin, room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
@@ -422,9 +392,7 @@ class ChangeRolesPresenterTest {
             givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
         }
         val presenter = createChangeRolesPresenter(role = RoomMember.Role.Admin, room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
@@ -455,9 +423,7 @@ class ChangeRolesPresenterTest {
             room = room,
             analyticsService = analyticsService
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
@@ -492,9 +458,7 @@ class ChangeRolesPresenterTest {
             room = room,
             analyticsService = analyticsService
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
@@ -527,9 +491,7 @@ class ChangeRolesPresenterTest {
             room = room,
             analyticsService = analyticsService
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
@@ -554,9 +516,7 @@ class ChangeRolesPresenterTest {
             givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(role = RoomMember.Role.Moderator, userId = A_USER_ID)))
         }
         val presenter = createChangeRolesPresenter(role = RoomMember.Role.Moderator, room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)

From f801a0b47f96a4846cef8c85e6a946d0fcc59c03 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 11:53:28 +0100
Subject: [PATCH 013/113] Show not save dialog when exiting user profile
 edition with unsaved changes

---
 .../user/editprofile/EditUserProfileEvents.kt |  3 +-
 .../user/editprofile/EditUserProfileNode.kt   | 17 +++++--
 .../editprofile/EditUserProfilePresenter.kt   | 44 +++++++++++++++----
 .../user/editprofile/EditUserProfileView.kt   | 28 ++++++++++--
 .../EditUserProfilePresenterTest.kt           |  6 ++-
 .../architecture/navigation/BaseNavigator.kt  | 12 +++++
 6 files changed, 91 insertions(+), 19 deletions(-)
 create mode 100644 libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt

diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileEvents.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileEvents.kt
index ba62c6103f..f7f2ffceb4 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileEvents.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileEvents.kt
@@ -13,6 +13,7 @@ import io.element.android.libraries.matrix.ui.media.AvatarAction
 sealed interface EditUserProfileEvents {
     data class HandleAvatarAction(val action: AvatarAction) : EditUserProfileEvents
     data class UpdateDisplayName(val name: String) : EditUserProfileEvents
+    data object Exit : EditUserProfileEvents
     data object Save : EditUserProfileEvents
-    data object CancelSaveChanges : EditUserProfileEvents
+    data object CloseDialog : EditUserProfileEvents
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
index d37ad888ce..3d939cfbd4 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
@@ -18,6 +18,7 @@ import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
+import io.element.android.libraries.architecture.navigation.BaseNavigator
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
@@ -27,22 +28,30 @@ class EditUserProfileNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     presenterFactory: EditUserProfilePresenter.Factory,
-) : Node(buildContext, plugins = plugins) {
+) : Node(buildContext, plugins = plugins),
+    BaseNavigator {
     data class Inputs(
         val matrixUser: MatrixUser
     ) : NodeInputs
 
     val matrixUser = inputs<Inputs>().matrixUser
-    val presenter = presenterFactory.create(matrixUser)
+    val presenter = presenterFactory.create(
+        matrixUser = matrixUser,
+        navigator = this,
+    )
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         EditUserProfileView(
             state = state,
-            onBackClick = ::navigateUp,
-            onEditProfileSuccess = ::navigateUp,
+            onEditProfileSuccess = ::close,
             modifier = modifier
         )
     }
+
+    override fun close() {
+        // TODO Invoke callback
+        navigateUp()
+    }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
index 0f46abb918..46298c96a2 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
@@ -26,6 +26,7 @@ import dev.zacsweers.metro.AssistedInject
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.navigation.BaseNavigator
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.core.mimetype.MimeTypes
@@ -45,6 +46,7 @@ import timber.log.Timber
 @AssistedInject
 class EditUserProfilePresenter(
     @Assisted private val matrixUser: MatrixUser,
+    @Assisted private val navigator: BaseNavigator,
     private val matrixClient: MatrixClient,
     private val mediaPickerProvider: PickerProvider,
     private val mediaPreProcessor: MediaPreProcessor,
@@ -57,7 +59,10 @@ class EditUserProfilePresenter(
 
     @AssistedFactory
     interface Factory {
-        fun create(matrixUser: MatrixUser): EditUserProfilePresenter
+        fun create(
+            matrixUser: MatrixUser,
+            navigator: BaseNavigator,
+        ): EditUserProfilePresenter
     }
 
     @Composable
@@ -101,6 +106,13 @@ class EditUserProfilePresenter(
 
         val saveAction: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
         val localCoroutineScope = rememberCoroutineScope()
+
+        val canSave = remember(userDisplayName, userAvatarUri) {
+            val hasProfileChanged = hasDisplayNameChanged(userDisplayName, matrixUser) ||
+                hasAvatarUrlChanged(userAvatarUri, matrixUser)
+            !userDisplayName.isNullOrBlank() && hasProfileChanged
+        }
+
         fun handleEvent(event: EditUserProfileEvents) {
             when (event) {
                 is EditUserProfileEvents.Save -> localCoroutineScope.saveChanges(
@@ -124,18 +136,32 @@ class EditUserProfilePresenter(
                         }
                     }
                 }
-
                 is EditUserProfileEvents.UpdateDisplayName -> userDisplayName = event.name
-                EditUserProfileEvents.CancelSaveChanges -> saveAction.value = AsyncAction.Uninitialized
+                EditUserProfileEvents.Exit -> {
+                    when (saveAction.value) {
+                        is AsyncAction.Confirming -> {
+                            // Close the dialog right now
+                            saveAction.value = AsyncAction.Uninitialized
+                            navigator.close()
+                        }
+                        AsyncAction.Loading -> Unit
+                        is AsyncAction.Failure,
+                        is AsyncAction.Success -> {
+                            // Should not happen
+                        }
+                        AsyncAction.Uninitialized -> {
+                            if (canSave) {
+                                saveAction.value = AsyncAction.ConfirmingCancellation
+                            } else {
+                                navigator.close()
+                            }
+                        }
+                    }
+                }
+                EditUserProfileEvents.CloseDialog -> saveAction.value = AsyncAction.Uninitialized
             }
         }
 
-        val canSave = remember(userDisplayName, userAvatarUri) {
-            val hasProfileChanged = hasDisplayNameChanged(userDisplayName, matrixUser) ||
-                hasAvatarUrlChanged(userAvatarUri, matrixUser)
-            !userDisplayName.isNullOrBlank() && hasProfileChanged
-        }
-
         return EditUserProfileState(
             userId = matrixUser.userId,
             displayName = userDisplayName.orEmpty(),
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
index 91394d19a6..d6f0fcbd2c 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.features.preferences.impl.user.editprofile
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -30,11 +31,13 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.preferences.impl.R
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.components.dialogs.SaveChangesDialog
 import io.element.android.libraries.designsystem.modifiers.clearFocusOnTap
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -52,7 +55,6 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun EditUserProfileView(
     state: EditUserProfileState,
-    onBackClick: () -> Unit,
     onEditProfileSuccess: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -64,12 +66,21 @@ fun EditUserProfileView(
         isAvatarActionsSheetVisible.value = true
     }
 
+    fun onBackClick() {
+        focusManager.clearFocus()
+        state.eventSink(EditUserProfileEvents.Exit)
+    }
+
+    BackHandler(
+        enabled = true,
+        ::onBackClick,
+    )
     Scaffold(
         modifier = modifier.clearFocusOnTap(focusManager),
         topBar = {
             TopAppBar(
                 titleStr = stringResource(R.string.screen_edit_profile_title),
-                navigationIcon = { BackButton(onClick = onBackClick) },
+                navigationIcon = { BackButton(::onBackClick) },
                 actions = {
                     TextButton(
                         text = stringResource(CommonStrings.action_save),
@@ -132,10 +143,20 @@ fun EditUserProfileView(
                     progressText = stringResource(R.string.screen_edit_profile_updating_details),
                 )
             },
+            confirmationDialog = { confirming ->
+                when (confirming) {
+                    is AsyncAction.ConfirmingCancellation -> {
+                        SaveChangesDialog(
+                            onSubmitClick = { state.eventSink(EditUserProfileEvents.Exit) },
+                            onDismiss = { state.eventSink(EditUserProfileEvents.CloseDialog) }
+                        )
+                    }
+                }
+            },
             onSuccess = { onEditProfileSuccess() },
             errorTitle = { stringResource(R.string.screen_edit_profile_error_title) },
             errorMessage = { stringResource(R.string.screen_edit_profile_error) },
-            onErrorDismiss = { state.eventSink(EditUserProfileEvents.CancelSaveChanges) },
+            onErrorDismiss = { state.eventSink(EditUserProfileEvents.CloseDialog) },
         )
     }
     PermissionsView(
@@ -148,7 +169,6 @@ fun EditUserProfileView(
 internal fun EditUserProfileViewPreview(@PreviewParameter(EditUserProfileStateProvider::class) state: EditUserProfileState) =
     ElementPreview {
         EditUserProfileView(
-            onBackClick = {},
             onEditProfileSuccess = {},
             state = state,
         )
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
index 0840dea2db..7c24cd0492 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
@@ -15,6 +15,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.navigation.BaseNavigator
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
@@ -33,6 +34,7 @@ import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
 import io.element.android.tests.testutils.consumeItemsUntilTimeout
 import io.element.android.tests.testutils.fake.FakeTemporaryUriDeleter
+import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.mockk.every
@@ -79,6 +81,7 @@ class EditUserProfilePresenterTest {
 
     private fun createEditUserProfilePresenter(
         matrixClient: MatrixClient = FakeMatrixClient(),
+        navigator: BaseNavigator = BaseNavigator { lambdaError() },
         matrixUser: MatrixUser = aMatrixUser(),
         permissionsPresenter: PermissionsPresenter = FakePermissionsPresenter(),
         temporaryUriDeleter: TemporaryUriDeleter = FakeTemporaryUriDeleter(),
@@ -86,6 +89,7 @@ class EditUserProfilePresenterTest {
     ): EditUserProfilePresenter {
         return EditUserProfilePresenter(
             matrixClient = matrixClient,
+            navigator = navigator,
             matrixUser = matrixUser,
             mediaPickerProvider = fakePickerProvider,
             mediaPreProcessor = fakeMediaPreProcessor,
@@ -456,7 +460,7 @@ class EditUserProfilePresenterTest {
             initialState.eventSink(EditUserProfileEvents.Save)
             skipItems(2)
             assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Failure::class.java)
-            initialState.eventSink(EditUserProfileEvents.CancelSaveChanges)
+            initialState.eventSink(EditUserProfileEvents.CloseDialog)
             assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
         }
     }
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt
new file mode 100644
index 0000000000..5cc61166fe
--- /dev/null
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.architecture.navigation
+
+fun interface BaseNavigator {
+    fun close()
+}

From c67f257af0fe9fa5cc04603f6485ee3b0ae31686 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 11:56:26 +0100
Subject: [PATCH 014/113] Use test extension

---
 .../EditUserProfilePresenterTest.kt           | 56 +++++--------------
 1 file changed, 14 insertions(+), 42 deletions(-)

diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
index 7c24cd0492..bf5d138b3f 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
@@ -9,9 +9,6 @@
 package io.element.android.features.preferences.impl.user.editprofile
 
 import android.net.Uri
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.architecture.AsyncAction
@@ -37,6 +34,7 @@ import io.element.android.tests.testutils.fake.FakeTemporaryUriDeleter
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.test
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
@@ -103,9 +101,7 @@ class EditUserProfilePresenterTest {
     fun `present - initial state is created from user info`() = runTest {
         val user = aMatrixUser(avatarUrl = AN_AVATAR_URL)
         val presenter = createEditUserProfilePresenter(matrixUser = user)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.userId).isEqualTo(user.userId)
             assertThat(initialState.displayName).isEqualTo(user.displayName)
@@ -129,9 +125,7 @@ class EditUserProfilePresenterTest {
                 deleteLambda = { assertThat(it).isEqualTo(userAvatarUri) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.displayName).isEqualTo("Name")
             assertThat(initialState.userAvatarUrl).isEqualTo(AN_AVATAR_URL)
@@ -163,9 +157,7 @@ class EditUserProfilePresenterTest {
                 deleteLambda = { assertThat(it).isEqualTo(userAvatarUri) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.userAvatarUrl).isEqualTo(AN_AVATAR_URL)
             initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
@@ -188,9 +180,7 @@ class EditUserProfilePresenterTest {
                 deleteLambda = deleteCallback,
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.userAvatarUrl).isEqualTo(AN_AVATAR_URL)
             assertThat(initialState.cameraPermissionState.permissionGranted).isFalse()
@@ -225,9 +215,7 @@ class EditUserProfilePresenterTest {
                 deleteLambda = deleteCallback
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.saveButtonEnabled).isFalse()
             // Once a change is made, the save button is enabled
@@ -268,9 +256,7 @@ class EditUserProfilePresenterTest {
                 deleteLambda = deleteCallback
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.saveButtonEnabled).isFalse()
             // Once a change is made, the save button is enabled
@@ -311,9 +297,7 @@ class EditUserProfilePresenterTest {
                 deleteLambda = { assertThat(it).isEqualTo(userAvatarUri) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("New name"))
             initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.Remove))
@@ -334,9 +318,7 @@ class EditUserProfilePresenterTest {
             matrixClient = matrixClient,
             matrixUser = user
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("   Name   "))
             initialState.eventSink(EditUserProfileEvents.Save)
@@ -355,9 +337,7 @@ class EditUserProfilePresenterTest {
             matrixClient = matrixClient,
             matrixUser = user
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(EditUserProfileEvents.UpdateDisplayName(""))
             initialState.eventSink(EditUserProfileEvents.Save)
@@ -380,9 +360,7 @@ class EditUserProfilePresenterTest {
                 deleteLambda = { assertThat(it).isEqualTo(userAvatarUri) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
             initialState.eventSink(EditUserProfileEvents.Save)
@@ -404,9 +382,7 @@ class EditUserProfilePresenterTest {
         )
         fakePickerProvider.givenResult(anotherAvatarUri)
         fakeMediaPreProcessor.givenResult(Result.failure(RuntimeException("Oh no")))
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
             initialState.eventSink(EditUserProfileEvents.Save)
@@ -452,9 +428,7 @@ class EditUserProfilePresenterTest {
             givenSetDisplayNameResult(Result.failure(RuntimeException("!")))
         }
         val presenter = createEditUserProfilePresenter(matrixUser = user, matrixClient = matrixClient)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("foo"))
             initialState.eventSink(EditUserProfileEvents.Save)
@@ -473,9 +447,7 @@ class EditUserProfilePresenterTest {
                 deleteLambda = { assertThat(it).isEqualTo(userAvatarUri) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(event)
             initialState.eventSink(EditUserProfileEvents.Save)

From c8b4c1f29e429768c725a590b3ff2bcbafa72a13 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 12:03:38 +0100
Subject: [PATCH 015/113] Add unit tests

---
 .../EditUserProfilePresenterTest.kt           | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
index bf5d138b3f..a39b2013b6 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
@@ -116,6 +116,53 @@ class EditUserProfilePresenterTest {
         }
     }
 
+    @Test
+    fun `present - exit invokes the expected callback`() = runTest {
+        val user = aMatrixUser(avatarUrl = AN_AVATAR_URL)
+        val closeLambda = lambdaRecorder<Unit> {}
+        val presenter = createEditUserProfilePresenter(
+            matrixUser = user,
+            navigator = BaseNavigator { closeLambda() },
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(EditUserProfileEvents.Exit)
+            closeLambda.assertions().isCalledOnce()
+        }
+    }
+
+    @Test
+    fun `present - exit without unsaved changes`() = runTest {
+        val user = aMatrixUser(avatarUrl = AN_AVATAR_URL)
+        val closeLambda = lambdaRecorder<Unit> {}
+        val presenter = createEditUserProfilePresenter(
+            matrixUser = user,
+            navigator = BaseNavigator { closeLambda() },
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("New name"))
+            val withUpdatedName = awaitItem()
+            withUpdatedName.eventSink(EditUserProfileEvents.Exit)
+            val withConfirmation = awaitItem()
+            assertThat(withConfirmation.saveAction).isEqualTo(AsyncAction.ConfirmingCancellation)
+            // Cancel
+            withConfirmation.eventSink(EditUserProfileEvents.CloseDialog)
+            val afterCancel = awaitItem()
+            assertThat(afterCancel.saveAction).isEqualTo(AsyncAction.Uninitialized)
+            // Try again and confirm
+            afterCancel.eventSink(EditUserProfileEvents.Exit)
+            val withConfirmation2 = awaitItem()
+            assertThat(withConfirmation2.saveAction).isEqualTo(AsyncAction.ConfirmingCancellation)
+            closeLambda.assertions().isNeverCalled()
+            withConfirmation2.eventSink(EditUserProfileEvents.Exit)
+            // Dialog is closed
+            val finalState = awaitItem()
+            assertThat(finalState.saveAction).isEqualTo(AsyncAction.Uninitialized)
+            closeLambda.assertions().isCalledOnce()
+        }
+    }
+
     @Test
     fun `present - updates state in response to changes`() = runTest {
         val user = aMatrixUser(id = A_USER_ID.value, displayName = "Name", avatarUrl = AN_AVATAR_URL)
@@ -421,7 +468,7 @@ class EditUserProfilePresenterTest {
     }
 
     @Test
-    fun `present - CancelSaveChanges resets save action state`() = runTest {
+    fun `present - CloseDialog resets save action state`() = runTest {
         givenPickerReturnsFile()
         val user = aMatrixUser(id = A_USER_ID.value, displayName = "Name", avatarUrl = AN_AVATAR_URL)
         val matrixClient = FakeMatrixClient().apply {

From 4dd148d3719241c02b2c2b84ff53d9a4964705a9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 14:24:48 +0100
Subject: [PATCH 016/113] Add preview

---
 .../EditUserProfileStateProvider.kt           | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileStateProvider.kt
index 7b373293c4..56b734a342 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileStateProvider.kt
@@ -11,27 +11,36 @@ package io.element.android.features.preferences.impl.user.editprofile
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.ui.media.AvatarAction
+import io.element.android.libraries.permissions.api.PermissionsState
 import io.element.android.libraries.permissions.api.aPermissionsState
-import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 
 open class EditUserProfileStateProvider : PreviewParameterProvider<EditUserProfileState> {
     override val values: Sequence<EditUserProfileState>
         get() = sequenceOf(
             aEditUserProfileState(),
             aEditUserProfileState(userAvatarUrl = "example://uri"),
-            // Add other states here
+            aEditUserProfileState(saveAction = AsyncAction.ConfirmingCancellation),
         )
 }
 
 fun aEditUserProfileState(
+    userId: UserId = UserId("@john.doe:matrix.org"),
+    displayName: String = "John Doe",
     userAvatarUrl: String? = null,
+    avatarActions: List<AvatarAction> = emptyList(),
+    saveButtonEnabled: Boolean = true,
+    saveAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    cameraPermissionState: PermissionsState = aPermissionsState(showDialog = false),
+    eventSink: (EditUserProfileEvents) -> Unit = {},
 ) = EditUserProfileState(
-    userId = UserId("@john.doe:matrix.org"),
-    displayName = "John Doe",
+    userId = userId,
+    displayName = displayName,
     userAvatarUrl = userAvatarUrl,
-    avatarActions = persistentListOf(),
-    saveAction = AsyncAction.Uninitialized,
-    saveButtonEnabled = true,
-    cameraPermissionState = aPermissionsState(showDialog = false),
-    eventSink = {}
+    avatarActions = avatarActions.toImmutableList(),
+    saveButtonEnabled = saveButtonEnabled,
+    saveAction = saveAction,
+    cameraPermissionState = cameraPermissionState,
+    eventSink = eventSink,
 )

From 4a90186bd167f4bed1ea3fa670f2826b94519b7c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 14:41:19 +0100
Subject: [PATCH 017/113] Add unit test on EditUserProfileView

---
 .../editprofile/EditUserProfileViewTest.kt    | 136 ++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileViewTest.kt

diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileViewTest.kt
new file mode 100644
index 0000000000..f4c7144350
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileViewTest.kt
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.user.editprofile
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.ui.media.AvatarAction
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EnsureNeverCalled
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.ensureCalledOnce
+import io.element.android.tests.testutils.pressBack
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class EditUserProfileViewTest {
+    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `clicking on back emits the expected event`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvents>()
+        rule.setEditUserProfileView(
+            aEditUserProfileState(
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.pressBack()
+        eventsRecorder.assertSingle(EditUserProfileEvents.Exit)
+    }
+
+    @Test
+    fun `clicking on cancel exit emits the expected event`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvents>()
+        rule.setEditUserProfileView(
+            aEditUserProfileState(
+                saveAction = AsyncAction.ConfirmingCancellation,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_cancel)
+        eventsRecorder.assertSingle(EditUserProfileEvents.CloseDialog)
+    }
+
+    @Test
+    fun `clicking on OK exit emits the expected event`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvents>()
+        rule.setEditUserProfileView(
+            aEditUserProfileState(
+                saveAction = AsyncAction.ConfirmingCancellation,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_ok)
+        eventsRecorder.assertSingle(EditUserProfileEvents.Exit)
+    }
+
+    @Test
+    fun `clicking on save emits the expected event`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvents>()
+        rule.setEditUserProfileView(
+            aEditUserProfileState(
+                saveButtonEnabled = true,
+                saveAction = AsyncAction.Uninitialized,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_save)
+        eventsRecorder.assertSingle(EditUserProfileEvents.Save)
+    }
+
+    @Test
+    fun `clicking on avatar opens the bottom sheet dialog`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvents>()
+        val actions = listOf(
+            AvatarAction.TakePhoto,
+            AvatarAction.ChoosePhoto,
+            AvatarAction.Remove,
+        )
+        rule.setEditUserProfileView(
+            aEditUserProfileState(
+                saveAction = AsyncAction.Uninitialized,
+                avatarActions = actions,
+                eventSink = eventsRecorder,
+            ),
+        )
+        val contentDescription = rule.activity.getString(CommonStrings.a11y_avatar)
+        rule.onNodeWithContentDescription(contentDescription).performClick()
+        // Assert that the actions are displayed
+        actions.forEach { action ->
+            val text = rule.activity.getString(action.titleResId)
+            rule.onNodeWithText(text).assertExists()
+        }
+    }
+
+    @Test
+    fun `success invokes the expected callback`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvents>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            rule.setEditUserProfileView(
+                aEditUserProfileState(
+                    saveAction = AsyncAction.Success(Unit),
+                    eventSink = eventsRecorder,
+                ),
+                onEditProfileSuccess = callback,
+            )
+        }
+    }
+}
+
+private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setEditUserProfileView(
+    state: EditUserProfileState,
+    onEditProfileSuccess: () -> Unit = EnsureNeverCalled(),
+) {
+    setContent {
+        EditUserProfileView(
+            state = state,
+            onEditProfileSuccess = onEditProfileSuccess,
+        )
+    }
+}

From f05a00b9b3da95b7e7cfcf8eecf84b1e3fe4004e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 15:13:23 +0100
Subject: [PATCH 018/113] Avoid using navigateUp.

---
 .../preferences/impl/PreferencesFlowNode.kt     |  4 +++-
 .../user/editprofile/EditUserProfileNode.kt     |  8 ++++----
 .../architecture/navigation/BaseCallback.kt     | 17 +++++++++++++++++
 .../architecture/navigation/BaseNavigator.kt    |  3 +++
 4 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseCallback.kt

diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
index bd43736cbd..5d4e55e888 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
@@ -40,6 +40,7 @@ import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.appyx.canPop
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.architecture.navigation.BaseCallback
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -267,7 +268,8 @@ class PreferencesFlowNode(
             }
             is NavTarget.UserProfile -> {
                 val inputs = EditUserProfileNode.Inputs(navTarget.matrixUser)
-                createNode<EditUserProfileNode>(buildContext, listOf(inputs))
+                val callback = BaseCallback { backstack.pop() }
+                createNode<EditUserProfileNode>(buildContext, listOf(inputs, callback))
             }
             NavTarget.LockScreenSettings -> {
                 lockScreenEntryPoint.createNode(
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
index 3d939cfbd4..dcbdc14031 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
@@ -17,7 +17,9 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
+import io.element.android.libraries.architecture.navigation.BaseCallback
 import io.element.android.libraries.architecture.navigation.BaseNavigator
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -35,6 +37,7 @@ class EditUserProfileNode(
     ) : NodeInputs
 
     val matrixUser = inputs<Inputs>().matrixUser
+    val callback: BaseCallback = callback()
     val presenter = presenterFactory.create(
         matrixUser = matrixUser,
         navigator = this,
@@ -50,8 +53,5 @@ class EditUserProfileNode(
         )
     }
 
-    override fun close() {
-        // TODO Invoke callback
-        navigateUp()
-    }
+    override fun close() = callback.onDone()
 }
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseCallback.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseCallback.kt
new file mode 100644
index 0000000000..13b102b46d
--- /dev/null
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseCallback.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.architecture.navigation
+
+import com.bumble.appyx.core.plugin.Plugin
+
+/**
+ * Base callback interface to be implemented by callers to handle results from nodes.
+ */
+fun interface BaseCallback : Plugin {
+    fun onDone()
+}
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt
index 5cc61166fe..e5dec55c89 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt
@@ -7,6 +7,9 @@
 
 package io.element.android.libraries.architecture.navigation
 
+/**
+ * Base navigator interface to be implemented by nodes to handle navigation actions from presenters.
+ */
 fun interface BaseNavigator {
     fun close()
 }

From 2e2a5020a77e0d3e78cf2a7f0f3a274d402dca4d Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Fri, 21 Nov 2025 14:29:04 +0000
Subject: [PATCH 019/113] Update screenshots

---
 ...nces.impl.user.editprofile_EditUserProfileView_Day_2_en.png | 3 +++
 ...es.impl.user.editprofile_EditUserProfileView_Night_2_en.png | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en.png

diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en.png
new file mode 100644
index 0000000000..1e81e0e58a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da49d0867fdaa28fbe7db7dc21c5de09268e7bb3afdb0b2289df372d537c2abb
+size 33570
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en.png
new file mode 100644
index 0000000000..73a68c1db0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60fe1926cf8d66a8086268f3e4e1b6b1616f860668e1e5f4dc670d5c57ec4d24
+size 31943

From 942d60812e415ebbb672237655fc34380c8d36d7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 15:46:10 +0100
Subject: [PATCH 020/113] Remove BaseCallback, it's actually not ideal when
 looking for usage.

---
 .../preferences/impl/PreferencesFlowNode.kt     |  7 +++++--
 .../user/editprofile/EditUserProfileNode.kt     |  7 +++++--
 .../architecture/navigation/BaseCallback.kt     | 17 -----------------
 3 files changed, 10 insertions(+), 21 deletions(-)
 delete mode 100644 libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseCallback.kt

diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
index 5d4e55e888..783d732036 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
@@ -40,7 +40,6 @@ import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.appyx.canPop
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.architecture.navigation.BaseCallback
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -268,7 +267,11 @@ class PreferencesFlowNode(
             }
             is NavTarget.UserProfile -> {
                 val inputs = EditUserProfileNode.Inputs(navTarget.matrixUser)
-                val callback = BaseCallback { backstack.pop() }
+                val callback = object : EditUserProfileNode.Callback {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+                }
                 createNode<EditUserProfileNode>(buildContext, listOf(inputs, callback))
             }
             NavTarget.LockScreenSettings -> {
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
index dcbdc14031..27adc2e32e 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
@@ -19,7 +19,6 @@ import io.element.android.annotations.ContributesNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.architecture.navigation.BaseCallback
 import io.element.android.libraries.architecture.navigation.BaseNavigator
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -36,8 +35,12 @@ class EditUserProfileNode(
         val matrixUser: MatrixUser
     ) : NodeInputs
 
+    interface Callback : Plugin {
+        fun onDone()
+    }
+
     val matrixUser = inputs<Inputs>().matrixUser
-    val callback: BaseCallback = callback()
+    val callback: Callback = callback()
     val presenter = presenterFactory.create(
         matrixUser = matrixUser,
         navigator = this,
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseCallback.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseCallback.kt
deleted file mode 100644
index 13b102b46d..0000000000
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseCallback.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.architecture.navigation
-
-import com.bumble.appyx.core.plugin.Plugin
-
-/**
- * Base callback interface to be implemented by callers to handle results from nodes.
- */
-fun interface BaseCallback : Plugin {
-    fun onDone()
-}

From 31e9abbb980a64d1f2316b6c0aeadd7f4003769a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 15:50:42 +0100
Subject: [PATCH 021/113] Remove BaseNavigator, it's actually not ideal when
 looking for usage.

---
 .../user/editprofile/EditUserProfileNavigator.kt |  7 ++-----
 .../impl/user/editprofile/EditUserProfileNode.kt |  3 +--
 .../user/editprofile/EditUserProfilePresenter.kt |  5 ++---
 .../editprofile/EditUserProfilePresenterTest.kt  |  8 +++-----
 .../editprofile/FakeEditUserProfileNavigator.kt  | 16 ++++++++++++++++
 5 files changed, 24 insertions(+), 15 deletions(-)
 rename libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt => features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNavigator.kt (52%)
 create mode 100644 features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/FakeEditUserProfileNavigator.kt

diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNavigator.kt
similarity index 52%
rename from libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt
rename to features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNavigator.kt
index e5dec55c89..2935bce747 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNavigator.kt
@@ -5,11 +5,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.architecture.navigation
+package io.element.android.features.preferences.impl.user.editprofile
 
-/**
- * Base navigator interface to be implemented by nodes to handle navigation actions from presenters.
- */
-fun interface BaseNavigator {
+interface EditUserProfileNavigator {
     fun close()
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
index 27adc2e32e..2303abb06e 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
@@ -19,7 +19,6 @@ import io.element.android.annotations.ContributesNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.architecture.navigation.BaseNavigator
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
@@ -30,7 +29,7 @@ class EditUserProfileNode(
     @Assisted plugins: List<Plugin>,
     presenterFactory: EditUserProfilePresenter.Factory,
 ) : Node(buildContext, plugins = plugins),
-    BaseNavigator {
+    EditUserProfileNavigator {
     data class Inputs(
         val matrixUser: MatrixUser
     ) : NodeInputs
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
index 46298c96a2..59607139d7 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
@@ -26,7 +26,6 @@ import dev.zacsweers.metro.AssistedInject
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.architecture.navigation.BaseNavigator
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.core.mimetype.MimeTypes
@@ -46,7 +45,7 @@ import timber.log.Timber
 @AssistedInject
 class EditUserProfilePresenter(
     @Assisted private val matrixUser: MatrixUser,
-    @Assisted private val navigator: BaseNavigator,
+    @Assisted private val navigator: EditUserProfileNavigator,
     private val matrixClient: MatrixClient,
     private val mediaPickerProvider: PickerProvider,
     private val mediaPreProcessor: MediaPreProcessor,
@@ -61,7 +60,7 @@ class EditUserProfilePresenter(
     interface Factory {
         fun create(
             matrixUser: MatrixUser,
-            navigator: BaseNavigator,
+            navigator: EditUserProfileNavigator,
         ): EditUserProfilePresenter
     }
 
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
index a39b2013b6..3432bac29f 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
@@ -12,7 +12,6 @@ import android.net.Uri
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.architecture.navigation.BaseNavigator
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
@@ -31,7 +30,6 @@ import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
 import io.element.android.tests.testutils.consumeItemsUntilTimeout
 import io.element.android.tests.testutils.fake.FakeTemporaryUriDeleter
-import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
@@ -79,7 +77,7 @@ class EditUserProfilePresenterTest {
 
     private fun createEditUserProfilePresenter(
         matrixClient: MatrixClient = FakeMatrixClient(),
-        navigator: BaseNavigator = BaseNavigator { lambdaError() },
+        navigator: EditUserProfileNavigator = FakeEditUserProfileNavigator(),
         matrixUser: MatrixUser = aMatrixUser(),
         permissionsPresenter: PermissionsPresenter = FakePermissionsPresenter(),
         temporaryUriDeleter: TemporaryUriDeleter = FakeTemporaryUriDeleter(),
@@ -122,7 +120,7 @@ class EditUserProfilePresenterTest {
         val closeLambda = lambdaRecorder<Unit> {}
         val presenter = createEditUserProfilePresenter(
             matrixUser = user,
-            navigator = BaseNavigator { closeLambda() },
+            navigator = FakeEditUserProfileNavigator(closeLambda),
         )
         presenter.test {
             val initialState = awaitItem()
@@ -137,7 +135,7 @@ class EditUserProfilePresenterTest {
         val closeLambda = lambdaRecorder<Unit> {}
         val presenter = createEditUserProfilePresenter(
             matrixUser = user,
-            navigator = BaseNavigator { closeLambda() },
+            navigator = FakeEditUserProfileNavigator(closeLambda),
         )
         presenter.test {
             val initialState = awaitItem()
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/FakeEditUserProfileNavigator.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/FakeEditUserProfileNavigator.kt
new file mode 100644
index 0000000000..7b34e904a1
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/FakeEditUserProfileNavigator.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.user.editprofile
+
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeEditUserProfileNavigator(
+    val closeLambda: () -> Unit = { lambdaError() }
+) : EditUserProfileNavigator {
+    override fun close() = closeLambda()
+}

From e475a969d78076b22f7c9528a3c6142f08e5f492 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 15:42:15 +0100
Subject: [PATCH 022/113] Fix crash when clicking fast on back key on the Add
 account screen.

---
 .../kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt  | 5 +++++
 .../main/kotlin/io/element/android/appnav/RootFlowNode.kt    | 4 ++++
 .../io/element/android/features/login/api/LoginEntryPoint.kt | 1 +
 .../io/element/android/features/login/impl/LoginFlowNode.kt  | 4 ++++
 .../features/login/impl/screens/onboarding/OnBoardingNode.kt | 3 ++-
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
index 2544abbfb3..d888ac3b15 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
@@ -57,6 +57,7 @@ class NotLoggedInFlowNode(
 
     interface Callback : Plugin {
         fun navigateToBugReport()
+        fun onDone()
     }
 
     private val callback: Callback = callback()
@@ -83,6 +84,10 @@ class NotLoggedInFlowNode(
                     override fun navigateToBugReport() {
                         callback.navigateToBugReport()
                     }
+
+                    override fun onDone() {
+                        callback.onDone()
+                    }
                 }
                 loginEntryPoint.createNode(
                     parentNode = this,
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
index a0d2f44640..1a23bce132 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -243,6 +243,10 @@ class RootFlowNode(
                     override fun navigateToBugReport() {
                         backstack.push(NavTarget.BugReport)
                     }
+
+                    override fun onDone() {
+                        backstack.pop()
+                    }
                 }
                 val params = NotLoggedInFlowNode.Params(
                     loginParams = navTarget.params,
diff --git a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt
index 5256bcb695..830a63b8f1 100644
--- a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt
+++ b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt
@@ -21,6 +21,7 @@ interface LoginEntryPoint : FeatureEntryPoint {
 
     interface Callback : Plugin {
         fun navigateToBugReport()
+        fun onDone()
     }
 
     fun createNode(
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
index 4a7275e2da..a19bb12d86 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
@@ -167,6 +167,10 @@ class LoginFlowNode(
                     override fun navigateToLoginPassword() {
                         backstack.push(NavTarget.LoginPassword)
                     }
+
+                    override fun onDone() {
+                        callback.onDone()
+                    }
                 }
                 val params = inputs<Params>()
                 val inputs = OnBoardingNode.Params(
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt
index 7e0901470a..1ded677c13 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt
@@ -42,6 +42,7 @@ class OnBoardingNode(
         fun navigateToLoginPassword()
         fun navigateToOidc(oidcDetails: OidcDetails)
         fun navigateToCreateAccount(url: String)
+        fun onDone()
     }
 
     data class Params(
@@ -71,7 +72,7 @@ class OnBoardingNode(
             onNeedLoginPassword = callback::navigateToLoginPassword,
             onLearnMoreClick = { openLearnMorePage(context) },
             onCreateAccountContinue = callback::navigateToCreateAccount,
-            onBackClick = ::navigateUp,
+            onBackClick = callback::onDone,
         )
     }
 }

From 7bf7f68706479cc6bbfc87bea6c5165c39feb079 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 15:52:54 +0100
Subject: [PATCH 023/113] Fix crash when clicking fast on back key on the Labs
 screen.

---
 .../features/preferences/impl/PreferencesFlowNode.kt |  7 ++++++-
 .../features/preferences/impl/labs/LabsNode.kt       | 12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
index 783d732036..d316006bae 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
@@ -190,7 +190,12 @@ class PreferencesFlowNode(
                 createNode<DeveloperSettingsNode>(buildContext, listOf(developerSettingsCallback))
             }
             NavTarget.Labs -> {
-                createNode<LabsNode>(buildContext)
+                val callback = object : LabsNode.Callback {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+                }
+                createNode<LabsNode>(buildContext, listOf(callback))
             }
             NavTarget.About -> {
                 val callback = object : AboutNode.Callback {
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsNode.kt
index 343b4d2795..b7ba73c9af 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsNode.kt
@@ -16,6 +16,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -25,9 +26,18 @@ class LabsNode(
     @Assisted plugins: List<Plugin>,
     private val presenter: LabsPresenter,
 ) : Node(buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun onDone()
+    }
+
+    val callback: Callback = callback()
+
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
-        LabsView(state = state, onBack = ::navigateUp)
+        LabsView(
+            state = state,
+            onBack = callback::onDone,
+        )
     }
 }

From 83d13d0eb5c64b18355a95b7c4c7bd54d19fa465 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 15:54:03 +0100
Subject: [PATCH 024/113] Fix crash when clicking fast on back key on the
 Developer settings screen.

---
 .../android/features/preferences/impl/PreferencesFlowNode.kt  | 4 ++++
 .../preferences/impl/developer/DeveloperSettingsNode.kt       | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
index d316006bae..c7328fb6ed 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
@@ -186,6 +186,10 @@ class PreferencesFlowNode(
                     override fun navigateToPushHistory() {
                         backstack.push(NavTarget.PushHistory)
                     }
+
+                    override fun onDone() {
+                        backstack.pop()
+                    }
                 }
                 createNode<DeveloperSettingsNode>(buildContext, listOf(developerSettingsCallback))
             }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt
index 71077fe405..98c7d89633 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt
@@ -31,6 +31,7 @@ class DeveloperSettingsNode(
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun navigateToPushHistory()
+        fun onDone()
     }
 
     private val callback: Callback = callback()
@@ -49,7 +50,7 @@ class DeveloperSettingsNode(
             modifier = modifier,
             onOpenShowkase = ::openShowkase,
             onPushHistoryClick = callback::navigateToPushHistory,
-            onBackClick = ::navigateUp
+            onBackClick = callback::onDone,
         )
     }
 }

From b15c5507c58353f29caf05e3290e291881ec58e7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 16:22:33 +0100
Subject: [PATCH 025/113] Fix compilation issue in test

---
 .../android/features/login/impl/DefaultLoginEntryPointTest.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt
index 9d72edebc9..953693b40d 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt
@@ -43,6 +43,7 @@ class DefaultLoginEntryPointTest {
         }
         val callback = object : LoginEntryPoint.Callback {
             override fun navigateToBugReport() = lambdaError()
+            override fun onDone() = lambdaError()
         }
         val params = LoginEntryPoint.Params(
             accountProvider = "ac",

From c10bea08b26c83b22f98abcacdb06bce0503689b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Nov 2025 16:36:56 +0100
Subject: [PATCH 026/113] Fix test

---
 .../impl/roles/ChangeRolesViewTest.kt         | 46 ++++++++-----------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt
index 63fa9f3b19..fd45e5408c 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt
@@ -50,7 +50,6 @@ class ChangeRolesViewTest {
                 ),
             )
         }.exceptionOrNull()
-
         assertThat(exception).isNotNull()
     }
 
@@ -63,9 +62,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.pressBackKey()
-
         eventsRecorder.assertSingle(ChangeRolesEvent.ToggleSearchActive)
     }
 
@@ -78,9 +75,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.pressBackKey()
-
         eventsRecorder.assertList(listOf(ChangeRolesEvent.QueryChanged(""), ChangeRolesEvent.Exit))
     }
 
@@ -93,9 +88,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.pressBack()
-
         eventsRecorder.assertList(listOf(ChangeRolesEvent.QueryChanged(""), ChangeRolesEvent.Exit))
     }
 
@@ -108,9 +101,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_save)
-
         eventsRecorder.assertList(listOf(ChangeRolesEvent.QueryChanged(""), ChangeRolesEvent.Save))
     }
 
@@ -123,9 +114,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_save)
-
         eventsRecorder.assertList(listOf(ChangeRolesEvent.QueryChanged("")))
     }
 
@@ -139,9 +128,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_ok)
-
         eventsRecorder.assertSingle(ChangeRolesEvent.Exit)
     }
 
@@ -155,26 +142,22 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_cancel)
-
         eventsRecorder.assertSingle(ChangeRolesEvent.CloseDialog)
     }
 
     @Test
-    fun `save confirmation dialog - submit saves the changes`() {
+    fun `save admins confirmation dialog - submit saves the changes`() {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
         rule.setChangeRolesContent(
             state = aChangeRolesState(
                 role = RoomMember.Role.Admin,
                 isSearchActive = true,
-                savingState = AsyncAction.ConfirmingNoParams,
+                savingState = ConfirmingModifyingAdmins,
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_ok)
-
         eventsRecorder.assertSingle(ChangeRolesEvent.Save)
     }
 
@@ -185,30 +168,41 @@ class ChangeRolesViewTest {
             state = aChangeRolesState(
                 role = RoomMember.Role.Owner(isCreator = false),
                 isSearchActive = true,
-                savingState = AsyncAction.ConfirmingNoParams,
+                savingState = ConfirmingModifyingOwners,
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_continue)
-
         eventsRecorder.assertSingle(ChangeRolesEvent.Save)
     }
 
     @Test
-    fun `save confirmation dialog - cancel removes the dialog`() {
+    fun `save admins confirmation dialog - cancel removes the dialog`() {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
         rule.setChangeRolesContent(
             state = aChangeRolesState(
                 role = RoomMember.Role.Admin,
                 isSearchActive = true,
-                savingState = AsyncAction.ConfirmingNoParams,
+                savingState = ConfirmingModifyingAdmins,
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_cancel)
+        eventsRecorder.assertSingle(ChangeRolesEvent.CloseDialog)
+    }
 
+    @Test
+    fun `save owners confirmation dialog - cancel removes the dialog`() {
+        val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
+        rule.setChangeRolesContent(
+            state = aChangeRolesState(
+                role = RoomMember.Role.Owner(isCreator = false),
+                isSearchActive = true,
+                savingState = ConfirmingModifyingOwners,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ChangeRolesEvent.CloseDialog)
     }
 
@@ -222,9 +216,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_ok)
-
         eventsRecorder.assertSingle(ChangeRolesEvent.CloseDialog)
     }
 

From 378fe32fdefdc9d03e8a1cf907cdd3673b2a51c1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Nov 2025 16:51:56 +0100
Subject: [PATCH 027/113] fix(deps): update dependency
 androidx.sqlite:sqlite-ktx to v2.6.2 (#5769)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2d291ed9f3..3a5ac4046d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -201,7 +201,7 @@ sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", ver
 sqldelight-driver-jvm = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
 sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
 sqlcipher = "net.zetetic:sqlcipher-android:4.11.0"
-sqlite = "androidx.sqlite:sqlite-ktx:2.6.1"
+sqlite = "androidx.sqlite:sqlite-ktx:2.6.2"
 unifiedpush = "org.unifiedpush.android:connector:3.1.2"
 vanniktech_blurhash = "com.vanniktech:blurhash:0.3.0"
 telephoto_zoomableimage = { module = "me.saket.telephoto:zoomable-image-coil", version.ref = "telephoto" }

From 78c19eb1eb15278e8eb53004e01b2e08c01857b8 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 21 Nov 2025 15:27:43 +0100
Subject: [PATCH 028/113] Setting version for the release 25.11.3

---
 plugins/src/main/kotlin/Versions.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt
index 72983c28df..863b3ec79f 100644
--- a/plugins/src/main/kotlin/Versions.kt
+++ b/plugins/src/main/kotlin/Versions.kt
@@ -45,7 +45,7 @@ private const val versionMonth = 11
  * Release number in the month. Value must be in [0,99].
  * Do not update this value. it is updated by the release script.
  */
-private const val versionReleaseNumber = 2
+private const val versionReleaseNumber = 3
 
 object Versions {
     /**

From e2c08b501cab970cd896de26747d6c946ab7ec8a Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 21 Nov 2025 15:27:45 +0100
Subject: [PATCH 029/113] Adding fastlane file for version 25.11.3

---
 fastlane/metadata/android/en-US/changelogs/202511030.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/202511030.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/202511030.txt b/fastlane/metadata/android/en-US/changelogs/202511030.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202511030.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file

From e124e76fb2a58fa4826d2469ef1329f3e8195b2e Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 21 Nov 2025 16:51:36 +0100
Subject: [PATCH 030/113] Changelog for version 25.11.3

---
 CHANGES.md | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 28e774a8ff..01a83c0ccf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,83 @@
+Changes in Element X v25.11.3
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v25.11.3 -->
+
+## What's Changed
+### 🙌 Improvements
+* Improve rendering notification for multi account by @bmarty in https://github.com/element-hq/element-x-android/pull/5645
+* Change : roles and permissions by @ganfra in https://github.com/element-hq/element-x-android/pull/5685
+* Improve account provider selection during the login flow by @bmarty in https://github.com/element-hq/element-x-android/pull/5692
+* Let notifications use avatar fallback. by @bmarty in https://github.com/element-hq/element-x-android/pull/5721
+* Changes : member list improvements by @ganfra in https://github.com/element-hq/element-x-android/pull/5728
+### 🐛 Bugfixes
+* Do not use the bestDescription but the caption for images, when available by @bmarty in https://github.com/element-hq/element-x-android/pull/5684
+* Add the user certificate if any when creating Matrix Client. by @bmarty in https://github.com/element-hq/element-x-android/pull/5686
+* Ensure the form data are not lost when opening the log viewer. by @bmarty in https://github.com/element-hq/element-x-android/pull/5695
+* Fix password flow when using a login link by @bmarty in https://github.com/element-hq/element-x-android/pull/5693
+* Fix layout issue in text composer by @bmarty in https://github.com/element-hq/element-x-android/pull/5710
+* Fix navigation stack overflow when sharing media by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5724
+* Notification robustness by @bmarty in https://github.com/element-hq/element-x-android/pull/5726
+* Send read receipts using the current timeline, not the live timeline by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5731
+* Render Owner in the horizontal list when editing Admins. by @bmarty in https://github.com/element-hq/element-x-android/pull/5736
+* Stop overriding the homeserver when restoring a `Client` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5753
+* Revert "Stop overriding the homeserver when restoring a `Client`" by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5754
+* Try fixing forced dark mode issues on MIUI on Android 10 by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5708
+* Fix crash at startup by @bmarty in https://github.com/element-hq/element-x-android/pull/5761
+* Fix null pointer exception on room notification settings.  by @bmarty in https://github.com/element-hq/element-x-android/pull/5758
+* Fix crash when viewing Pinned events by @bmarty in https://github.com/element-hq/element-x-android/pull/5764
+* Fix crash when pressing back from the showkase Activity by @bmarty in https://github.com/element-hq/element-x-android/pull/5772
+* Fix navigation issue once incoming share is handled by @bmarty in https://github.com/element-hq/element-x-android/pull/5773
+* Fix crash in work manager by @bmarty in https://github.com/element-hq/element-x-android/pull/5768
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5704
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5747
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5782
+### 🧱 Build
+* Module cleanup by @bmarty in https://github.com/element-hq/element-x-android/pull/5722
+* Add `NIGHTLY` env for Sentry by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5779
+### 🚧 In development 🚧
+* Space : prepare Space Settings screen by @ganfra in https://github.com/element-hq/element-x-android/pull/5668
+### Dependency upgrades
+* fix(deps): update dependency androidx.core:core-splashscreen to v1.2.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5687
+* fix(deps): update dependency com.posthog:posthog-android to v3.26.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5696
+* fix(deps): update metro to v0.7.5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5697
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.11.11 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5716
+* Update plugin ktlint to v14 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5713
+* Update plugin dependencycheck to v12.1.9 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5717
+* Update dependency org.maplibre.gl:android-sdk to v12.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5714
+* Update dependency io.sentry:sentry-android to v8.26.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5720
+* Update sqldelight to v2.2.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5730
+* fix(deps): update dependency com.squareup.okhttp3:okhttp-bom to v5.3.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5746
+* fix(deps): update dependency com.google.firebase:firebase-bom to v34.6.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5737
+* fix(deps): update metro to v0.7.6 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5752
+* fix(deps): update dependency org.maplibre.gl:android-sdk to v12.1.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5743
+* Update dependency com.squareup.okhttp3:okhttp-bom to v5.3.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5757
+* fix(deps): update dependency com.pinterest.ktlint:ktlint-cli to v1.8.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5738
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.11.19 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5762
+* fix(deps): update dependencyanalysis to v3.5.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5776
+### Others
+* Extract save change dialog by @bmarty in https://github.com/element-hq/element-x-android/pull/5679
+* Use the dedicated subdomain for the bug report URL by default by @benbz in https://github.com/element-hq/element-x-android/pull/5689
+* Convert `ComposerAlertMolecule` to use alert levels. by @kaylendog in https://github.com/element-hq/element-x-android/pull/5691
+* Improve composer alert molecule by @bmarty in https://github.com/element-hq/element-x-android/pull/5701
+* Code consistency around view event handling by @bmarty in https://github.com/element-hq/element-x-android/pull/5698
+* Update copyright holders by @bmarty in https://github.com/element-hq/element-x-android/pull/5706
+* Fix rendering notifications after receiving redundant push by @SpiritCroc in https://github.com/element-hq/element-x-android/pull/5711
+* Fix push gateway with some push provider (Sunup/autopush) by @p1gp1g in https://github.com/element-hq/element-x-android/pull/5741
+* Use new notification sound in release. by @bmarty in https://github.com/element-hq/element-x-android/pull/5748
+* Fix issue on brand color override by @bmarty in https://github.com/element-hq/element-x-android/pull/5626
+* Add media retention policy by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5749
+* Enable logging OkHttp traffic based on the current log level by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5750
+* Remove unused `slidingSyncProxy` from DB. by @bmarty in https://github.com/element-hq/element-x-android/pull/5755
+* Add some performance metrics for Sentry by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5760
+
+## New Contributors
+* @benbz made their first contribution in https://github.com/element-hq/element-x-android/pull/5689
+* @kaylendog made their first contribution in https://github.com/element-hq/element-x-android/pull/5691
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.11.2...v25.11.3
+
 Changes in Element X v25.11.2
 =============================
 

From 95c9e768f41253c63f7cb8f3f614b1b488d43fb4 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Fri, 21 Nov 2025 17:01:01 +0100
Subject: [PATCH 031/113] Use regex to check forbidden terms. (#5784)

We were returning and `Elementul` as a match for the forbidden term `Element`. It now checks for the full word.
---
 tools/localazy/checkForbiddenTerms.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/localazy/checkForbiddenTerms.py b/tools/localazy/checkForbiddenTerms.py
index d108d19e4f..e190fcea68 100755
--- a/tools/localazy/checkForbiddenTerms.py
+++ b/tools/localazy/checkForbiddenTerms.py
@@ -6,6 +6,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
+import re
 import sys
 from xml.dom import minidom
 
@@ -14,7 +15,7 @@ file = sys.argv[1]
 # Dict of forbidden terms, with exceptions for some String name
 # Keys are the terms, values are the exceptions.
 forbiddenTerms = {
-    "Element": [
+    r"\bElement\b": [
         # Those 2 strings are only used in debug version
         "screen_advanced_settings_element_call_base_url",
         "screen_advanced_settings_element_call_base_url_description",
@@ -48,7 +49,8 @@ for elem in content.getElementsByTagName('string'):
     value = child.nodeValue
     # If value contains a forbidden term, add the error to errors
     for (term, exceptions) in forbiddenTerms.items():
-        if term in value and name not in exceptions:
+        matches = re.search(term, value)
+        if matches and name not in exceptions:
             errors.append('Forbidden term "' + term + '" in string: "' + name + '": ' + value)
 
 ### Plurals
@@ -65,7 +67,8 @@ for elem in content.getElementsByTagName('plurals'):
         value = child.nodeValue
         # If value contains a forbidden term, add the error to errors
         for (term, exceptions) in forbiddenTerms.items():
-            if term in value and name not in exceptions:
+            matches = re.search(term, value)
+            if matches and name not in exceptions:
                 errors.append('Forbidden term "' + term + '" in plural: "' + name + '": ' + value)
 
 # If errors is not empty print the report

From 16a8425ab618828b5f7127509c650d024f62cdf9 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 20 Nov 2025 16:41:43 +0100
Subject: [PATCH 032/113] change(members): make sure state is not lost when
 navigating

---
 .../impl/members/RoomMemberListEvents.kt      |   1 +
 .../impl/members/RoomMemberListNode.kt        |   6 +-
 .../impl/members/RoomMemberListPresenter.kt   |  18 +-
 .../impl/members/RoomMemberListState.kt       |   6 +
 .../members/RoomMemberListStateProvider.kt    | 207 ++++++++++--------
 .../impl/members/RoomMemberListView.kt        |  40 +---
 6 files changed, 153 insertions(+), 125 deletions(-)

diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
index 00332e391a..9a8798124e 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
@@ -11,6 +11,7 @@ package io.element.android.features.roomdetails.impl.members
 import io.element.android.libraries.matrix.api.room.RoomMember
 
 sealed interface RoomMemberListEvents {
+    data class ChangeSelectedSection(val section: SelectedSection): RoomMemberListEvents
     data class UpdateSearchQuery(val query: String) : RoomMemberListEvents
     data class OnSearchActiveChanged(val active: Boolean) : RoomMemberListEvents
     data class RoomMemberSelected(val roomMember: RoomMember) : RoomMemberListEvents
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListNode.kt
index 4d915aa294..750b111fc3 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListNode.kt
@@ -9,6 +9,8 @@
 package io.element.android.features.roomdetails.impl.members
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.lifecycle.subscribe
 import com.bumble.appyx.core.modality.BuildContext
@@ -21,6 +23,7 @@ import io.element.android.annotations.ContributesNode
 import io.element.android.features.roommembermoderation.api.ModerationAction
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationRenderer
+import io.element.android.libraries.architecture.appyx.launchMolecule
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.UserId
@@ -41,6 +44,7 @@ class RoomMemberListNode(
     }
 
     private val callback: Callback = callback()
+    private val stateFlow = launchMolecule { presenter.present() }
 
     init {
         lifecycle.subscribe(
@@ -64,7 +68,7 @@ class RoomMemberListNode(
 
     @Composable
     override fun View(modifier: Modifier) {
-        val state = presenter.present()
+        val state by stateFlow.collectAsState()
         RoomMemberListView(
             state = state,
             modifier = modifier,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
index e69ddb744a..65385e5f08 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -10,6 +10,7 @@ package io.element.android.features.roomdetails.impl.members
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -18,7 +19,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
-import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
+import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents.ShowActionsForUser
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
@@ -53,7 +54,7 @@ class RoomMemberListPresenter(
     private val roomMembersModerationPresenter: Presenter<RoomMemberModerationState>,
     private val encryptionService: EncryptionService,
 ) : Presenter<RoomMemberListState> {
-    private var roomMembers: AsyncData<RoomMembers> by mutableStateOf(AsyncData.Loading())
+
     private val powerLevelRoomMemberComparator = PowerLevelRoomMemberComparator()
 
     @Composable
@@ -77,6 +78,9 @@ class RoomMemberListPresenter(
                 .launchIn(this)
         }
 
+        var roomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading())}
+        var selectedSection by remember {  mutableStateOf(SelectedSection.MEMBERS)}
+
         // Update the room members when the screen is loaded
         LaunchedEffect(Unit) {
             room.updateMembers()
@@ -160,7 +164,14 @@ class RoomMemberListPresenter(
                 is RoomMemberListEvents.OnSearchActiveChanged -> isSearchActive = event.active
                 is RoomMemberListEvents.UpdateSearchQuery -> searchQuery = event.query
                 is RoomMemberListEvents.RoomMemberSelected ->
-                    roomModerationState.eventSink(RoomMemberModerationEvents.ShowActionsForUser(event.roomMember.toMatrixUser()))
+                    roomModerationState.eventSink(ShowActionsForUser(event.roomMember.toMatrixUser()))
+                is RoomMemberListEvents.ChangeSelectedSection -> selectedSection = event.section
+            }
+        }
+
+        if (!roomModerationState.canBan && selectedSection == SelectedSection.BANNED) {
+            SideEffect {
+                selectedSection = SelectedSection.MEMBERS
             }
         }
 
@@ -171,6 +182,7 @@ class RoomMemberListPresenter(
             isSearchActive = isSearchActive,
             canInvite = canInvite,
             moderationState = roomModerationState,
+            selectedSection = selectedSection,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
index 404ecb523e..498dfd0180 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
@@ -21,10 +21,16 @@ data class RoomMemberListState(
     val searchResults: SearchBarResultState<AsyncData<RoomMembers>>,
     val isSearchActive: Boolean,
     val canInvite: Boolean,
+    val selectedSection: SelectedSection,
     val moderationState: RoomMemberModerationState,
     val eventSink: (RoomMemberListEvents) -> Unit,
 )
 
+enum class SelectedSection {
+    MEMBERS,
+    BANNED
+}
+
 data class RoomMembers(
     val invited: ImmutableList<RoomMemberWithIdentityState>,
     val joined: ImmutableList<RoomMemberWithIdentityState>,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
index 2194019e70..312efef35c 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
@@ -21,107 +21,131 @@ import kotlinx.collections.immutable.persistentListOf
 
 internal class RoomMemberListStateProvider : PreviewParameterProvider<RoomMemberListState> {
     override val values: Sequence<RoomMemberListState>
-        get() = sequenceOf(
-            aRoomMemberListState(
-                roomMembers = AsyncData.Success(
-                    RoomMembers(
-                        invited = persistentListOf(aVictor().withIdentity(), aWalter().withIdentity()),
-                        joined = persistentListOf(anAlice().withIdentity(), aBob().withIdentity(), aWalter().withIdentity()),
-                        banned = persistentListOf(),
-                    )
-                )
-            ),
-            aRoomMemberListState(
-                roomMembers = AsyncData.Success(
-                    RoomMembers(
-                        invited = persistentListOf(aVictor().withIdentity(), aWalter().withIdentity()),
-                        joined = persistentListOf(
-                            anAlice().withIdentity(identityState = IdentityState.Verified),
-                            aBob().withIdentity(identityState = IdentityState.PinViolation),
-                            aWalter().withIdentity(identityState = IdentityState.VerificationViolation)
-                        ),
-                        banned = persistentListOf(),
-                    )
-                ),
-                moderationState = aRoomMemberModerationState(canBan = true)
-            ),
-            aRoomMemberListState(roomMembers = AsyncData.Loading()),
-            aRoomMemberListState().copy(canInvite = true),
-            aRoomMemberListState().copy(isSearchActive = false),
-            aRoomMemberListState().copy(isSearchActive = true),
-            aRoomMemberListState().copy(isSearchActive = true, searchQuery = "someone"),
-            aRoomMemberListState().copy(
-                isSearchActive = true,
-                searchQuery = "@someone:matrix.org",
-                searchResults = SearchBarResultState.Results(
-                    AsyncData.Success(
-                        RoomMembers(
-                            invited = persistentListOf(aVictor().withIdentity()),
-                            joined = persistentListOf(anAlice().withIdentity()),
-                            banned = persistentListOf(),
-                        )
-                    )
-                ),
-            ),
-            aRoomMemberListState().copy(
-                isSearchActive = true,
-                searchQuery = "something-with-no-results",
-                searchResults = SearchBarResultState.NoResultsFound()
-            ),
-            aRoomMemberListState(
-                roomMembers = AsyncData.Failure(Exception("Error details")),
-            ),
-        )
+        get() = roomMemberListStates() + bannedRoomMemberListStates()
 }
 
-internal class RoomMemberListStateBannedProvider : PreviewParameterProvider<RoomMemberListState> {
-    override val values: Sequence<RoomMemberListState>
-        get() = sequenceOf(
-            aRoomMemberListState(
-                roomMembers = AsyncData.Success(
-                    RoomMembers(
-                        invited = persistentListOf(),
-                        joined = persistentListOf(),
-                        banned = persistentListOf(
-                            aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice").withIdentity(),
-                            aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob").withIdentity(),
-                            aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie").withIdentity(),
-                        ),
-                    )
-                ),
-                moderationState = aRoomMemberModerationState(),
+private fun roomMemberListStates(): Sequence<RoomMemberListState> = sequenceOf(
+    aRoomMemberListState(
+        roomMembers = AsyncData.Success(
+            RoomMembers(
+                invited = persistentListOf(aVictor().withIdentity(), aWalter().withIdentity()),
+                joined = persistentListOf(anAlice().withIdentity(), aBob().withIdentity(), aWalter().withIdentity()),
+                banned = persistentListOf(),
             ),
-            aRoomMemberListState(
-                roomMembers = AsyncData.Loading(
-                    RoomMembers(
-                        invited = persistentListOf(),
-                        joined = persistentListOf(),
-                        banned = persistentListOf(
-                            aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice").withIdentity(),
-                            aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob").withIdentity(),
-                            aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie").withIdentity(),
-                        ),
-                    )
+        ),
+        selectedSection = SelectedSection.MEMBERS,
+    ),
+    aRoomMemberListState(
+        roomMembers = AsyncData.Success(
+            RoomMembers(
+                invited = persistentListOf(aVictor().withIdentity(), aWalter().withIdentity()),
+                joined = persistentListOf(
+                    anAlice().withIdentity(identityState = IdentityState.Verified),
+                    aBob().withIdentity(identityState = IdentityState.PinViolation),
+                    aWalter().withIdentity(identityState = IdentityState.VerificationViolation)
                 ),
-                moderationState = aRoomMemberModerationState(),
-            ),
-            aRoomMemberListState(
-                roomMembers = AsyncData.Success(
-                    RoomMembers(
-                        invited = persistentListOf(),
-                        joined = persistentListOf(),
-                        banned = persistentListOf(),
-                    )
-                ),
-                moderationState = aRoomMemberModerationState(),
+                banned = persistentListOf(),
             )
-        )
-}
+        ),
+        selectedSection = SelectedSection.MEMBERS,
+        moderationState = aRoomMemberModerationState(canBan = true)
+    ),
+    aRoomMemberListState(
+        roomMembers = AsyncData.Loading(),
+        selectedSection = SelectedSection.MEMBERS,
+    ),
+    aRoomMemberListState().copy(
+        canInvite = true,
+        selectedSection = SelectedSection.MEMBERS,
+    ),
+    aRoomMemberListState().copy(
+        isSearchActive = false,
+        selectedSection = SelectedSection.MEMBERS,
+    ),
+    aRoomMemberListState().copy(
+        isSearchActive = true,
+        selectedSection = SelectedSection.MEMBERS,
+    ),
+    aRoomMemberListState().copy(
+        isSearchActive = true,
+        searchQuery = "someone",
+        selectedSection = SelectedSection.MEMBERS,
+    ),
+    aRoomMemberListState().copy(
+        isSearchActive = true,
+        searchQuery = "@someone:matrix.org",
+        searchResults = SearchBarResultState.Results(
+            AsyncData.Success(
+                RoomMembers(
+                    invited = persistentListOf(aVictor().withIdentity()),
+                    joined = persistentListOf(anAlice().withIdentity()),
+                    banned = persistentListOf(),
+                )
+            )
+        ),
+        selectedSection = SelectedSection.MEMBERS,
+    ),
+    aRoomMemberListState().copy(
+        isSearchActive = true,
+        searchQuery = "something-with-no-results",
+        searchResults = SearchBarResultState.NoResultsFound(),
+        selectedSection = SelectedSection.MEMBERS,
+    ),
+    aRoomMemberListState(
+        roomMembers = AsyncData.Failure(Exception("Error details")),
+        selectedSection = SelectedSection.MEMBERS,
+    ),
+)
+
+private fun bannedRoomMemberListStates(): Sequence<RoomMemberListState> = sequenceOf(
+    aRoomMemberListState(
+        roomMembers = AsyncData.Success(
+            RoomMembers(
+                invited = persistentListOf(),
+                joined = persistentListOf(),
+                banned = persistentListOf(
+                    aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice").withIdentity(),
+                    aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob").withIdentity(),
+                    aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie").withIdentity(),
+                ),
+            )
+        ),
+        moderationState = aRoomMemberModerationState(),
+        selectedSection = SelectedSection.BANNED,
+    ),
+    aRoomMemberListState(
+        roomMembers = AsyncData.Loading(
+            RoomMembers(
+                invited = persistentListOf(),
+                joined = persistentListOf(),
+                banned = persistentListOf(
+                    aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice").withIdentity(),
+                    aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob").withIdentity(),
+                    aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie").withIdentity(),
+                ),
+            )
+        ),
+        moderationState = aRoomMemberModerationState(),
+        selectedSection = SelectedSection.BANNED,
+    ),
+    aRoomMemberListState(
+        roomMembers = AsyncData.Success(
+            RoomMembers(
+                invited = persistentListOf(),
+                joined = persistentListOf(),
+                banned = persistentListOf(),
+            )
+        ),
+        moderationState = aRoomMemberModerationState(),
+        selectedSection = SelectedSection.BANNED,
+    )
+)
 
 internal fun aRoomMemberListState(
     roomMembers: AsyncData<RoomMembers> = AsyncData.Loading(),
     searchResults: SearchBarResultState<AsyncData<RoomMembers>> = SearchBarResultState.Initial(),
     moderationState: RoomMemberModerationState = aRoomMemberModerationState(),
+    selectedSection: SelectedSection = SelectedSection.MEMBERS,
 ) = RoomMemberListState(
     roomMembers = roomMembers,
     searchQuery = "",
@@ -129,6 +153,7 @@ internal fun aRoomMemberListState(
     isSearchActive = false,
     canInvite = false,
     moderationState = moderationState,
+    selectedSection = SelectedSection.MEMBERS,
     eventSink = {}
 )
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
index 2b1ebb175c..b2a51aa446 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
@@ -30,10 +30,7 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SingleChoiceSegmentedButtonRow
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -48,6 +45,7 @@ import io.element.android.features.roomdetails.impl.R
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
@@ -68,17 +66,11 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
-private enum class SelectedSection {
-    MEMBERS,
-    BANNED
-}
-
 @Composable
 fun RoomMemberListView(
     state: RoomMemberListState,
     navigator: RoomMemberListNavigator,
     modifier: Modifier = Modifier,
-    initialSelectedSectionIndex: Int = 0,
 ) {
     fun onSelectUser(roomMember: RoomMember) {
         state.eventSink(RoomMemberListEvents.RoomMemberSelected(roomMember))
@@ -96,12 +88,6 @@ fun RoomMemberListView(
             }
         }
     ) { padding ->
-        var selectedSection by remember { mutableStateOf(SelectedSection.entries[initialSelectedSectionIndex]) }
-        if (!state.moderationState.canBan && selectedSection == SelectedSection.BANNED) {
-            SideEffect {
-                selectedSection = SelectedSection.MEMBERS
-            }
-        }
         Column(
             modifier = Modifier
                 .fillMaxWidth()
@@ -117,7 +103,7 @@ fun RoomMemberListView(
                 onActiveChange = { state.eventSink(RoomMemberListEvents.OnSearchActiveChanged(it)) },
                 onTextChange = { state.eventSink(RoomMemberListEvents.UpdateSearchQuery(it)) },
                 onSelectUser = ::onSelectUser,
-                selectedSection = selectedSection,
+                selectedSection = state.selectedSection,
                 modifier = Modifier.fillMaxWidth(),
             )
 
@@ -126,8 +112,8 @@ fun RoomMemberListView(
                     roomMembers = state.roomMembers,
                     showMembersCount = true,
                     canDisplayBannedUsersControls = state.moderationState.canBan,
-                    selectedSection = selectedSection,
-                    onSelectedSectionChange = { selectedSection = it },
+                    selectedSection = state.selectedSection,
+                    onSelectedSectionChange = { state.eventSink(RoomMemberListEvents.ChangeSelectedSection(it)) },
                     onSelectUser = ::onSelectUser,
                 )
             }
@@ -380,9 +366,13 @@ private fun RoomMemberSearchBar(
     selectedSection: SelectedSection,
     modifier: Modifier = Modifier,
 ) {
+    var queryFieldState by textFieldState(query)
     SearchBar(
-        query = query,
-        onQueryChange = onTextChange,
+        query = queryFieldState,
+        onQueryChange = { newQuery ->
+            queryFieldState = newQuery
+            onTextChange(newQuery)
+        },
         active = active,
         onActiveChange = onActiveChange,
         modifier = modifier,
@@ -409,13 +399,3 @@ internal fun RoomMemberListViewPreview(@PreviewParameter(RoomMemberListStateProv
         navigator = object : RoomMemberListNavigator {},
     )
 }
-
-@PreviewsDayNight
-@Composable
-internal fun RoomMemberListViewBannedPreview(@PreviewParameter(RoomMemberListStateBannedProvider::class) state: RoomMemberListState) = ElementPreview {
-    RoomMemberListView(
-        initialSelectedSectionIndex = 1,
-        state = state,
-        navigator = object : RoomMemberListNavigator {},
-    )
-}

From c765084f0008ff85d58a480e1f19e2877d13bb0d Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 20 Nov 2025 18:27:23 +0100
Subject: [PATCH 033/113] change(members): search is now dependent of the
 selected section

---
 .../impl/members/RoomMemberListDataSource.kt   | 18 +++++++++++++-----
 .../impl/members/RoomMemberListPresenter.kt    |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
index 87ae53c93c..5e00ce0937 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
@@ -13,23 +13,31 @@ import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.room.roomMembers
 import kotlinx.coroutines.withContext
+import kotlin.collections.filter
 
 @Inject
 class RoomMemberListDataSource(
     private val room: BaseRoom,
     private val coroutineDispatchers: CoroutineDispatchers,
 ) {
-    suspend fun search(query: String): List<RoomMember> = withContext(coroutineDispatchers.io) {
+    suspend fun search(query: String, selectedSection: SelectedSection): List<RoomMember> = withContext(coroutineDispatchers.io) {
         val roomMembersState = room.membersStateFlow.value
-        val activeRoomMembers = roomMembersState.roomMembers()
-            ?.filter { it.membership.isActive() }
+        val displayableMembers = roomMembersState.roomMembers()
             .orEmpty()
+            .filter {
+                when(selectedSection){
+                    SelectedSection.MEMBERS -> it.membership.isActive()
+                    SelectedSection.BANNED -> it.membership == RoomMembershipState.BAN
+                }
+            }
+
         val filteredMembers = if (query.isBlank()) {
-            activeRoomMembers
+            displayableMembers
         } else {
-            activeRoomMembers.filter { member ->
+            displayableMembers.filter { member ->
                 member.userId.value.contains(query, ignoreCase = true) ||
                     member.displayName?.contains(query, ignoreCase = true).orFalse()
             }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
index 65385e5f08..400432d331 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -130,7 +130,7 @@ class RoomMemberListPresenter(
                 searchResults = if (searchQuery.isEmpty() || !isSearchActive) {
                     SearchBarResultState.Initial()
                 } else {
-                    val results = roomMemberListDataSource.search(searchQuery).groupBy { it.membership }
+                    val results = roomMemberListDataSource.search(searchQuery, selectedSection).groupBy { it.membership }
                     if (results.isEmpty()) {
                         SearchBarResultState.NoResultsFound()
                     } else {

From 24c2edc16e52c3db91acade016b1d8281d972d1d Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 20 Nov 2025 20:21:02 +0100
Subject: [PATCH 034/113] change(members): update RoomMemberModerationView

---
 .../impl/RoomMemberModerationView.kt          | 42 ++++++++++---------
 .../components/avatar/AvatarSize.kt           |  2 +-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt
index 1e7251b20b..ac6c5bc4cb 100644
--- a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt
+++ b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt
@@ -232,32 +232,34 @@ private fun RoomMemberActionsBottomSheet(
                 avatarData = user.getAvatarData(size = AvatarSize.RoomListManageUser),
                 avatarType = AvatarType.User,
                 modifier = Modifier
-                        .padding(bottom = 28.dp)
-                        .align(Alignment.CenterHorizontally)
+                    .padding(bottom = 24.dp)
+                    .align(Alignment.CenterHorizontally)
             )
-            user.displayName?.let {
-                Text(
-                    text = it,
-                    style = ElementTheme.typography.fontHeadingLgBold,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier
-                            .padding(start = 16.dp, end = 16.dp, bottom = 8.dp)
-                            .fillMaxWidth()
-                )
-            }
+            val bestName = user.getBestName()
             Text(
-                text = user.userId.value,
-                style = ElementTheme.typography.fontBodyLgRegular,
-                color = ElementTheme.colors.textSecondary,
+                text = bestName,
+                style = ElementTheme.typography.fontHeadingLgBold,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
                 textAlign = TextAlign.Center,
                 modifier = Modifier
+                    .padding(start = 16.dp, end = 16.dp, bottom = 8.dp)
+                    .fillMaxWidth()
+            )
+            // Show user ID only if it's different from the display name
+            if (bestName != user.userId.value) {
+                Text(
+                    text = user.userId.value,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textSecondary,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier
                         .padding(horizontal = 16.dp)
                         .fillMaxWidth()
-            )
+                )
+            }
             Spacer(modifier = Modifier.height(32.dp))
 
             for (actionState in actions) {
@@ -330,8 +332,8 @@ internal fun RoomMemberModerationViewPreview(@PreviewParameter(InternalRoomMembe
     ElementPreview {
         Box(
             modifier = Modifier
-                    .fillMaxWidth()
-                    .heightIn(min = 64.dp)
+                .fillMaxWidth()
+                .heightIn(min = 64.dp)
         ) {
             RoomMemberModerationView(
                 state = state,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
index 31294c378f..0f99349494 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
@@ -47,7 +47,7 @@ enum class AvatarSize(val dp: Dp) {
     InviteSender(16.dp),
 
     EditRoomDetails(70.dp),
-    RoomListManageUser(70.dp),
+    RoomListManageUser(96.dp),
 
     NotificationsOptIn(32.dp),
 

From 3e125b465d80afbabe66209c6f5007cdefb88a5e Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 20 Nov 2025 21:54:01 +0100
Subject: [PATCH 035/113] design: introduce SearchField component

---
 .../theme/components/SearchField.kt           | 224 ++++++++++++++++++
 1 file changed, 224 insertions(+)
 create mode 100644 libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchField.kt

diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchField.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchField.kt
new file mode 100644
index 0000000000..fc84abe827
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchField.kt
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.theme.components
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsFocusedAsState
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
+import io.element.android.libraries.designsystem.preview.ElementPreviewDark
+import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.preview.PreviewGroup
+import io.element.android.libraries.ui.strings.CommonStrings
+
+/**
+ * https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=1985-3223
+ */
+@Composable
+fun SearchField(
+    value: String,
+    onValueChange: (String) -> Unit,
+    modifier: Modifier = Modifier,
+    placeholder: String? = null,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) {
+    val focusManager = LocalFocusManager.current
+    val isFocused by interactionSource.collectIsFocusedAsState()
+    BasicTextField(
+        value = value,
+        onValueChange = onValueChange,
+        modifier = modifier,
+        textStyle = textFieldStyle(),
+        singleLine = true,
+        interactionSource = interactionSource,
+        keyboardOptions = KeyboardOptions(
+            imeAction = ImeAction.Search,
+        ),
+        keyboardActions = KeyboardActions(
+            onSearch = {
+                focusManager.clearFocus()
+            }
+        ),
+        cursorBrush = SolidColor(ElementTheme.colors.textActionAccent),
+    ) { innerTextField ->
+        DecorationBox(
+            isFocused = isFocused,
+            placeholder = placeholder,
+            isTextEmpty = value.isEmpty(),
+            innerTextField = innerTextField,
+            onClear = { onValueChange("") },
+        )
+    }
+}
+
+@Composable
+fun SearchField(
+    value: TextFieldValue,
+    onValueChange: (TextFieldValue) -> Unit,
+    modifier: Modifier = Modifier,
+    placeholder: String? = null,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) {
+    val focusManager = LocalFocusManager.current
+    val isFocused by interactionSource.collectIsFocusedAsState()
+    BasicTextField(
+        value = value,
+        onValueChange = onValueChange,
+        modifier = modifier,
+        textStyle = textFieldStyle(),
+        singleLine = true,
+        interactionSource = interactionSource,
+        keyboardOptions = KeyboardOptions(
+            imeAction = ImeAction.Search,
+        ),
+        keyboardActions = KeyboardActions(
+            onSearch = {
+                focusManager.clearFocus()
+            }
+        ),
+        cursorBrush = SolidColor(ElementTheme.colors.textActionAccent),
+    ) { innerTextField ->
+        DecorationBox(
+            isFocused = isFocused,
+            placeholder = placeholder,
+            isTextEmpty = value.text.isEmpty(),
+            innerTextField = innerTextField,
+            onClear = { TextFieldValue() }
+        )
+    }
+}
+
+@Composable
+private fun DecorationBox(
+    isFocused: Boolean,
+    placeholder: String?,
+    isTextEmpty: Boolean,
+    onClear: () -> Unit,
+    innerTextField: @Composable () -> Unit,
+) {
+    SearchFieldContainer(
+        isFocused = isFocused,
+    ) {
+        Row(modifier = Modifier.padding(start = 16.dp), verticalAlignment = Alignment.CenterVertically) {
+            Box(modifier = Modifier.weight(1f)) {
+                if (placeholder != null && isTextEmpty) {
+                    Text(
+                        text = placeholder,
+                        color = ElementTheme.colors.textSecondary,
+                        style = ElementTheme.typography.fontBodyLgRegular,
+                    )
+                }
+                innerTextField()
+            }
+            Spacer(modifier = Modifier.width(16.dp))
+            val showClearIcon = isFocused && !isTextEmpty
+            IconButton(onClick = onClear, enabled = showClearIcon) {
+                if (showClearIcon) {
+                    Icon(
+                        modifier = Modifier.background(ElementTheme.colors.iconSecondary, CircleShape),
+                        imageVector = CompoundIcons.Close(),
+                        contentDescription = stringResource(CommonStrings.action_clear),
+                        tint = ElementTheme.colors.iconOnSolidPrimary,
+                    )
+                } else {
+                    Icon(
+                        imageVector = CompoundIcons.Search(),
+                        contentDescription = null,
+                        tint = ElementTheme.colors.iconTertiary,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun SearchFieldContainer(
+    isFocused: Boolean,
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit
+) {
+    Surface(
+        modifier = modifier,
+        shape = RoundedCornerShape(99.dp),
+        border = BorderStroke(
+            width = 1.dp,
+            color = if (isFocused) {
+                ElementTheme.colors.borderInteractiveHovered
+            } else {
+                ElementTheme.colors.borderInteractiveSecondary
+            }
+        ),
+        color = ElementTheme.colors.bgSubtleSecondary,
+        content = content
+    )
+}
+
+@Composable
+private fun textFieldStyle(): TextStyle {
+    return ElementTheme.typography.fontBodyLgRegular.copy(
+        color = ElementTheme.colors.textPrimary
+    )
+}
+
+@Preview(group = PreviewGroup.Search, heightDp = 1000)
+@Composable
+internal fun SearchFieldsLightPreview() = ElementPreviewLight { ContentToPreview() }
+
+@Preview(group = PreviewGroup.Search, heightDp = 1000)
+@Composable
+internal fun SearchFieldsDarkPreview() = ElementPreviewDark { ContentToPreview() }
+
+@Composable
+@ExcludeFromCoverage
+private fun ContentToPreview() {
+    Column(
+        modifier = Modifier.padding(8.dp),
+        verticalArrangement = spacedBy(8.dp)
+    ) {
+        SearchField(
+            onValueChange = {},
+            placeholder = "Search",
+            value = "",
+        )
+        SearchField(
+            onValueChange = {},
+            placeholder = "Search",
+            value = "Search term",
+        )
+    }
+}

From 0beeda6001f615b3e9a09d68f46023886d598736 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 21 Nov 2025 11:53:03 +0100
Subject: [PATCH 036/113] misc: AsyncData map non nullable

---
 .../features/space/impl/leave/LeaveSpacePresenter.kt        | 2 +-
 .../io/element/android/libraries/architecture/AsyncData.kt  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt
index 1d5e614113..a331aefccd 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt
@@ -88,7 +88,7 @@ class LeaveSpacePresenter(
         }
         LaunchedEffect(selectedRoomIds, leaveSpaceRooms) {
             selectableSpaceRooms = leaveSpaceRooms.map {
-                it?.others.orEmpty().map { room ->
+                it.others.map { room ->
                     SelectableSpaceRoom(
                         spaceRoom = room.spaceRoom,
                         isLastAdmin = room.isLastAdmin,
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt
index 5dcf1f933a..118addf1fe 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt
@@ -163,14 +163,14 @@ suspend inline fun <T> runUpdatingState(
 }
 
 inline fun <T, R> AsyncData<T>.map(
-    transform: (T?) -> R,
+    transform: (T) -> R,
 ): AsyncData<R> {
     return when (this) {
         is AsyncData.Failure -> AsyncData.Failure(
             error = error,
-            prevData = transform(prevData)
+            prevData = prevData?.let { transform(prevData) }
         )
-        is AsyncData.Loading -> AsyncData.Loading(transform(prevData))
+        is AsyncData.Loading -> AsyncData.Loading(prevData?.let { transform(prevData) })
         is AsyncData.Success -> AsyncData.Success(transform(data))
         AsyncData.Uninitialized -> AsyncData.Uninitialized
     }

From a3bb1b93abb3e87e1715d52953c2a4ccc61f4db6 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 21 Nov 2025 11:54:07 +0100
Subject: [PATCH 037/113] change(members): use SearchField and update strings

---
 .../impl/src/main/res/values/localazy.xml     |   6 +-
 .../impl/members/RoomMemberListDataSource.kt  |  47 -----
 .../impl/members/RoomMemberListEvents.kt      |   1 -
 .../impl/members/RoomMemberListPresenter.kt   |  50 +----
 .../impl/members/RoomMemberListState.kt       |  22 ++-
 .../members/RoomMemberListStateProvider.kt    |  20 +-
 .../impl/members/RoomMemberListView.kt        | 184 +++++++-----------
 .../impl/src/main/res/values/localazy.xml     |   8 +-
 tools/localazy/config.json                    |   1 +
 9 files changed, 113 insertions(+), 226 deletions(-)
 delete mode 100644 features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt

diff --git a/features/rolesandpermissions/impl/src/main/res/values/localazy.xml b/features/rolesandpermissions/impl/src/main/res/values/localazy.xml
index 2d98f43f97..77ab04749f 100644
--- a/features/rolesandpermissions/impl/src/main/res/values/localazy.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values/localazy.xml
@@ -35,8 +35,8 @@
   <string name="screen_room_change_role_unsaved_changes_title">"Save changes?"</string>
   <string name="screen_room_member_list_banned_empty">"There are no banned users."</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d person"</item>
-    <item quantity="other">"%1$d people"</item>
+    <item quantity="one">"%1$d Person"</item>
+    <item quantity="other">"%1$d People"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Ban user"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Only remove member"</string>
@@ -45,7 +45,7 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Unban user"</string>
   <string name="screen_room_member_list_mode_banned">"Banned"</string>
   <string name="screen_room_member_list_mode_members">"Members"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pending"</string>
+  <string name="screen_room_member_list_pending_header_title">"%1$d Invited"</string>
   <string name="screen_room_member_list_role_administrator">"Admin"</string>
   <string name="screen_room_member_list_role_moderator">"Moderator"</string>
   <string name="screen_room_member_list_role_owner">"Owner"</string>
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
deleted file mode 100644
index 5e00ce0937..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.roomdetails.impl.members
-
-import dev.zacsweers.metro.Inject
-import io.element.android.libraries.core.bool.orFalse
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.matrix.api.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.RoomMembershipState
-import io.element.android.libraries.matrix.api.room.roomMembers
-import kotlinx.coroutines.withContext
-import kotlin.collections.filter
-
-@Inject
-class RoomMemberListDataSource(
-    private val room: BaseRoom,
-    private val coroutineDispatchers: CoroutineDispatchers,
-) {
-    suspend fun search(query: String, selectedSection: SelectedSection): List<RoomMember> = withContext(coroutineDispatchers.io) {
-        val roomMembersState = room.membersStateFlow.value
-        val displayableMembers = roomMembersState.roomMembers()
-            .orEmpty()
-            .filter {
-                when(selectedSection){
-                    SelectedSection.MEMBERS -> it.membership.isActive()
-                    SelectedSection.BANNED -> it.membership == RoomMembershipState.BAN
-                }
-            }
-
-        val filteredMembers = if (query.isBlank()) {
-            displayableMembers
-        } else {
-            displayableMembers.filter { member ->
-                member.userId.value.contains(query, ignoreCase = true) ||
-                    member.displayName?.contains(query, ignoreCase = true).orFalse()
-            }
-        }
-        filteredMembers
-    }
-}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
index 9a8798124e..a4b7b22bf3 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
@@ -13,6 +13,5 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 sealed interface RoomMemberListEvents {
     data class ChangeSelectedSection(val section: SelectedSection): RoomMemberListEvents
     data class UpdateSearchQuery(val query: String) : RoomMemberListEvents
-    data class OnSearchActiveChanged(val active: Boolean) : RoomMemberListEvents
     data class RoomMemberSelected(val roomMember: RoomMember) : RoomMemberListEvents
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
index 400432d331..44e0aa168f 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -23,6 +23,7 @@ import io.element.android.features.roommembermoderation.api.RoomMemberModeration
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.map
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.core.UserId
@@ -41,7 +42,6 @@ import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
@@ -63,8 +63,6 @@ class RoomMemberListPresenter(
         var searchResults by remember {
             mutableStateOf<SearchBarResultState<AsyncData<RoomMembers>>>(SearchBarResultState.Initial())
         }
-        var isSearchActive by rememberSaveable { mutableStateOf(false) }
-
         val membersState by room.membersStateFlow.collectAsState()
         val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
         val canInvite by room.canInviteAsState(syncUpdateFlow.value)
@@ -78,8 +76,9 @@ class RoomMemberListPresenter(
                 .launchIn(this)
         }
 
-        var roomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading())}
-        var selectedSection by remember {  mutableStateOf(SelectedSection.MEMBERS)}
+        var roomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading()) }
+        var selectedSection by remember { mutableStateOf(SelectedSection.MEMBERS) }
+        var filteredRoomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading()) }
 
         // Update the room members when the screen is loaded
         LaunchedEffect(Unit) {
@@ -98,7 +97,7 @@ class RoomMemberListPresenter(
             }
             withContext(coroutineDispatchers.io) {
                 val members = membersState.roomMembers().orEmpty().groupBy { it.membership }
-                val info = room.roomInfoFlow.first()
+                val info = room.info()
                 if (members.getOrDefault(RoomMembershipState.JOIN, emptyList()).size < info.joinedMembersCount / 2) {
                     // Don't display initial room member list if we have less than half of the joined members:
                     // This result will come from the timeline loading membership events and it'll be wrong.
@@ -125,43 +124,16 @@ class RoomMemberListPresenter(
             }
         }
 
-        LaunchedEffect(membersState, searchQuery, isSearchActive) {
-            withContext(coroutineDispatchers.io) {
-                searchResults = if (searchQuery.isEmpty() || !isSearchActive) {
-                    SearchBarResultState.Initial()
-                } else {
-                    val results = roomMemberListDataSource.search(searchQuery, selectedSection).groupBy { it.membership }
-                    if (results.isEmpty()) {
-                        SearchBarResultState.NoResultsFound()
-                    } else {
-                        val result = RoomMembers(
-                            invited = results.getOrDefault(RoomMembershipState.INVITE, emptyList())
-                                .map { it.withIdentityState(roomMemberIdentityStates) }
-                                .toImmutableList(),
-                            joined = results.getOrDefault(RoomMembershipState.JOIN, emptyList())
-                                .sortedWith(powerLevelRoomMemberComparator)
-                                .map { it.withIdentityState(roomMemberIdentityStates) }
-                                .toImmutableList(),
-                            banned = results.getOrDefault(RoomMembershipState.BAN, emptyList())
-                                .sortedBy { it.userId.value }
-                                .map { it.withIdentityState(roomMemberIdentityStates) }
-                                .toImmutableList(),
-                        )
-                        SearchBarResultState.Results(
-                            if (membersState is RoomMembersState.Pending) {
-                                AsyncData.Loading(result)
-                            } else {
-                                AsyncData.Success(result)
-                            }
-                        )
-                    }
+        LaunchedEffect(searchQuery, roomMembers) {
+            filteredRoomMembers = roomMembers.map { members ->
+                withContext(coroutineDispatchers.io) {
+                    members.filter(searchQuery)
                 }
             }
         }
 
         fun handleEvent(event: RoomMemberListEvents) {
             when (event) {
-                is RoomMemberListEvents.OnSearchActiveChanged -> isSearchActive = event.active
                 is RoomMemberListEvents.UpdateSearchQuery -> searchQuery = event.query
                 is RoomMemberListEvents.RoomMemberSelected ->
                     roomModerationState.eventSink(ShowActionsForUser(event.roomMember.toMatrixUser()))
@@ -176,10 +148,8 @@ class RoomMemberListPresenter(
         }
 
         return RoomMemberListState(
-            roomMembers = roomMembers,
+            roomMembers = filteredRoomMembers,
             searchQuery = searchQuery,
-            searchResults = searchResults,
-            isSearchActive = isSearchActive,
             canInvite = canInvite,
             moderationState = roomModerationState,
             selectedSection = selectedSection,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
index 498dfd0180..b59f67a915 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
@@ -10,16 +10,15 @@ package io.element.android.features.roomdetails.impl.members
 
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.RoomMember
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 
 data class RoomMemberListState(
     val roomMembers: AsyncData<RoomMembers>,
     val searchQuery: String,
-    val searchResults: SearchBarResultState<AsyncData<RoomMembers>>,
-    val isSearchActive: Boolean,
     val canInvite: Boolean,
     val selectedSection: SelectedSection,
     val moderationState: RoomMemberModerationState,
@@ -35,7 +34,22 @@ data class RoomMembers(
     val invited: ImmutableList<RoomMemberWithIdentityState>,
     val joined: ImmutableList<RoomMemberWithIdentityState>,
     val banned: ImmutableList<RoomMemberWithIdentityState>,
-)
+){
+    fun filter(query: String): RoomMembers {
+        if (query.isBlank()) {
+            return this
+        }
+        val filterPredicate = { member: RoomMemberWithIdentityState ->
+            member.roomMember.userId.value.contains(query, ignoreCase = true) ||
+                member.roomMember.displayName?.contains(query, ignoreCase = true).orFalse()
+        }
+        return RoomMembers(
+            invited = invited.filter(filterPredicate).toImmutableList(),
+            joined = joined.filter(filterPredicate).toImmutableList(),
+            banned = banned.filter(filterPredicate).toImmutableList(),
+        )
+    }
+}
 
 data class RoomMemberWithIdentityState(
     val roomMember: RoomMember,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
index 312efef35c..dafe2546d5 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
@@ -59,36 +59,21 @@ private fun roomMemberListStates(): Sequence<RoomMemberListState> = sequenceOf(
         selectedSection = SelectedSection.MEMBERS,
     ),
     aRoomMemberListState().copy(
-        isSearchActive = false,
         selectedSection = SelectedSection.MEMBERS,
     ),
     aRoomMemberListState().copy(
-        isSearchActive = true,
         selectedSection = SelectedSection.MEMBERS,
     ),
     aRoomMemberListState().copy(
-        isSearchActive = true,
         searchQuery = "someone",
         selectedSection = SelectedSection.MEMBERS,
     ),
     aRoomMemberListState().copy(
-        isSearchActive = true,
         searchQuery = "@someone:matrix.org",
-        searchResults = SearchBarResultState.Results(
-            AsyncData.Success(
-                RoomMembers(
-                    invited = persistentListOf(aVictor().withIdentity()),
-                    joined = persistentListOf(anAlice().withIdentity()),
-                    banned = persistentListOf(),
-                )
-            )
-        ),
         selectedSection = SelectedSection.MEMBERS,
     ),
     aRoomMemberListState().copy(
-        isSearchActive = true,
         searchQuery = "something-with-no-results",
-        searchResults = SearchBarResultState.NoResultsFound(),
         selectedSection = SelectedSection.MEMBERS,
     ),
     aRoomMemberListState(
@@ -143,17 +128,14 @@ private fun bannedRoomMemberListStates(): Sequence<RoomMemberListState> = sequen
 
 internal fun aRoomMemberListState(
     roomMembers: AsyncData<RoomMembers> = AsyncData.Loading(),
-    searchResults: SearchBarResultState<AsyncData<RoomMembers>> = SearchBarResultState.Initial(),
     moderationState: RoomMemberModerationState = aRoomMemberModerationState(),
     selectedSection: SelectedSection = SelectedSection.MEMBERS,
 ) = RoomMemberListState(
     roomMembers = roomMembers,
     searchQuery = "",
-    searchResults = searchResults,
-    isSearchActive = false,
     canInvite = false,
     moderationState = moderationState,
-    selectedSection = SelectedSection.MEMBERS,
+    selectedSection = selectedSection,
     eventSink = {}
 )
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
index b2a51aa446..74d3305ff5 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
@@ -51,8 +51,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.LinearProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Scaffold
-import io.element.android.libraries.designsystem.theme.components.SearchBar
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.designsystem.theme.components.SearchField
 import io.element.android.libraries.designsystem.theme.components.SegmentedButton
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
@@ -79,44 +78,39 @@ fun RoomMemberListView(
     Scaffold(
         modifier = modifier,
         topBar = {
-            if (!state.isSearchActive) {
-                RoomMemberListTopBar(
-                    canInvite = state.canInvite,
-                    onBackClick = navigator::exitRoomMemberList,
-                    onInviteClick = navigator::openInviteMembers,
-                )
-            }
+            RoomMemberListTopBar(
+                canInvite = state.canInvite,
+                onBackClick = navigator::exitRoomMemberList,
+                onInviteClick = navigator::openInviteMembers,
+            )
         }
     ) { padding ->
         Column(
             modifier = Modifier
-                .fillMaxWidth()
-                .padding(padding)
-                .consumeWindowInsets(padding),
+                    .fillMaxWidth()
+                    .padding(padding)
+                    .consumeWindowInsets(padding),
             verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
-            RoomMemberSearchBar(
-                query = state.searchQuery,
-                state = state.searchResults,
-                active = state.isSearchActive,
-                placeHolderTitle = stringResource(CommonStrings.common_search_for_someone),
-                onActiveChange = { state.eventSink(RoomMemberListEvents.OnSearchActiveChanged(it)) },
-                onTextChange = { state.eventSink(RoomMemberListEvents.UpdateSearchQuery(it)) },
-                onSelectUser = ::onSelectUser,
-                selectedSection = state.selectedSection,
-                modifier = Modifier.fillMaxWidth(),
+            var searchQuery by textFieldState(state.searchQuery)
+            SearchField(
+                value = searchQuery,
+                onValueChange = { newQuery ->
+                    searchQuery = newQuery
+                    state.eventSink(RoomMemberListEvents.UpdateSearchQuery(newQuery))
+                },
+                modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp),
+                placeholder = stringResource(CommonStrings.common_search_for_someone),
+            )
+            RoomMemberList(
+                roomMembers = state.roomMembers,
+                selectedSection = state.selectedSection,
+                onSelectedSectionChange = { state.eventSink(RoomMemberListEvents.ChangeSelectedSection(it)) },
+                showSections = state.moderationState.canBan,
+                onSelectUser = ::onSelectUser,
             )
-
-            if (!state.isSearchActive) {
-                RoomMemberList(
-                    roomMembers = state.roomMembers,
-                    showMembersCount = true,
-                    canDisplayBannedUsersControls = state.moderationState.canBan,
-                    selectedSection = state.selectedSection,
-                    onSelectedSectionChange = { state.eventSink(RoomMemberListEvents.ChangeSelectedSection(it)) },
-                    onSelectUser = ::onSelectUser,
-                )
-            }
         }
     }
 }
@@ -124,25 +118,24 @@ fun RoomMemberListView(
 @Composable
 private fun RoomMemberList(
     roomMembers: AsyncData<RoomMembers>,
-    showMembersCount: Boolean,
     selectedSection: SelectedSection,
+    showSections: Boolean = true,
     onSelectedSectionChange: (SelectedSection) -> Unit,
-    canDisplayBannedUsersControls: Boolean,
     onSelectUser: (RoomMember) -> Unit,
 ) {
     LazyColumn(modifier = Modifier.fillMaxWidth(), state = rememberLazyListState()) {
         stickyHeader {
             Column {
-                if (canDisplayBannedUsersControls) {
+                if (showSections) {
                     val segmentedButtonTitles = persistentListOf(
                         stringResource(id = R.string.screen_room_member_list_mode_members),
                         stringResource(id = R.string.screen_room_member_list_mode_banned),
                     )
                     SingleChoiceSegmentedButtonRow(
                         modifier = Modifier
-                            .background(ElementTheme.colors.bgCanvasDefault)
-                            .fillMaxWidth()
-                            .padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
+                                .background(ElementTheme.colors.bgCanvasDefault)
+                                .fillMaxWidth()
+                                .padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
                     ) {
                         for ((index, title) in segmentedButtonTitles.withIndex()) {
                             SegmentedButton(
@@ -171,7 +164,6 @@ private fun RoomMemberList(
                 roomMembers = roomMembers.dataOrNull() ?: return@LazyColumn,
                 selectedSection = selectedSection,
                 onSelectUser = onSelectUser,
-                showMembersCount = showMembersCount,
             )
             AsyncData.Uninitialized -> Unit
         }
@@ -182,27 +174,29 @@ private fun LazyListScope.memberItems(
     roomMembers: RoomMembers,
     selectedSection: SelectedSection,
     onSelectUser: (RoomMember) -> Unit,
-    showMembersCount: Boolean,
 ) {
     when (selectedSection) {
         SelectedSection.MEMBERS -> {
             if (roomMembers.invited.isNotEmpty()) {
-                roomMemberListSection(
-                    headerText = { stringResource(id = R.string.screen_room_member_list_pending_header_title) },
+                roomMemberListSectionHeader(
+                    text = {
+                        val memberCount = roomMembers.invited.count()
+                        stringResource(id = R.string.screen_room_member_list_pending_header_title, memberCount)
+                    },
+                )
+                roomMemberListSectionItems(
                     members = roomMembers.invited,
                     onMemberSelected = { onSelectUser(it) }
                 )
             }
             if (roomMembers.joined.isNotEmpty()) {
-                roomMemberListSection(
-                    headerText = {
-                        if (showMembersCount) {
-                            val memberCount = roomMembers.joined.count()
-                            pluralStringResource(id = R.plurals.screen_room_member_list_header_title, count = memberCount, memberCount)
-                        } else {
-                            stringResource(id = R.string.screen_room_member_list_room_members_header_title)
-                        }
+                roomMemberListSectionHeader(
+                    text = {
+                        val memberCount = roomMembers.joined.count()
+                        pluralStringResource(id = R.plurals.screen_room_member_list_header_title, count = memberCount, memberCount)
                     },
+                )
+                roomMemberListSectionItems(
                     members = roomMembers.joined,
                     onMemberSelected = { onSelectUser(it) }
                 )
@@ -210,8 +204,14 @@ private fun LazyListScope.memberItems(
         }
         SelectedSection.BANNED -> { // Banned users
             if (roomMembers.banned.isNotEmpty()) {
-                roomMemberListSection(
-                    headerText = null,
+                roomMemberListSectionHeader(
+                    text = {
+                        val memberCount = roomMembers.banned.count()
+                        stringResource(id = R.string.screen_room_member_list_banned_header_title, memberCount)
+                    },
+                    isCritical = true,
+                )
+                roomMemberListSectionItems(
                     members = roomMembers.banned,
                     onMemberSelected = { onSelectUser(it) }
                 )
@@ -219,13 +219,13 @@ private fun LazyListScope.memberItems(
                 item {
                     Box(
                         Modifier
-                            .fillParentMaxSize()
-                            .padding(horizontal = 16.dp)
+                                .fillParentMaxSize()
+                                .padding(horizontal = 16.dp)
                     ) {
                         Text(
                             modifier = Modifier
-                                .padding(bottom = 56.dp)
-                                .align(Alignment.Center),
+                                    .padding(bottom = 56.dp)
+                                    .align(Alignment.Center),
                             text = stringResource(id = R.string.screen_room_member_list_banned_empty),
                             color = ElementTheme.colors.textSecondary,
                             textAlign = TextAlign.Center,
@@ -241,8 +241,8 @@ private fun LazyListScope.failureItem(failure: Throwable) {
     item {
         Text(
             modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 16.dp, vertical = 32.dp),
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp, vertical = 32.dp),
             text = stringResource(id = CommonStrings.error_unknown) + "\n\n" + failure.localizedMessage,
             color = ElementTheme.colors.textCriticalPrimary,
             textAlign = TextAlign.Center,
@@ -250,21 +250,25 @@ private fun LazyListScope.failureItem(failure: Throwable) {
     }
 }
 
-private fun LazyListScope.roomMemberListSection(
-    headerText: @Composable (() -> String)?,
+private fun LazyListScope.roomMemberListSectionHeader(
+    text: @Composable (() -> String),
+    modifier: Modifier = Modifier,
+    isCritical: Boolean = false,
+) {
+    item {
+        Text(
+            modifier = modifier.padding(horizontal = 16.dp, vertical = 12.dp),
+            text = text(),
+            style = ElementTheme.typography.fontBodyLgMedium,
+            color = if (isCritical) ElementTheme.colors.textCriticalPrimary else ElementTheme.colors.textPrimary,
+        )
+    }
+}
+
+private fun LazyListScope.roomMemberListSectionItems(
     members: ImmutableList<RoomMemberWithIdentityState>?,
     onMemberSelected: (RoomMember) -> Unit,
 ) {
-    headerText?.let {
-        item {
-            Text(
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
-                text = it(),
-                style = ElementTheme.typography.fontBodyLgRegular,
-                color = ElementTheme.colors.textSecondary,
-            )
-        }
-    }
     items(members.orEmpty()) { matrixUser ->
         RoomMemberListItem(
             modifier = Modifier.fillMaxWidth(),
@@ -353,44 +357,6 @@ private fun RoomMemberListTopBar(
     )
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-private fun RoomMemberSearchBar(
-    query: String,
-    state: SearchBarResultState<AsyncData<RoomMembers>>,
-    active: Boolean,
-    placeHolderTitle: String,
-    onActiveChange: (Boolean) -> Unit,
-    onTextChange: (String) -> Unit,
-    onSelectUser: (RoomMember) -> Unit,
-    selectedSection: SelectedSection,
-    modifier: Modifier = Modifier,
-) {
-    var queryFieldState by textFieldState(query)
-    SearchBar(
-        query = queryFieldState,
-        onQueryChange = { newQuery ->
-            queryFieldState = newQuery
-            onTextChange(newQuery)
-        },
-        active = active,
-        onActiveChange = onActiveChange,
-        modifier = modifier,
-        placeHolderTitle = placeHolderTitle,
-        resultState = state,
-        resultHandler = { results ->
-            RoomMemberList(
-                roomMembers = results,
-                showMembersCount = false,
-                onSelectUser = { onSelectUser(it) },
-                canDisplayBannedUsersControls = false,
-                selectedSection = selectedSection,
-                onSelectedSectionChange = {},
-            )
-        },
-    )
-}
-
 @PreviewsDayNight
 @Composable
 internal fun RoomMemberListViewPreview(@PreviewParameter(RoomMemberListStateProvider::class) state: RoomMemberListState) = ElementPreview {
diff --git a/features/roomdetails/impl/src/main/res/values/localazy.xml b/features/roomdetails/impl/src/main/res/values/localazy.xml
index 2f9f2de9b7..4d8e634e81 100644
--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@@ -71,9 +71,10 @@
   <string name="screen_room_details_topic_title">"Topic"</string>
   <string name="screen_room_details_updating_room">"Updating room…"</string>
   <string name="screen_room_member_list_banned_empty">"There are no banned users."</string>
+  <string name="screen_room_member_list_banned_header_title">"%1$d Banned"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d person"</item>
-    <item quantity="other">"%1$d people"</item>
+    <item quantity="one">"%1$d Person"</item>
+    <item quantity="other">"%1$d People"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Ban user"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Only remove member"</string>
@@ -82,7 +83,8 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Unban user"</string>
   <string name="screen_room_member_list_mode_banned">"Banned"</string>
   <string name="screen_room_member_list_mode_members">"Members"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pending"</string>
+  <string name="screen_room_member_list_pending_header_title">"%1$d Invited"</string>
+  <string name="screen_room_member_list_pending_status">"Pending"</string>
   <string name="screen_room_member_list_role_administrator">"Admin"</string>
   <string name="screen_room_member_list_role_moderator">"Moderator"</string>
   <string name="screen_room_member_list_role_owner">"Owner"</string>
diff --git a/tools/localazy/config.json b/tools/localazy/config.json
index 405451bb34..27ca1ecd12 100644
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@@ -198,6 +198,7 @@
         "screen_room_details_.*",
         "screen\\.room_details\\..*",
         "screen_room_member_list_.*",
+        "screen\\.room_member_list\\..*",
         "screen_room_notification_settings_.*",
         "screen_notification_settings_edit_failed_updating_default_mode",
         "screen_polls_history_title",

From fdfc5df365daa77ae6cbb8927eccf079dd8415d0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 08:59:17 +0100
Subject: [PATCH 038/113] fix(deps): update datastore to v1.2.0 (#5789)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3a5ac4046d..593aaa2d70 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ firebaseAppDistribution = "5.2.0"
 
 # AndroidX
 core = "1.17.0"
-datastore = "1.1.7"
+datastore = "1.2.0"
 constraintlayout = "2.2.1"
 constraintlayout_compose = "1.1.1"
 lifecycle = "2.9.2"

From 3411420efa2d8574d3bf3a3085ec455a00480232 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 10:13:34 +0100
Subject: [PATCH 039/113] chore(deps): update peter-evans/create-pull-request
 action to v7.0.9 (#5793)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/sync-localazy.yml    | 2 +-
 .github/workflows/sync-sas-strings.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync-localazy.yml b/.github/workflows/sync-localazy.yml
index 1f22bf2868..404af92f30 100644
--- a/.github/workflows/sync-localazy.yml
+++ b/.github/workflows/sync-localazy.yml
@@ -36,7 +36,7 @@ jobs:
           ./tools/localazy/importSupportedLocalesFromLocalazy.py
           ./tools/test/generateAllScreenshots.py
       - name: Create Pull Request for Strings
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9
         with:
           token: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
           commit-message: Sync Strings from Localazy
diff --git a/.github/workflows/sync-sas-strings.yml b/.github/workflows/sync-sas-strings.yml
index a73592466e..e461845c9c 100644
--- a/.github/workflows/sync-sas-strings.yml
+++ b/.github/workflows/sync-sas-strings.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Run SAS String script
         run: ./tools/sas/import_sas_strings.py
       - name: Create Pull Request for SAS Strings
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9
         with:
           commit-message: Sync SAS Strings
           title: Sync SAS Strings

From 8b7355705adcd41628542f7ff14d72e4c80734b8 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 24 Nov 2025 10:42:03 +0100
Subject: [PATCH 040/113] change(members): new empty state for search and hide
 banned tabs when there is none.

---
 .../impl/members/RoomMemberListPresenter.kt   | 18 ++--
 .../impl/members/RoomMemberListState.kt       | 17 +++-
 .../members/RoomMemberListStateProvider.kt    |  1 +
 .../impl/members/RoomMemberListView.kt        | 99 ++++++++++---------
 .../impl/src/main/res/values/localazy.xml     |  2 +
 5 files changed, 79 insertions(+), 58 deletions(-)

diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
index 44e0aa168f..3d59b3d922 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -49,7 +49,6 @@ import kotlinx.coroutines.withContext
 @Inject
 class RoomMemberListPresenter(
     private val room: JoinedRoom,
-    private val roomMemberListDataSource: RoomMemberListDataSource,
     private val coroutineDispatchers: CoroutineDispatchers,
     private val roomMembersModerationPresenter: Presenter<RoomMemberModerationState>,
     private val encryptionService: EncryptionService,
@@ -141,20 +140,21 @@ class RoomMemberListPresenter(
             }
         }
 
-        if (!roomModerationState.canBan && selectedSection == SelectedSection.BANNED) {
-            SideEffect {
-                selectedSection = SelectedSection.MEMBERS
-            }
-        }
-
-        return RoomMemberListState(
-            roomMembers = filteredRoomMembers,
+        val state = RoomMemberListState(
+            roomMembers = roomMembers,
+            filteredRoomMembers = filteredRoomMembers,
             searchQuery = searchQuery,
             canInvite = canInvite,
             moderationState = roomModerationState,
             selectedSection = selectedSection,
             eventSink = ::handleEvent,
         )
+        if (!state.showBannedSection && selectedSection == SelectedSection.BANNED) {
+            SideEffect {
+                selectedSection = SelectedSection.MEMBERS
+            }
+        }
+        return state
     }
 
     private suspend fun RoomMember.withIdentityState(identityStates: ImmutableMap<UserId, IdentityState>): RoomMemberWithIdentityState {
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
index b59f67a915..007d276dd3 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
@@ -17,13 +17,17 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
 data class RoomMemberListState(
-    val roomMembers: AsyncData<RoomMembers>,
+    // Only used to know if we can show the banned section
+    private val roomMembers: AsyncData<RoomMembers>,
+    val filteredRoomMembers: AsyncData<RoomMembers>,
     val searchQuery: String,
     val canInvite: Boolean,
     val selectedSection: SelectedSection,
     val moderationState: RoomMemberModerationState,
     val eventSink: (RoomMemberListEvents) -> Unit,
-)
+) {
+    val showBannedSection: Boolean = moderationState.canBan && roomMembers.dataOrNull()?.banned?.isNotEmpty() == true
+}
 
 enum class SelectedSection {
     MEMBERS,
@@ -34,7 +38,14 @@ data class RoomMembers(
     val invited: ImmutableList<RoomMemberWithIdentityState>,
     val joined: ImmutableList<RoomMemberWithIdentityState>,
     val banned: ImmutableList<RoomMemberWithIdentityState>,
-){
+) {
+    fun isEmpty(section: SelectedSection): Boolean {
+        return when (section) {
+            SelectedSection.MEMBERS -> invited.isEmpty() && joined.isEmpty()
+            SelectedSection.BANNED -> banned.isEmpty()
+        }
+    }
+
     fun filter(query: String): RoomMembers {
         if (query.isBlank()) {
             return this
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
index dafe2546d5..b03faa97cb 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
@@ -132,6 +132,7 @@ internal fun aRoomMemberListState(
     selectedSection: SelectedSection = SelectedSection.MEMBERS,
 ) = RoomMemberListState(
     roomMembers = roomMembers,
+    filteredRoomMembers = roomMembers,
     searchQuery = "",
     canInvite = false,
     moderationState = moderationState,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
index 74d3305ff5..41db02ee9d 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
@@ -9,14 +9,15 @@
 package io.element.android.features.roomdetails.impl.members
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandHorizontally
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkHorizontally
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.consumeWindowInsets
@@ -43,6 +44,8 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.roomdetails.impl.R
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
+import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.form.textFieldState
@@ -87,9 +90,9 @@ fun RoomMemberListView(
     ) { padding ->
         Column(
             modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(padding)
-                    .consumeWindowInsets(padding),
+                .fillMaxWidth()
+                .padding(padding)
+                .consumeWindowInsets(padding),
             verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
             var searchQuery by textFieldState(state.searchQuery)
@@ -100,15 +103,16 @@ fun RoomMemberListView(
                     state.eventSink(RoomMemberListEvents.UpdateSearchQuery(newQuery))
                 },
                 modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp),
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp),
                 placeholder = stringResource(CommonStrings.common_search_for_someone),
             )
             RoomMemberList(
-                roomMembers = state.roomMembers,
+                roomMembersData = state.filteredRoomMembers,
                 selectedSection = state.selectedSection,
+                showBannedSection = state.showBannedSection,
+                searchQuery = state.searchQuery,
                 onSelectedSectionChange = { state.eventSink(RoomMemberListEvents.ChangeSelectedSection(it)) },
-                showSections = state.moderationState.canBan,
                 onSelectUser = ::onSelectUser,
             )
         }
@@ -117,25 +121,26 @@ fun RoomMemberListView(
 
 @Composable
 private fun RoomMemberList(
-    roomMembers: AsyncData<RoomMembers>,
+    roomMembersData: AsyncData<RoomMembers>,
     selectedSection: SelectedSection,
-    showSections: Boolean = true,
+    showBannedSection: Boolean,
+    searchQuery: String,
     onSelectedSectionChange: (SelectedSection) -> Unit,
     onSelectUser: (RoomMember) -> Unit,
 ) {
     LazyColumn(modifier = Modifier.fillMaxWidth(), state = rememberLazyListState()) {
         stickyHeader {
             Column {
-                if (showSections) {
+                AnimatedVisibility(visible = showBannedSection) {
                     val segmentedButtonTitles = persistentListOf(
                         stringResource(id = R.string.screen_room_member_list_mode_members),
                         stringResource(id = R.string.screen_room_member_list_mode_banned),
                     )
                     SingleChoiceSegmentedButtonRow(
                         modifier = Modifier
-                                .background(ElementTheme.colors.bgCanvasDefault)
-                                .fillMaxWidth()
-                                .padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
+                            .background(ElementTheme.colors.bgCanvasDefault)
+                            .fillMaxWidth()
+                            .padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
                     ) {
                         for ((index, title) in segmentedButtonTitles.withIndex()) {
                             SegmentedButton(
@@ -148,23 +153,26 @@ private fun RoomMemberList(
                         }
                     }
                 }
-                AnimatedVisibility(
-                    visible = roomMembers.isLoading(),
-                    enter = fadeIn() + expandVertically(),
-                    exit = fadeOut() + shrinkVertically(),
-                ) {
+                AnimatedVisibility(visible = roomMembersData.isLoading()) {
                     LinearProgressIndicator(modifier = Modifier.fillMaxWidth())
                 }
             }
         }
-        when (roomMembers) {
-            is AsyncData.Failure -> failureItem(roomMembers.error)
+        when (roomMembersData) {
+            is AsyncData.Failure -> failureItem(roomMembersData.error)
             is AsyncData.Loading,
-            is AsyncData.Success -> memberItems(
-                roomMembers = roomMembers.dataOrNull() ?: return@LazyColumn,
-                selectedSection = selectedSection,
-                onSelectUser = onSelectUser,
-            )
+            is AsyncData.Success -> {
+                val roomMembers = roomMembersData.dataOrNull() ?: return@LazyColumn
+                if (roomMembers.isEmpty(selectedSection)) {
+                    emptySearchItem(searchQuery)
+                } else {
+                    memberItems(
+                        roomMembers = roomMembers,
+                        selectedSection = selectedSection,
+                        onSelectUser = onSelectUser,
+                    )
+                }
+            }
             AsyncData.Uninitialized -> Unit
         }
     }
@@ -202,7 +210,7 @@ private fun LazyListScope.memberItems(
                 )
             }
         }
-        SelectedSection.BANNED -> { // Banned users
+        SelectedSection.BANNED -> {
             if (roomMembers.banned.isNotEmpty()) {
                 roomMemberListSectionHeader(
                     text = {
@@ -215,23 +223,6 @@ private fun LazyListScope.memberItems(
                     members = roomMembers.banned,
                     onMemberSelected = { onSelectUser(it) }
                 )
-            } else {
-                item {
-                    Box(
-                        Modifier
-                                .fillParentMaxSize()
-                                .padding(horizontal = 16.dp)
-                    ) {
-                        Text(
-                            modifier = Modifier
-                                    .padding(bottom = 56.dp)
-                                    .align(Alignment.Center),
-                            text = stringResource(id = R.string.screen_room_member_list_banned_empty),
-                            color = ElementTheme.colors.textSecondary,
-                            textAlign = TextAlign.Center,
-                        )
-                    }
-                }
             }
         }
     }
@@ -241,8 +232,8 @@ private fun LazyListScope.failureItem(failure: Throwable) {
     item {
         Text(
             modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp, vertical = 32.dp),
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 32.dp),
             text = stringResource(id = CommonStrings.error_unknown) + "\n\n" + failure.localizedMessage,
             color = ElementTheme.colors.textCriticalPrimary,
             textAlign = TextAlign.Center,
@@ -278,6 +269,22 @@ private fun LazyListScope.roomMemberListSectionItems(
     }
 }
 
+private fun LazyListScope.emptySearchItem(searchQuery: String) {
+    item {
+        IconTitleSubtitleMolecule(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 32.dp),
+            iconStyle = BigIcon.Style.Default(
+                vectorIcon = CompoundIcons.Search(),
+                contentDescription = null,
+            ),
+            title = stringResource(R.string.screen_room_member_list_empty_search_title, searchQuery),
+            subTitle = stringResource(R.string.screen_room_member_list_empty_search_subtitle),
+        )
+    }
+}
+
 @Composable
 private fun RoomMemberListItem(
     roomMemberWithIdentity: RoomMemberWithIdentityState,
diff --git a/features/roomdetails/impl/src/main/res/values/localazy.xml b/features/roomdetails/impl/src/main/res/values/localazy.xml
index 4d8e634e81..a88f910de9 100644
--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@@ -72,6 +72,8 @@
   <string name="screen_room_details_updating_room">"Updating room…"</string>
   <string name="screen_room_member_list_banned_empty">"There are no banned users."</string>
   <string name="screen_room_member_list_banned_header_title">"%1$d Banned"</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"Check the spelling or try a new search"</string>
+  <string name="screen_room_member_list_empty_search_title">"No results for “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d Person"</item>
     <item quantity="other">"%1$d People"</item>

From 444a61f88986cb3200f6521518bd634359e5151a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 15:12:57 +0100
Subject: [PATCH 041/113] fix(deps): update dependency
 io.nlopez.compose.rules:detekt to v0.4.28 (#5795)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ef12d98fd3..19aaf78405 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -46,7 +46,7 @@ allprojects {
         config.from(files("$rootDir/tools/detekt/detekt.yml"))
     }
     dependencies {
-        detektPlugins("io.nlopez.compose.rules:detekt:0.4.27")
+        detektPlugins("io.nlopez.compose.rules:detekt:0.4.28")
         detektPlugins(project(":tests:detekt-rules"))
     }
 

From 8a4bdfa1fdf4af4bfd2c341fe2508b3eaeee6f2f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 14:15:59 +0000
Subject: [PATCH 042/113] fix(deps): update dependency
 org.matrix.rustcomponents:sdk-android to v25.11.24

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 593aaa2d70..6986e3577e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -178,7 +178,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
 # https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
 # All new features should not be implemented in the pull request that upgrades the version, developers should
 # only fix API breaks and may add some TODOs.
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.11.19"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.11.24"
 
 # Others
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }

From eff221645e984373487b6c26145336813e5764e8 Mon Sep 17 00:00:00 2001
From: ElementBot <110224175+ElementBot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 17:28:49 +0100
Subject: [PATCH 043/113] Sync Strings (#5792)

* Sync Strings from Localazy

* Update localazy config and sync strings.

* Use the new localazy key.

* Sync strings again

* Sync strings again and fix compilation issue.

* Update screenshots

---------

Co-authored-by: bmarty <3940906+bmarty@users.noreply.github.com>
Co-authored-by: Benoit Marty <benoit@matrix.org>
---
 .../src/main/res/values-bg/translations.xml   |    4 +
 .../impl/roles/ChangeRolesView.kt             |    2 +-
 .../src/main/res/values-be/translations.xml   |    1 -
 .../src/main/res/values-bg/translations.xml   |    1 +
 .../src/main/res/values-cs/translations.xml   |    1 -
 .../src/main/res/values-cy/translations.xml   |    1 -
 .../src/main/res/values-da/translations.xml   |    1 -
 .../src/main/res/values-de/translations.xml   |    1 -
 .../src/main/res/values-el/translations.xml   |    1 -
 .../src/main/res/values-es/translations.xml   |    1 -
 .../src/main/res/values-et/translations.xml   |    4 +-
 .../src/main/res/values-eu/translations.xml   |    1 -
 .../src/main/res/values-fa/translations.xml   |    1 -
 .../src/main/res/values-fi/translations.xml   |    1 -
 .../src/main/res/values-fr/translations.xml   |    1 -
 .../src/main/res/values-hu/translations.xml   |    2 +-
 .../src/main/res/values-in/translations.xml   |    1 -
 .../src/main/res/values-it/translations.xml   |    1 -
 .../src/main/res/values-ka/translations.xml   |    1 -
 .../src/main/res/values-ko/translations.xml   |    1 -
 .../src/main/res/values-lt/translations.xml   |    1 -
 .../src/main/res/values-nb/translations.xml   |    1 -
 .../src/main/res/values-nl/translations.xml   |    1 -
 .../src/main/res/values-pl/translations.xml   |    1 -
 .../main/res/values-pt-rBR/translations.xml   |    1 -
 .../src/main/res/values-pt/translations.xml   |    1 -
 .../src/main/res/values-ro/translations.xml   |    1 -
 .../src/main/res/values-ru/translations.xml   |    4 +-
 .../src/main/res/values-sk/translations.xml   |    1 -
 .../src/main/res/values-sv/translations.xml   |    1 -
 .../src/main/res/values-tr/translations.xml   |    1 -
 .../src/main/res/values-uk/translations.xml   |    1 -
 .../src/main/res/values-ur/translations.xml   |    1 -
 .../src/main/res/values-uz/translations.xml   |    1 -
 .../main/res/values-zh-rTW/translations.xml   |   26 +-
 .../src/main/res/values-zh/translations.xml   |    1 -
 .../impl/src/main/res/values/localazy.xml     |   16 +-
 .../impl/members/RoomMemberListView.kt        |    6 +-
 .../src/main/res/values-be/translations.xml   |    1 -
 .../src/main/res/values-cs/translations.xml   |    2 -
 .../src/main/res/values-cy/translations.xml   |    2 -
 .../src/main/res/values-da/translations.xml   |    2 -
 .../src/main/res/values-de/translations.xml   |    2 -
 .../src/main/res/values-el/translations.xml   |    2 -
 .../src/main/res/values-es/translations.xml   |    2 -
 .../src/main/res/values-et/translations.xml   |   15 +-
 .../src/main/res/values-eu/translations.xml   |    1 -
 .../src/main/res/values-fa/translations.xml   |    1 -
 .../src/main/res/values-fi/translations.xml   |    2 -
 .../src/main/res/values-fr/translations.xml   |    2 -
 .../src/main/res/values-hu/translations.xml   |   13 +-
 .../src/main/res/values-in/translations.xml   |    2 -
 .../src/main/res/values-it/translations.xml   |    2 -
 .../src/main/res/values-ka/translations.xml   |    1 -
 .../src/main/res/values-ko/translations.xml   |    2 -
 .../src/main/res/values-lt/translations.xml   |    1 -
 .../src/main/res/values-nb/translations.xml   |    2 -
 .../src/main/res/values-nl/translations.xml   |    1 -
 .../src/main/res/values-pl/translations.xml   |    1 -
 .../main/res/values-pt-rBR/translations.xml   |    2 -
 .../src/main/res/values-pt/translations.xml   |    2 -
 .../src/main/res/values-ro/translations.xml   |    2 -
 .../src/main/res/values-ru/translations.xml   |   13 +-
 .../src/main/res/values-sk/translations.xml   |    2 -
 .../src/main/res/values-sv/translations.xml   |    2 -
 .../src/main/res/values-tr/translations.xml   |    2 -
 .../src/main/res/values-uk/translations.xml   |    2 -
 .../src/main/res/values-ur/translations.xml   |    1 -
 .../src/main/res/values-uz/translations.xml   |    1 -
 .../main/res/values-zh-rTW/translations.xml   |   53 +-
 .../src/main/res/values-zh/translations.xml   |    2 -
 .../impl/src/main/res/values/localazy.xml     |   18 +-
 .../main/res/values-zh-rTW/translations.xml   |    4 +-
 .../main/res/values-zh-rTW/translations.xml   |    2 +-
 .../src/main/res/values-bg/translations.xml   |    7 +
 .../main/res/values-zh-rTW/translations.xml   |    1 +
 .../src/main/res/values-bg/translations.xml   |   15 +
 .../main/res/values-zh-rTW/translations.xml   |    5 +
 ...s.impl.roles_ChangeRolesView_Day_13_de.png |    3 +
 screenshots/html/data.js                      | 1855 +++++++++--------
 ...pl.members_RoomMemberListView_Day_0_en.png |    4 +-
 ...pl.members_RoomMemberListView_Day_1_en.png |    4 +-
 ...pl.members_RoomMemberListView_Day_7_en.png |    4 +-
 ....members_RoomMemberListView_Night_0_en.png |    4 +-
 ....members_RoomMemberListView_Night_1_en.png |    4 +-
 ....members_RoomMemberListView_Night_7_en.png |    4 +-
 ...rivacy_SecurityAndPrivacyViewDark_1_en.png |    4 +-
 ...rivacy_SecurityAndPrivacyViewDark_2_en.png |    4 +-
 ...rivacy_SecurityAndPrivacyViewDark_3_en.png |    4 +-
 ...rivacy_SecurityAndPrivacyViewDark_4_en.png |    4 +-
 ...rivacy_SecurityAndPrivacyViewDark_9_en.png |    4 +-
 ...ivacy_SecurityAndPrivacyViewLight_1_en.png |    4 +-
 ...ivacy_SecurityAndPrivacyViewLight_2_en.png |    4 +-
 ...ivacy_SecurityAndPrivacyViewLight_3_en.png |    4 +-
 ...ivacy_SecurityAndPrivacyViewLight_4_en.png |    4 +-
 ...ivacy_SecurityAndPrivacyViewLight_9_en.png |    4 +-
 tools/localazy/config.json                    |    4 +-
 97 files changed, 1109 insertions(+), 1106 deletions(-)
 create mode 100644 features/announcement/impl/src/main/res/values-bg/translations.xml
 create mode 100644 screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_de.png

diff --git a/features/announcement/impl/src/main/res/values-bg/translations.xml b/features/announcement/impl/src/main/res/values-bg/translations.xml
new file mode 100644
index 0000000000..853cf5f027
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-bg/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_space_announcement_item4">"Присъединете се към обществени пространства"</string>
+</resources>
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
index 76cb334037..bd9969dec4 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
@@ -383,7 +383,7 @@ private fun MemberRow(
                 if (isPending) {
                     Text(
                         modifier = Modifier.padding(start = 8.dp),
-                        text = stringResource(id = R.string.screen_room_member_list_pending_header_title),
+                        text = stringResource(id = R.string.screen_room_member_list_pending_status),
                         style = ElementTheme.typography.fontBodySmRegular.copy(fontStyle = FontStyle.Italic),
                         color = ElementTheme.colors.textSecondary
                     )
diff --git a/features/rolesandpermissions/impl/src/main/res/values-be/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-be/translations.xml
index 7b11b6ee44..44841d1207 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-be/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-be/translations.xml
@@ -39,7 +39,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"Яны змогуць зноў далучыцца да гэтага пакоя, калі іх запросяць."</string>
   <string name="screen_room_member_list_mode_banned">"Заблакіраваныя"</string>
   <string name="screen_room_member_list_mode_members">"Удзельнікі"</string>
-  <string name="screen_room_member_list_pending_header_title">"У чаканні"</string>
   <string name="screen_room_member_list_role_administrator">"Толькі адміністратары"</string>
   <string name="screen_room_member_list_role_moderator">"Адміністратары і мадэратары"</string>
   <string name="screen_room_member_list_room_members_header_title">"Удзельнікі пакоя"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-bg/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-bg/translations.xml
index 4f135baa44..b1ca5f9718 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-bg/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-bg/translations.xml
@@ -33,5 +33,6 @@
   <string name="screen_room_roles_and_permissions_reset">"Нулиране на разрешенията"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Роли"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Подробности за стаята"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"Подробности за пространството"</string>
   <string name="screen_room_roles_and_permissions_title">"Роли и разрешения"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
index 829c6f31e2..67e65142d8 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
@@ -44,7 +44,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Zrušit vykázání z místnosti"</string>
   <string name="screen_room_member_list_mode_banned">"Vykázaní"</string>
   <string name="screen_room_member_list_mode_members">"Členové"</string>
-  <string name="screen_room_member_list_pending_header_title">"Nevyřízeno"</string>
   <string name="screen_room_member_list_role_administrator">"Pouze správci"</string>
   <string name="screen_room_member_list_role_moderator">"Správci a moderátoři"</string>
   <string name="screen_room_member_list_role_owner">"Vlastník"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-cy/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-cy/translations.xml
index 760586331c..f75f908d43 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-cy/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-cy/translations.xml
@@ -49,7 +49,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Dad-wahardd o\'r ystafell"</string>
   <string name="screen_room_member_list_mode_banned">"Wedi\'i wahardd"</string>
   <string name="screen_room_member_list_mode_members">"Aelodau"</string>
-  <string name="screen_room_member_list_pending_header_title">"Dan ystyriaeth"</string>
   <string name="screen_room_member_list_role_administrator">"Gweinyddwyr yn unig"</string>
   <string name="screen_room_member_list_role_moderator">"Gweinyddwyr a chymedrolwyr"</string>
   <string name="screen_room_member_list_role_owner">"Perchennog"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-da/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-da/translations.xml
index 449fd4523f..4a0b5d179d 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-da/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-da/translations.xml
@@ -43,7 +43,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Fjern brugerens spærring fra rummet"</string>
   <string name="screen_room_member_list_mode_banned">"Spærret"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmer"</string>
-  <string name="screen_room_member_list_pending_header_title">"Afventer"</string>
   <string name="screen_room_member_list_role_administrator">"Kun admins"</string>
   <string name="screen_room_member_list_role_moderator">"Admins og moderatorer"</string>
   <string name="screen_room_member_list_role_owner">"Ejeren"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-de/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-de/translations.xml
index 0630721472..2767781d2b 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-de/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-de/translations.xml
@@ -43,7 +43,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Sperre für diesen Chat aufheben"</string>
   <string name="screen_room_member_list_mode_banned">"Gesperrt"</string>
   <string name="screen_room_member_list_mode_members">"Mitglieder"</string>
-  <string name="screen_room_member_list_pending_header_title">"Ausstehend"</string>
   <string name="screen_room_member_list_role_administrator">"Nur Admins"</string>
   <string name="screen_room_member_list_role_moderator">"Admins und Moderatoren"</string>
   <string name="screen_room_member_list_role_owner">"Eigentümer"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-el/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-el/translations.xml
index fd7ddaa60e..8cd14feb47 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-el/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-el/translations.xml
@@ -39,7 +39,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Άρση αποκλεισμού από την αίθουσα"</string>
   <string name="screen_room_member_list_mode_banned">"Αποκλεισμένοι"</string>
   <string name="screen_room_member_list_mode_members">"Μέλη"</string>
-  <string name="screen_room_member_list_pending_header_title">"Σε αναμονή"</string>
   <string name="screen_room_member_list_role_administrator">"Μόνο διαχειριστές"</string>
   <string name="screen_room_member_list_role_moderator">"Διαχειριστές και συντονιστές"</string>
   <string name="screen_room_member_list_room_members_header_title">"Μέλη της αίθουσας"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-es/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-es/translations.xml
index b981a18c73..383ffba1eb 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-es/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-es/translations.xml
@@ -39,7 +39,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Eliminar veto en la sala"</string>
   <string name="screen_room_member_list_mode_banned">"Vetados"</string>
   <string name="screen_room_member_list_mode_members">"Miembros"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendiente"</string>
   <string name="screen_room_member_list_role_administrator">"Solo administradores"</string>
   <string name="screen_room_member_list_role_moderator">"Administradores y moderadores"</string>
   <string name="screen_room_member_list_room_members_header_title">"Miembros de la sala"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-et/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-et/translations.xml
index 5bd0c3eb36..7924e7ce7b 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-et/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-et/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_room_change_role_unsaved_changes_description">"Sul on salvestamata muudatusi"</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Kas salvestame muudatused?"</string>
   <string name="screen_room_member_list_banned_empty">"Suhtluskeeluga kasutajaid pole"</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"Palun kontrolli otsingusõna korrektsust ja proovi siis uuesti"</string>
+  <string name="screen_room_member_list_empty_search_title">"Otsingul „%1$s“ pole tulemusi"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d osaleja"</item>
     <item quantity="other">"%1$d osalejat"</item>
@@ -45,7 +47,7 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Eemalda suhtluskeeld jututoas"</string>
   <string name="screen_room_member_list_mode_banned">"Suhtluskeeluga kasutajad"</string>
   <string name="screen_room_member_list_mode_members">"Liikmed"</string>
-  <string name="screen_room_member_list_pending_header_title">"Ootel"</string>
+  <string name="screen_room_member_list_pending_status">"Ootel"</string>
   <string name="screen_room_member_list_role_administrator">"Peakasutajad"</string>
   <string name="screen_room_member_list_role_moderator">"Moderaatorid"</string>
   <string name="screen_room_member_list_role_owner">"Omanik"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-eu/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-eu/translations.xml
index a1f084a44a..03766f73f2 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-eu/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-eu/translations.xml
@@ -38,7 +38,6 @@
   <string name="screen_room_member_list_manage_member_unban_action">"Kendu debekua"</string>
   <string name="screen_room_member_list_mode_banned">"Debekatuta"</string>
   <string name="screen_room_member_list_mode_members">"Kideak"</string>
-  <string name="screen_room_member_list_pending_header_title">"Zain"</string>
   <string name="screen_room_member_list_role_administrator">"Administratzaileak soilik"</string>
   <string name="screen_room_member_list_role_moderator">"Administratzaileak eta moderatzaileak"</string>
   <string name="screen_room_member_list_role_owner">"Jabea"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
index 43ee4b03ca..996b50bf62 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
@@ -40,7 +40,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"تحریم نکردن از اتاق"</string>
   <string name="screen_room_member_list_mode_banned">"محروم"</string>
   <string name="screen_room_member_list_mode_members">"اعضا"</string>
-  <string name="screen_room_member_list_pending_header_title">"منتظر"</string>
   <string name="screen_room_member_list_role_administrator">"فقط مدیران"</string>
   <string name="screen_room_member_list_role_moderator">"مدیرن و ناظران"</string>
   <string name="screen_room_member_list_role_owner">"مالک"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
index e86182c483..658828ae41 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
@@ -43,7 +43,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Poista porttikielto huoneesta"</string>
   <string name="screen_room_member_list_mode_banned">"Porttikiellot"</string>
   <string name="screen_room_member_list_mode_members">"Jäsenet"</string>
-  <string name="screen_room_member_list_pending_header_title">"Kutsuttu"</string>
   <string name="screen_room_member_list_role_administrator">"Vain ylläpitäjät"</string>
   <string name="screen_room_member_list_role_moderator">"Ylläpitäjät ja valvojat"</string>
   <string name="screen_room_member_list_role_owner">"Omistaja"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
index b3258ef02d..36add59a2d 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
@@ -45,7 +45,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Débannir du salon"</string>
   <string name="screen_room_member_list_mode_banned">"Bannis"</string>
   <string name="screen_room_member_list_mode_members">"Membres"</string>
-  <string name="screen_room_member_list_pending_header_title">"En attente"</string>
   <string name="screen_room_member_list_role_administrator">"Administrateurs"</string>
   <string name="screen_room_member_list_role_moderator">"Modérateurs"</string>
   <string name="screen_room_member_list_role_owner">"Propriétaire"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-hu/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-hu/translations.xml
index 72ab09db6a..77e6e3b389 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-hu/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-hu/translations.xml
@@ -45,7 +45,7 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Visszaengedés a szobába"</string>
   <string name="screen_room_member_list_mode_banned">"Kitiltva"</string>
   <string name="screen_room_member_list_mode_members">"Tagok"</string>
-  <string name="screen_room_member_list_pending_header_title">"Függőben"</string>
+  <string name="screen_room_member_list_pending_status">"Függőben"</string>
   <string name="screen_room_member_list_role_administrator">"Adminisztrátor"</string>
   <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_role_owner">"Tulajdonos"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-in/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-in/translations.xml
index 46913b323d..2a1cd15ac0 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-in/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-in/translations.xml
@@ -38,7 +38,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Batalkan cekalan dari ruangan"</string>
   <string name="screen_room_member_list_mode_banned">"Tercekal"</string>
   <string name="screen_room_member_list_mode_members">"Anggota"</string>
-  <string name="screen_room_member_list_pending_header_title">"Tertunda"</string>
   <string name="screen_room_member_list_role_administrator">"Hanya admin"</string>
   <string name="screen_room_member_list_role_moderator">"Admin dan moderator"</string>
   <string name="screen_room_member_list_room_members_header_title">"Anggota ruangan"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
index f5799aceab..6b11b7946b 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
@@ -43,7 +43,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Riammetti nella stanza"</string>
   <string name="screen_room_member_list_mode_banned">"Esclusi"</string>
   <string name="screen_room_member_list_mode_members">"Membri"</string>
-  <string name="screen_room_member_list_pending_header_title">"In attesa"</string>
   <string name="screen_room_member_list_role_administrator">"Solo amministratori"</string>
   <string name="screen_room_member_list_role_moderator">"Amministratori e moderatori"</string>
   <string name="screen_room_member_list_role_owner">"Proprietario"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-ka/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ka/translations.xml
index bdb3a70069..8af9ecbe99 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-ka/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ka/translations.xml
@@ -37,7 +37,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"მოწვევის შემთხვევაში განბლოკილი მომხმარებელი ისევ შეძლებს ოთახს შეუერთდეს."</string>
   <string name="screen_room_member_list_mode_banned">"დაბლოკილები"</string>
   <string name="screen_room_member_list_mode_members">"წევრები"</string>
-  <string name="screen_room_member_list_pending_header_title">"მომლოდინე"</string>
   <string name="screen_room_member_list_role_administrator">"მხოლოდ ადმინისტრატორები"</string>
   <string name="screen_room_member_list_role_moderator">"ადმინისტრატორები და მოდერატორები"</string>
   <string name="screen_room_member_list_room_members_header_title">"ოთახის წევრები"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml
index 86b3f828f5..89b3e0baf5 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml
@@ -42,7 +42,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"방에서 차단 해제"</string>
   <string name="screen_room_member_list_mode_banned">"차단됨"</string>
   <string name="screen_room_member_list_mode_members">"회원들"</string>
-  <string name="screen_room_member_list_pending_header_title">"보류 중"</string>
   <string name="screen_room_member_list_role_administrator">"관리자 전용"</string>
   <string name="screen_room_member_list_role_moderator">"관리자 및 중재자"</string>
   <string name="screen_room_member_list_role_owner">"소유자"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-lt/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-lt/translations.xml
index 0ebff0f6b0..b82e8822f5 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-lt/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-lt/translations.xml
@@ -6,6 +6,5 @@
     <item quantity="few">"%1$d asmenys"</item>
     <item quantity="other">"%1$d asmenų"</item>
   </plurals>
-  <string name="screen_room_member_list_pending_header_title">"Laukiama"</string>
   <string name="screen_room_member_list_room_members_header_title">"Kambario nariai"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-nb/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-nb/translations.xml
index 045f2e2327..65664c187a 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-nb/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-nb/translations.xml
@@ -43,7 +43,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Fjern utestengelsen fra rommet"</string>
   <string name="screen_room_member_list_mode_banned">"Utestengt"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmer"</string>
-  <string name="screen_room_member_list_pending_header_title">"Venter"</string>
   <string name="screen_room_member_list_role_administrator">"Kun for administratorer"</string>
   <string name="screen_room_member_list_role_moderator">"Administratorer og moderatorer"</string>
   <string name="screen_room_member_list_role_owner">"Eier"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-nl/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-nl/translations.xml
index 2d5e8e4a01..2973341189 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-nl/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-nl/translations.xml
@@ -38,7 +38,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"Ze kunnen opnieuw tot de kamer toetreden als ze worden uitgenodigd."</string>
   <string name="screen_room_member_list_mode_banned">"Verbannen"</string>
   <string name="screen_room_member_list_mode_members">"Leden"</string>
-  <string name="screen_room_member_list_pending_header_title">"In behandeling"</string>
   <string name="screen_room_member_list_role_administrator">"Alleen beheerders"</string>
   <string name="screen_room_member_list_role_moderator">"Beheerders en moderators"</string>
   <string name="screen_room_member_list_room_members_header_title">"Kamerleden"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml
index a8722a7f77..44659c47cd 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml
@@ -44,7 +44,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Odbanuj z pokoju"</string>
   <string name="screen_room_member_list_mode_banned">"Zbanowanych"</string>
   <string name="screen_room_member_list_mode_members">"Członków"</string>
-  <string name="screen_room_member_list_pending_header_title">"Oczekujące"</string>
   <string name="screen_room_member_list_role_administrator">"Tylko administratorzy"</string>
   <string name="screen_room_member_list_role_moderator">"Administratorzy i moderatorzy"</string>
   <string name="screen_room_member_list_role_owner">"Właściciel"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-pt-rBR/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-pt-rBR/translations.xml
index cabe3e486e..ec2e5bc558 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-pt-rBR/translations.xml
@@ -43,7 +43,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Desbanir da sala"</string>
   <string name="screen_room_member_list_mode_banned">"Banidos"</string>
   <string name="screen_room_member_list_mode_members">"Membros"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendente"</string>
   <string name="screen_room_member_list_role_administrator">"Somente administradores"</string>
   <string name="screen_room_member_list_role_moderator">"Administradores e moderadores"</string>
   <string name="screen_room_member_list_role_owner">"Proprietário"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-pt/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-pt/translations.xml
index c9ed317736..32db66ee12 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-pt/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-pt/translations.xml
@@ -43,7 +43,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Desbanir da sala"</string>
   <string name="screen_room_member_list_mode_banned">"Banidos"</string>
   <string name="screen_room_member_list_mode_members">"Participantes"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendente"</string>
   <string name="screen_room_member_list_role_administrator">"Apenas administradores"</string>
   <string name="screen_room_member_list_role_moderator">"Administradores e moderadores"</string>
   <string name="screen_room_member_list_role_owner">"Dono / Dona"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-ro/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ro/translations.xml
index 5d0c164ea5..c2b248f264 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-ro/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ro/translations.xml
@@ -43,7 +43,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Revocati excluderea din camera"</string>
   <string name="screen_room_member_list_mode_banned">"Excluși"</string>
   <string name="screen_room_member_list_mode_members">"Membri"</string>
-  <string name="screen_room_member_list_pending_header_title">"În așteptare"</string>
   <string name="screen_room_member_list_role_administrator">"Doar administratori"</string>
   <string name="screen_room_member_list_role_moderator">"Administratori și moderatori"</string>
   <string name="screen_room_member_list_role_owner">"Proprietar"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml
index 54d0299df2..f54b984ea3 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_room_change_role_unsaved_changes_description">"У вас есть несохраненные изменения."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Сохранить изменения?"</string>
   <string name="screen_room_member_list_banned_empty">"В этой комнате нет заблокированных пользователей."</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"Проверьте правописание или попробуйте новый поиск"</string>
+  <string name="screen_room_member_list_empty_search_title">"Отсутствует результат по запросу “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d пользователь"</item>
     <item quantity="few">"%1$d пользователя"</item>
@@ -46,7 +48,7 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Разблокировать в комнате"</string>
   <string name="screen_room_member_list_mode_banned">"Заблокированные"</string>
   <string name="screen_room_member_list_mode_members">"Участники"</string>
-  <string name="screen_room_member_list_pending_header_title">"В ожидании"</string>
+  <string name="screen_room_member_list_pending_status">"В ожидании"</string>
   <string name="screen_room_member_list_role_administrator">"Только администраторы"</string>
   <string name="screen_room_member_list_role_moderator">"Модератор"</string>
   <string name="screen_room_member_list_role_owner">"Владелец"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-sk/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-sk/translations.xml
index 3815deaed2..a707b48bc5 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-sk/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-sk/translations.xml
@@ -44,7 +44,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Zrušiť zákaz prístupu do miestnosti"</string>
   <string name="screen_room_member_list_mode_banned">"Zakázaní"</string>
   <string name="screen_room_member_list_mode_members">"Členovia"</string>
-  <string name="screen_room_member_list_pending_header_title">"Čaká sa"</string>
   <string name="screen_room_member_list_role_administrator">"Iba správcovia"</string>
   <string name="screen_room_member_list_role_moderator">"Správcovia a moderátori"</string>
   <string name="screen_room_member_list_role_owner">"Vlastník"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-sv/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-sv/translations.xml
index 721c50bfde..d52c85de14 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-sv/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-sv/translations.xml
@@ -43,7 +43,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Avbanna från rummet"</string>
   <string name="screen_room_member_list_mode_banned">"Bannade"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmar"</string>
-  <string name="screen_room_member_list_pending_header_title">"Väntar"</string>
   <string name="screen_room_member_list_role_administrator">"Endast administratörer"</string>
   <string name="screen_room_member_list_role_moderator">"Administratörer och moderatorer"</string>
   <string name="screen_room_member_list_role_owner">"Ägare"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-tr/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-tr/translations.xml
index 827972fb5a..6e53f48610 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-tr/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-tr/translations.xml
@@ -38,7 +38,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"Davet edildikleri takdirde bu odaya tekrar katılabileceklerdir."</string>
   <string name="screen_room_member_list_mode_banned">"Yasaklandı"</string>
   <string name="screen_room_member_list_mode_members">"Üyeler"</string>
-  <string name="screen_room_member_list_pending_header_title">"Beklemede"</string>
   <string name="screen_room_member_list_role_administrator">"Yalnızca yöneticiler"</string>
   <string name="screen_room_member_list_role_moderator">"Yöneticiler ve moderatörler"</string>
   <string name="screen_room_member_list_room_members_header_title">"Oda üyeleri"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml
index 99ba8cb1d5..9eae3a94e6 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml
@@ -44,7 +44,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Розблокувати в кімнаті"</string>
   <string name="screen_room_member_list_mode_banned">"Заблоковані"</string>
   <string name="screen_room_member_list_mode_members">"Учасники"</string>
-  <string name="screen_room_member_list_pending_header_title">"На розгляді"</string>
   <string name="screen_room_member_list_role_administrator">"Тільки для адміністраторів"</string>
   <string name="screen_room_member_list_role_moderator">"Адміністратори та модератори"</string>
   <string name="screen_room_member_list_role_owner">"Власник"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-ur/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ur/translations.xml
index 944f4f463f..8e6e47f4aa 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-ur/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ur/translations.xml
@@ -38,7 +38,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"اگر وہ مدعو کیا جائیں تو وہ دوبارہ اس کمرے میں شامل ہوسکیں گے۔"</string>
   <string name="screen_room_member_list_mode_banned">"محظور"</string>
   <string name="screen_room_member_list_mode_members">"اراکین"</string>
-  <string name="screen_room_member_list_pending_header_title">"زیر التواء"</string>
   <string name="screen_room_member_list_role_administrator">"صرف منتظمین"</string>
   <string name="screen_room_member_list_role_moderator">"منتظمین اور ناظمین"</string>
   <string name="screen_room_member_list_room_members_header_title">"کمرے کے ارکان"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
index 943eb9ba4f..61329b8577 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
@@ -38,7 +38,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"Agar taklif qilinsa, ular bu xonaga qayta qo‘shilishlari mumkin."</string>
   <string name="screen_room_member_list_mode_banned">"Taqiqlangan"</string>
   <string name="screen_room_member_list_mode_members">"Azolar"</string>
-  <string name="screen_room_member_list_pending_header_title">"Kutilmoqda"</string>
   <string name="screen_room_member_list_role_administrator">"Faqat adminlar"</string>
   <string name="screen_room_member_list_role_moderator">"Adminlar va moderatorlar"</string>
   <string name="screen_room_member_list_room_members_header_title">"Xona a\'zolari"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-zh-rTW/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-zh-rTW/translations.xml
index 8ead85796f..50555bf9ed 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-zh-rTW/translations.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_room_change_permissions_administrators">"僅限管理員"</string>
+  <string name="screen_room_change_permissions_administrators">"管理員"</string>
   <string name="screen_room_change_permissions_ban_people">"管理黑名單"</string>
   <string name="screen_room_change_permissions_delete_messages">"移除訊息"</string>
-  <string name="screen_room_change_permissions_invite_people">"邀請夥伴並接受加入請求"</string>
+  <string name="screen_room_change_permissions_everyone">"成員"</string>
+  <string name="screen_room_change_permissions_invite_people">"邀請夥伴"</string>
+  <string name="screen_room_change_permissions_member_moderation">"管理成員"</string>
   <string name="screen_room_change_permissions_messages_and_content">"訊息與內容"</string>
-  <string name="screen_room_change_permissions_moderators">"管理員和版主"</string>
-  <string name="screen_room_change_permissions_remove_people">"移除夥伴並拒絕加入請求"</string>
+  <string name="screen_room_change_permissions_moderators">"版主"</string>
+  <string name="screen_room_change_permissions_remove_people">"移除夥伴"</string>
   <string name="screen_room_change_permissions_room_avatar">"變更聊天室大頭照"</string>
-  <string name="screen_room_change_permissions_room_details">"編輯聊天室"</string>
+  <string name="screen_room_change_permissions_room_details">"編輯詳細資訊"</string>
   <string name="screen_room_change_permissions_room_name">"變更聊天室名稱"</string>
   <string name="screen_room_change_permissions_room_topic">"變更聊天室主題"</string>
   <string name="screen_room_change_permissions_send_messages">"傳送訊息"</string>
@@ -32,8 +34,10 @@
   <string name="screen_room_change_role_unsaved_changes_description">"您有尚未儲存的變更"</string>
   <string name="screen_room_change_role_unsaved_changes_title">"是否儲存變更？"</string>
   <string name="screen_room_member_list_banned_empty">"沒有被封鎖的使用者。"</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"檢查拼字或嘗試新搜尋"</string>
+  <string name="screen_room_member_list_empty_search_title">"找不到「%1$s」"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="other">"%1$d 位夥伴"</item>
+    <item quantity="other">"%1$d 個人"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"踢出並加入黑名單"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"僅移除成員"</string>
@@ -42,9 +46,9 @@
   <string name="screen_room_member_list_manage_member_unban_title">"從聊天室解除封鎖"</string>
   <string name="screen_room_member_list_mode_banned">"黑名單"</string>
   <string name="screen_room_member_list_mode_members">"成員"</string>
-  <string name="screen_room_member_list_pending_header_title">"待定"</string>
-  <string name="screen_room_member_list_role_administrator">"僅限管理員"</string>
-  <string name="screen_room_member_list_role_moderator">"管理員和版主"</string>
+  <string name="screen_room_member_list_pending_status">"擱置中"</string>
+  <string name="screen_room_member_list_role_administrator">"管理員"</string>
+  <string name="screen_room_member_list_role_moderator">"版主"</string>
   <string name="screen_room_member_list_role_owner">"擁有者"</string>
   <string name="screen_room_member_list_room_members_header_title">"聊天室成員"</string>
   <string name="screen_room_member_list_unbanning_user">"正在解除黑名單 %1$s"</string>
@@ -57,10 +61,12 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"訊息與內容"</string>
   <string name="screen_room_roles_and_permissions_moderators">"版主"</string>
   <string name="screen_room_roles_and_permissions_owners">"擁有者"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"權限"</string>
   <string name="screen_room_roles_and_permissions_reset">"重設權限"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"重設之後，您會遺失當前的設定。"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"確定要重設權限嗎？"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"身份"</string>
   <string name="screen_room_roles_and_permissions_room_details">"聊天室資訊"</string>
-  <string name="screen_room_roles_and_permissions_title">"身份與權限"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"空間詳細資訊"</string>
+  <string name="screen_room_roles_and_permissions_title">"角色與權限"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
index ba5df3de15..3a11398599 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
@@ -42,7 +42,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"从房间取消解封"</string>
   <string name="screen_room_member_list_mode_banned">"已封禁用户"</string>
   <string name="screen_room_member_list_mode_members">"成员"</string>
-  <string name="screen_room_member_list_pending_header_title">"待处理"</string>
   <string name="screen_room_member_list_role_administrator">"仅限管理员"</string>
   <string name="screen_room_member_list_role_moderator">"管理员和协管员"</string>
   <string name="screen_room_member_list_role_owner">"所有者"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values/localazy.xml b/features/rolesandpermissions/impl/src/main/res/values/localazy.xml
index 2d98f43f97..70efa48e5a 100644
--- a/features/rolesandpermissions/impl/src/main/res/values/localazy.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values/localazy.xml
@@ -34,9 +34,15 @@
   <string name="screen_room_change_role_unsaved_changes_description">"You have unsaved changes."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Save changes?"</string>
   <string name="screen_room_member_list_banned_empty">"There are no banned users."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Banned"</item>
+    <item quantity="other">"%1$d Banned"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Check the spelling or try a new search"</string>
+  <string name="screen_room_member_list_empty_search_title">"No results for “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d person"</item>
-    <item quantity="other">"%1$d people"</item>
+    <item quantity="one">"%1$d Person"</item>
+    <item quantity="other">"%1$d People"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Ban user"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Only remove member"</string>
@@ -45,7 +51,11 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Unban user"</string>
   <string name="screen_room_member_list_mode_banned">"Banned"</string>
   <string name="screen_room_member_list_mode_members">"Members"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pending"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invited"</item>
+    <item quantity="other">"%1$d Invited"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Pending"</string>
   <string name="screen_room_member_list_role_administrator">"Admin"</string>
   <string name="screen_room_member_list_role_moderator">"Moderator"</string>
   <string name="screen_room_member_list_role_owner">"Owner"</string>
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
index 2b1ebb175c..15c89ee9a7 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
@@ -202,7 +202,11 @@ private fun LazyListScope.memberItems(
         SelectedSection.MEMBERS -> {
             if (roomMembers.invited.isNotEmpty()) {
                 roomMemberListSection(
-                    headerText = { stringResource(id = R.string.screen_room_member_list_pending_header_title) },
+                    headerText = {
+                        // TODO Use showMembersCount? iOS seems to always render the number of users, even when searching for users.
+                        val invitedCount = roomMembers.invited.count()
+                        pluralStringResource(id = R.plurals.screen_room_member_list_pending_header_title, count = invitedCount, invitedCount)
+                    },
                     members = roomMembers.invited,
                     onMemberSelected = { onSelectUser(it) }
                 )
diff --git a/features/roomdetails/impl/src/main/res/values-be/translations.xml b/features/roomdetails/impl/src/main/res/values-be/translations.xml
index 74be3a0362..fe337177df 100644
--- a/features/roomdetails/impl/src/main/res/values-be/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-be/translations.xml
@@ -69,7 +69,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"Яны змогуць зноў далучыцца да гэтага пакоя, калі іх запросяць."</string>
   <string name="screen_room_member_list_mode_banned">"Заблакіраваныя"</string>
   <string name="screen_room_member_list_mode_members">"Удзельнікі"</string>
-  <string name="screen_room_member_list_pending_header_title">"У чаканні"</string>
   <string name="screen_room_member_list_role_administrator">"Толькі адміністратары"</string>
   <string name="screen_room_member_list_role_moderator">"Адміністратары і мадэратары"</string>
   <string name="screen_room_member_list_room_members_header_title">"Удзельнікі пакоя"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-cs/translations.xml b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
index df81622e48..6e1214eea0 100644
--- a/features/roomdetails/impl/src/main/res/values-cs/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
@@ -81,7 +81,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Zrušit vykázání z místnosti"</string>
   <string name="screen_room_member_list_mode_banned">"Vykázaní"</string>
   <string name="screen_room_member_list_mode_members">"Členové"</string>
-  <string name="screen_room_member_list_pending_header_title">"Nevyřízeno"</string>
   <string name="screen_room_member_list_role_administrator">"Pouze správci"</string>
   <string name="screen_room_member_list_role_moderator">"Správci a moderátoři"</string>
   <string name="screen_room_member_list_role_owner">"Vlastník"</string>
@@ -145,7 +144,6 @@ Nedoporučujeme povolovat šifrování pro místnosti, které může kdokoli naj
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy místností představují způsoby, jak najít místnosti a získat k nim přístup. Díky tomu můžete svoji místnost snadno sdílet s ostatními.
 Můžete se rozhodnout publikovat svou místnost ve veřejném adresáři místnosti vašeho domovského serveru."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publikování místnosti"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy místností představují způsoby, jak najít místnosti a získat k nim přístup. Díky tomu můžete svoji místnost snadno sdílet s ostatními."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Viditelnost místnosti"</string>
   <string name="screen_security_and_privacy_title">"Zabezpečení a soukromí"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-cy/translations.xml b/features/roomdetails/impl/src/main/res/values-cy/translations.xml
index 8dcdb8abed..0a3c05285a 100644
--- a/features/roomdetails/impl/src/main/res/values-cy/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cy/translations.xml
@@ -86,7 +86,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Dad-wahardd o\'r ystafell"</string>
   <string name="screen_room_member_list_mode_banned">"Wedi\'i wahardd"</string>
   <string name="screen_room_member_list_mode_members">"Aelodau"</string>
-  <string name="screen_room_member_list_pending_header_title">"Dan ystyriaeth"</string>
   <string name="screen_room_member_list_role_administrator">"Gweinyddwyr yn unig"</string>
   <string name="screen_room_member_list_role_moderator">"Gweinyddwyr a chymedrolwyr"</string>
   <string name="screen_room_member_list_role_owner">"Perchennog"</string>
@@ -150,7 +149,6 @@ Nid ydym yn argymell galluogi amgryptio ar gyfer ystafelloedd y gall unrhyw un d
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill.
 Gallwch ddewis cyhoeddi eich ystafell yng ngweinydd cartref eich cyfeiriadur ystafelloedd cyhoeddus."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Cyhoeddi ystafell"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Gwelededd yr ystafell"</string>
   <string name="screen_security_and_privacy_title">"Diogelwch a phreifatrwydd"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-da/translations.xml b/features/roomdetails/impl/src/main/res/values-da/translations.xml
index c77c740086..63a20e51ec 100644
--- a/features/roomdetails/impl/src/main/res/values-da/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-da/translations.xml
@@ -80,7 +80,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Fjern brugerens spærring fra rummet"</string>
   <string name="screen_room_member_list_mode_banned">"Spærret"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmer"</string>
-  <string name="screen_room_member_list_pending_header_title">"Afventer"</string>
   <string name="screen_room_member_list_role_administrator">"Kun admins"</string>
   <string name="screen_room_member_list_role_moderator">"Admins og moderatorer"</string>
   <string name="screen_room_member_list_role_owner">"Ejeren"</string>
@@ -143,6 +142,5 @@ Vi anbefaler ikke at aktivere kryptering for rum, som alle kan finde og deltage
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Rum-adresser er en måde at finde og få adgang til værelser på. Dette sikrer også, at du nemt kan dele dit rum med andre.
 Du kan vælge at offentliggøre dit rum i din hjemmeservers offentlige katalog over rum."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Udgivelse af rum"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Rum-adresser er måder at finde og få adgang til rum på. Dette sikrer også, at du nemt kan dele dit rum med andre."</string>
   <string name="screen_security_and_privacy_title">"Sikkerhed og privatliv"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-de/translations.xml b/features/roomdetails/impl/src/main/res/values-de/translations.xml
index 981abcb6db..ec71ebc015 100644
--- a/features/roomdetails/impl/src/main/res/values-de/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-de/translations.xml
@@ -80,7 +80,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Sperre für diesen Chat aufheben"</string>
   <string name="screen_room_member_list_mode_banned">"Gesperrt"</string>
   <string name="screen_room_member_list_mode_members">"Mitglieder"</string>
-  <string name="screen_room_member_list_pending_header_title">"Ausstehend"</string>
   <string name="screen_room_member_list_role_administrator">"Nur Admins"</string>
   <string name="screen_room_member_list_role_moderator">"Admins und Moderatoren"</string>
   <string name="screen_room_member_list_role_owner">"Eigentümer"</string>
@@ -144,7 +143,6 @@ Wir empfehlen keine Verschlüsselung für Chats zu aktivieren, die jeder finden
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Chat-Adressen machen es möglich, Chats zu finden und ihnen beizutreten. Dies erleichtert es, Chats mit anderen zu teilen.
 Auf Wunsch kannst du deinen Chat im öffentlichen Verzeichnis deines Homeservers veröffentlichen."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Veröffentlichung von Chats"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Chat-Adressen machen es möglich, Chats zu finden und ihnen beizutreten. Dies erleichtert es, Chats mit anderen zu teilen."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Chatroomsichtbarkeit."</string>
   <string name="screen_security_and_privacy_title">"Sicherheit &amp; Datenschutz"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-el/translations.xml b/features/roomdetails/impl/src/main/res/values-el/translations.xml
index d395d57a1a..0eadb5f775 100644
--- a/features/roomdetails/impl/src/main/res/values-el/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-el/translations.xml
@@ -74,7 +74,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Άρση αποκλεισμού από την αίθουσα"</string>
   <string name="screen_room_member_list_mode_banned">"Αποκλεισμένοι"</string>
   <string name="screen_room_member_list_mode_members">"Μέλη"</string>
-  <string name="screen_room_member_list_pending_header_title">"Σε αναμονή"</string>
   <string name="screen_room_member_list_role_administrator">"Μόνο διαχειριστές"</string>
   <string name="screen_room_member_list_role_moderator">"Διαχειριστές και συντονιστές"</string>
   <string name="screen_room_member_list_room_members_header_title">"Μέλη της αίθουσας"</string>
@@ -134,6 +133,5 @@
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Οι διευθύνσεις αιθουσών είναι τρόποι εύρεσης και πρόσβασης σε αίθουσες. Αυτό διασφαλίζει επίσης ότι μπορείτε εύκολα να μοιραστείτε την αίθουσα με άλλους.
 Μπορείτε να επιλέξετε να δημοσιεύσετε την αίθουσά σας στον δημόσιο κατάλογο αιθουσών του αρχικού διακομιστή σας."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Δημοσίευση αίθουσας"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Οι διευθύνσεις αιθουσών είναι τρόποι εύρεσης και πρόσβασης σε αίθουσες. Αυτό εξασφαλίζει επίσης ότι μπορείτε εύκολα να μοιραστείτε την αίθουσα με άλλους."</string>
   <string name="screen_security_and_privacy_title">"Ασφάλεια &amp; απόρρητο"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-es/translations.xml b/features/roomdetails/impl/src/main/res/values-es/translations.xml
index 6eb229dde1..d58ddcd598 100644
--- a/features/roomdetails/impl/src/main/res/values-es/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-es/translations.xml
@@ -74,7 +74,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Eliminar veto en la sala"</string>
   <string name="screen_room_member_list_mode_banned">"Vetados"</string>
   <string name="screen_room_member_list_mode_members">"Miembros"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendiente"</string>
   <string name="screen_room_member_list_role_administrator">"Solo administradores"</string>
   <string name="screen_room_member_list_role_moderator">"Administradores y moderadores"</string>
   <string name="screen_room_member_list_room_members_header_title">"Miembros de la sala"</string>
@@ -134,6 +133,5 @@ No recomendamos habilitar el cifrado para las salas que cualquiera pueda encontr
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Las direcciones de sala son formas de buscar salas y acceder a ellas. Esto también garantiza que puedas compartir fácilmente tu sala con otras personas.
 Puedes optar por publicar tu sala en el directorio de salas públicas de tu servidor base."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicación de la sala"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Las direcciones de sala son un medio para buscar y acceder a salas. También te permiten compartir fácilmente tu sala con otras personas."</string>
   <string name="screen_security_and_privacy_title">"Seguridad y privacidad"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-et/translations.xml b/features/roomdetails/impl/src/main/res/values-et/translations.xml
index c69e9cca8d..331bce4ba5 100644
--- a/features/roomdetails/impl/src/main/res/values-et/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-et/translations.xml
@@ -71,6 +71,8 @@
   <string name="screen_room_details_topic_title">"Teema"</string>
   <string name="screen_room_details_updating_room">"Uuendame jututuba…"</string>
   <string name="screen_room_member_list_banned_empty">"Suhtluskeeluga kasutajaid pole"</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"Palun kontrolli otsingusõna korrektsust ja proovi siis uuesti"</string>
+  <string name="screen_room_member_list_empty_search_title">"Otsingul „%1$s“ pole tulemusi"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d osaleja"</item>
     <item quantity="other">"%1$d osalejat"</item>
@@ -82,7 +84,7 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Eemalda suhtluskeeld jututoas"</string>
   <string name="screen_room_member_list_mode_banned">"Suhtluskeeluga kasutajad"</string>
   <string name="screen_room_member_list_mode_members">"Liikmed"</string>
-  <string name="screen_room_member_list_pending_header_title">"Ootel"</string>
+  <string name="screen_room_member_list_pending_status">"Ootel"</string>
   <string name="screen_room_member_list_role_administrator">"Peakasutajad"</string>
   <string name="screen_room_member_list_role_moderator">"Moderaatorid"</string>
   <string name="screen_room_member_list_role_owner">"Omanik"</string>
@@ -118,8 +120,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Rollid"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Jututoa üksikasjad"</string>
   <string name="screen_room_roles_and_permissions_title">"Rollid ja õigused"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Lisa jututoa aadress"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kõik võivad paluda jututoaga liitumist, kuid peakasutaja peab sellega nõustuma."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Lisa aadress"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kõik võivad paluda jututoaga liitumist."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Küsi võimalust liitumiseks"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Jah, lülita krüptimine sisse"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Kui jututoa krüptimine on kord sisse lülitatud, siis seda välja lülitada ei saa. Sõnumite ajalugu on nähtav vaid jututoa liikmetele alates kutse saamise või liitumise hetkest.
@@ -132,12 +134,12 @@ Me ei soovita krüptimise kasutamist selliste avalike jututubade puhul, millega
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kõik võivad jututoaga liituda"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kõik"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Liituda saab vaid kutse olemasolul"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Privaatne"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vaid kutsega"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Ligipääs"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_description">"Kogukondade tugi veel puudub"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Kogukonna liikmed"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade avalikus kataloogis, vajab ta aadressi."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Avaldatud aadress"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Aadress"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Võimalda leida seda jututuba avalikust kataloogist otsides „%1$s“"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Luba leitavus avaliku kataloogi otsingust."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Nähtav avalikus kataloogis"</string>
@@ -148,7 +150,6 @@ Me ei soovita krüptimise kasutamist selliste avalike jututubade puhul, millega
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Jututoa aadressid annavad võimaluse neid leida ning saada neile ligi. Samuti võimaldab see jututuba teistele huvilistele jagada.
 Lisaks võid sa jututoa avaldada oma koduserveri avalikus jututubade kataloogis."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Jututoa avaldamine"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Jututoa aadressid annavad võimaluse neid leida ning saada neile ligi. Samuti võimaldab see jututuba teistele huvilistele jagada."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Jututoa nähtavus"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Nähtavus"</string>
   <string name="screen_security_and_privacy_title">"Turvalisus ja privaatsus"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-eu/translations.xml b/features/roomdetails/impl/src/main/res/values-eu/translations.xml
index 49e8eecec1..89a77bd4c8 100644
--- a/features/roomdetails/impl/src/main/res/values-eu/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-eu/translations.xml
@@ -70,7 +70,6 @@
   <string name="screen_room_member_list_manage_member_unban_action">"Kendu debekua"</string>
   <string name="screen_room_member_list_mode_banned">"Debekatuta"</string>
   <string name="screen_room_member_list_mode_members">"Kideak"</string>
-  <string name="screen_room_member_list_pending_header_title">"Zain"</string>
   <string name="screen_room_member_list_role_administrator">"Administratzaileak soilik"</string>
   <string name="screen_room_member_list_role_moderator">"Administratzaileak eta moderatzaileak"</string>
   <string name="screen_room_member_list_role_owner">"Jabea"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-fa/translations.xml b/features/roomdetails/impl/src/main/res/values-fa/translations.xml
index df048f7d22..3243eff70f 100644
--- a/features/roomdetails/impl/src/main/res/values-fa/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fa/translations.xml
@@ -76,7 +76,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"تحریم نکردن از اتاق"</string>
   <string name="screen_room_member_list_mode_banned">"محروم"</string>
   <string name="screen_room_member_list_mode_members">"اعضا"</string>
-  <string name="screen_room_member_list_pending_header_title">"منتظر"</string>
   <string name="screen_room_member_list_role_administrator">"فقط مدیران"</string>
   <string name="screen_room_member_list_role_moderator">"مدیرن و ناظران"</string>
   <string name="screen_room_member_list_role_owner">"مالک"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-fi/translations.xml b/features/roomdetails/impl/src/main/res/values-fi/translations.xml
index c0ba6babb6..f1cf00453a 100644
--- a/features/roomdetails/impl/src/main/res/values-fi/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fi/translations.xml
@@ -80,7 +80,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Poista porttikielto huoneesta"</string>
   <string name="screen_room_member_list_mode_banned">"Porttikiellot"</string>
   <string name="screen_room_member_list_mode_members">"Jäsenet"</string>
-  <string name="screen_room_member_list_pending_header_title">"Kutsuttu"</string>
   <string name="screen_room_member_list_role_administrator">"Vain ylläpitäjät"</string>
   <string name="screen_room_member_list_role_moderator">"Ylläpitäjät ja valvojat"</string>
   <string name="screen_room_member_list_role_owner">"Omistaja"</string>
@@ -144,7 +143,6 @@ Emme suosittele salauksen ottamista käyttöön huoneissa, jotka kuka tahansa vo
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Huoneosoitteet ovat tapoja löytää ja käyttää huoneita. Näin voit myös helposti jakaa huoneesi muiden kanssa.
 Voit halutessasi julkaista huoneesi kotipalvelimesi julkisessa huonehakemistossa."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Huoneen julkaiseminen"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Huoneosoitteet ovat tapoja löytää ja käyttää huoneita. Näin voit myös helposti jakaa huoneesi muiden kanssa."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Huoneen näkyvyys"</string>
   <string name="screen_security_and_privacy_title">"Turvallisuus ja yksityisyys"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-fr/translations.xml b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
index 53255299fe..4868d1413b 100644
--- a/features/roomdetails/impl/src/main/res/values-fr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
@@ -82,7 +82,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Débannir du salon"</string>
   <string name="screen_room_member_list_mode_banned">"Bannis"</string>
   <string name="screen_room_member_list_mode_members">"Membres"</string>
-  <string name="screen_room_member_list_pending_header_title">"En attente"</string>
   <string name="screen_room_member_list_role_administrator">"Administrateurs"</string>
   <string name="screen_room_member_list_role_moderator">"Modérateurs"</string>
   <string name="screen_room_member_list_role_owner">"Propriétaire"</string>
@@ -148,7 +147,6 @@ Nous ne recommandons pas d’activer le chiffrement pour les salons que tout le
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Les adresses de salon sont un moyen de trouver et d’accéder aux salons. Cela vous permet également de partager facilement votre salon avec d’autres personnes.
 Vous pouvez choisir de publier votre salon dans l’annuaire des salons publics de votre serveur d’accueil."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publication du salon"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Les adresses de salon sont un moyen de trouver et d’accéder aux salons. Cela vous permet également de partager facilement votre salon avec d’autres personnes."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilité"</string>
   <string name="screen_security_and_privacy_title">"Sécurité &amp; confidentialité"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-hu/translations.xml b/features/roomdetails/impl/src/main/res/values-hu/translations.xml
index dae2ed76d0..f105fc6262 100644
--- a/features/roomdetails/impl/src/main/res/values-hu/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-hu/translations.xml
@@ -82,7 +82,7 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Visszaengedés a szobába"</string>
   <string name="screen_room_member_list_mode_banned">"Kitiltva"</string>
   <string name="screen_room_member_list_mode_members">"Tagok"</string>
-  <string name="screen_room_member_list_pending_header_title">"Függőben"</string>
+  <string name="screen_room_member_list_pending_status">"Függőben"</string>
   <string name="screen_room_member_list_role_administrator">"Adminisztrátor"</string>
   <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_role_owner">"Tulajdonos"</string>
@@ -118,8 +118,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Szerepkörök"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Szoba részletei"</string>
   <string name="screen_room_roles_and_permissions_title">"Szerepkörök és jogosultságok"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Szobacím hozzáadása"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Bárki kérhet hozzáférést, de a kérést egy adminisztrátornak kell jóváhagynia."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Cím hozzáadása"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Mindenkinek hozzáférést kell kérnie."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Csatlakozás kérése"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Igen, engedélyezze a titkosítást"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Az engedélyezés után a szoba titkosítása nem tiltható le. Az üzenetek előzményei csak a szobatagok számára láthatók, amikor meghívást kaptak, vagy mióta csatlakoztak a szobához.
@@ -132,12 +132,12 @@ Nem javasoljuk a titkosítás engedélyezését az olyan szobákban, amelyeket b
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Bárki csatlakozhat."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Bárki"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Csak a meghívott emberek léphetnek be."</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Privát"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Csak meghívásos"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Hozzáférés"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_description">"A terek jelenleg nem támogatottak"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"A tér tagjai"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Közzétett cím"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Cím"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"A szoba megtalálhatóvá tétele a(z) %1$s nyilvános szobakatalógusában való kereséssel."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Lehetővé teszi, hogy a nyilvános szobakatalógusban megtalálható legyen."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Látható a nyilvános szobakatalógusban"</string>
@@ -148,7 +148,6 @@ Nem javasoljuk a titkosítás engedélyezését az olyan szobákban, amelyeket b
   <string name="screen_security_and_privacy_room_publishing_section_footer">"A szobacímek a szobák megtalálásának és elérésnek módjai. Ez azt is biztosítja, hogy könnyen megoszthatja a szobáját másokkal.
 Kiválaszthatja, hogy szobáját közzéteszi-e a Matrix-kiszolgáló nyilvános szobakatalógusában."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Szoba közzététele"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"A szobacímek a szobák megtalálásának és elérésnek módjai. Ez azt is biztosítja, hogy könnyen megoszthatja a szobáját másokkal."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Szoba láthatósága"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Láthatóság"</string>
   <string name="screen_security_and_privacy_title">"Biztonság és adatvédelem"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-in/translations.xml b/features/roomdetails/impl/src/main/res/values-in/translations.xml
index fdba2e83f4..431c4e66f1 100644
--- a/features/roomdetails/impl/src/main/res/values-in/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-in/translations.xml
@@ -73,7 +73,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Batalkan cekalan dari ruangan"</string>
   <string name="screen_room_member_list_mode_banned">"Tercekal"</string>
   <string name="screen_room_member_list_mode_members">"Anggota"</string>
-  <string name="screen_room_member_list_pending_header_title">"Tertunda"</string>
   <string name="screen_room_member_list_role_administrator">"Hanya admin"</string>
   <string name="screen_room_member_list_role_moderator">"Admin dan moderator"</string>
   <string name="screen_room_member_list_room_members_header_title">"Anggota ruangan"</string>
@@ -132,6 +131,5 @@ Kami tidak menyarankan untuk mengaktifkan enkripsi untuk ruangan yang dapat dite
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Hanya anggota sejak memilih opsi ini"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Alamat ruangan adalah cara untuk menemukan dan mengakses ruangan. Ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain. Anda dapat memilih untuk menerbitkan ruangan Anda di direktori ruangan publik homeserver Anda."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Penerbitan ruangan"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Alamat ruangan adalah cara untuk menemukan dan mengakses ruangan. Hal ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain."</string>
   <string name="screen_security_and_privacy_title">"Keamanan &amp; privasi"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-it/translations.xml b/features/roomdetails/impl/src/main/res/values-it/translations.xml
index 7a88d7b27b..1a315d8de0 100644
--- a/features/roomdetails/impl/src/main/res/values-it/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-it/translations.xml
@@ -78,7 +78,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Riammetti nella stanza"</string>
   <string name="screen_room_member_list_mode_banned">"Esclusi"</string>
   <string name="screen_room_member_list_mode_members">"Membri"</string>
-  <string name="screen_room_member_list_pending_header_title">"In attesa"</string>
   <string name="screen_room_member_list_role_administrator">"Solo amministratori"</string>
   <string name="screen_room_member_list_role_moderator">"Amministratori e moderatori"</string>
   <string name="screen_room_member_list_role_owner">"Proprietario"</string>
@@ -142,7 +141,6 @@ Non consigliamo di attivare la crittografia per le stanze che chiunque può trov
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Gli indirizzi delle stanze sono modi per trovare e accedervi. In questo modo puoi anche condividere facilmente la tua stanze con altri.
 Puoi scegliere di pubblicare la tua stanza nell\'elenco delle stanza pubbliche dell\'homeserver."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Pubblicazione della stanza"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Gli indirizzi delle stanze sono modi per trovare e accedere a queste ultime. Questo assicura anche che tu possa condividere facilmente la tua stanza con altri."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilità della stanza"</string>
   <string name="screen_security_and_privacy_title">"Sicurezza e privacy"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-ka/translations.xml b/features/roomdetails/impl/src/main/res/values-ka/translations.xml
index a18d194a1a..d9c56aa89c 100644
--- a/features/roomdetails/impl/src/main/res/values-ka/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ka/translations.xml
@@ -63,7 +63,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"მოწვევის შემთხვევაში განბლოკილი მომხმარებელი ისევ შეძლებს ოთახს შეუერთდეს."</string>
   <string name="screen_room_member_list_mode_banned">"დაბლოკილები"</string>
   <string name="screen_room_member_list_mode_members">"წევრები"</string>
-  <string name="screen_room_member_list_pending_header_title">"მომლოდინე"</string>
   <string name="screen_room_member_list_role_administrator">"მხოლოდ ადმინისტრატორები"</string>
   <string name="screen_room_member_list_role_moderator">"ადმინისტრატორები და მოდერატორები"</string>
   <string name="screen_room_member_list_room_members_header_title">"ოთახის წევრები"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-ko/translations.xml b/features/roomdetails/impl/src/main/res/values-ko/translations.xml
index 7b7233ebcd..c025fdbf49 100644
--- a/features/roomdetails/impl/src/main/res/values-ko/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ko/translations.xml
@@ -77,7 +77,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"방에서 차단 해제"</string>
   <string name="screen_room_member_list_mode_banned">"차단됨"</string>
   <string name="screen_room_member_list_mode_members">"회원들"</string>
-  <string name="screen_room_member_list_pending_header_title">"보류 중"</string>
   <string name="screen_room_member_list_role_administrator">"관리자 전용"</string>
   <string name="screen_room_member_list_role_moderator">"관리자 및 중재자"</string>
   <string name="screen_room_member_list_role_owner">"소유자"</string>
@@ -140,6 +139,5 @@
   <string name="screen_security_and_privacy_room_publishing_section_footer">"방 주소는 방을 찾고 액세스하는 방법입니다. 이를 통해 다른 사람들과 방을 쉽게 공유할 수 있습니다.
 홈서버의 공개 방 디렉토리에 방을 공개할지 여부를 선택할 수 있습니다."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"방 게시"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"방 주소는 방을 찾고 액세스하는 방법입니다. 또한 이 주소를 사용하면 다른 사람들과 방을 쉽게 공유할 수 있습니다."</string>
   <string name="screen_security_and_privacy_title">"보안 및 개인정보 보호"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-lt/translations.xml b/features/roomdetails/impl/src/main/res/values-lt/translations.xml
index e4f4ea4ece..727875d696 100644
--- a/features/roomdetails/impl/src/main/res/values-lt/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-lt/translations.xml
@@ -20,6 +20,5 @@
     <item quantity="few">"%1$d asmenys"</item>
     <item quantity="other">"%1$d asmenų"</item>
   </plurals>
-  <string name="screen_room_member_list_pending_header_title">"Laukiama"</string>
   <string name="screen_room_member_list_room_members_header_title">"Kambario nariai"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-nb/translations.xml b/features/roomdetails/impl/src/main/res/values-nb/translations.xml
index 1d89958277..4fa2154462 100644
--- a/features/roomdetails/impl/src/main/res/values-nb/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-nb/translations.xml
@@ -80,7 +80,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Fjern utestengelsen fra rommet"</string>
   <string name="screen_room_member_list_mode_banned">"Utestengt"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmer"</string>
-  <string name="screen_room_member_list_pending_header_title">"Venter"</string>
   <string name="screen_room_member_list_role_administrator">"Kun for administratorer"</string>
   <string name="screen_room_member_list_role_moderator">"Administratorer og moderatorer"</string>
   <string name="screen_room_member_list_role_owner">"Eier"</string>
@@ -143,6 +142,5 @@ Vi anbefaler ikke å aktivere kryptering for rom som hvem som helst kan finne og
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Romadresser er måter å finne og få tilgang til rom på. Dette sikrer også at du enkelt kan dele rommet ditt med andre.
 Du kan velge å publisere rommet ditt i hjemeserverens offentlige romkatalog."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publisering av rom"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Romadresser er en måte å finne og få tilgang til rommene på. Dette sikrer også at du enkelt kan dele rommet ditt med andre."</string>
   <string name="screen_security_and_privacy_title">"Sikkerhet og personvern"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-nl/translations.xml b/features/roomdetails/impl/src/main/res/values-nl/translations.xml
index c1c7096cf5..73e7b7f8c6 100644
--- a/features/roomdetails/impl/src/main/res/values-nl/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-nl/translations.xml
@@ -68,7 +68,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"Ze kunnen opnieuw tot de kamer toetreden als ze worden uitgenodigd."</string>
   <string name="screen_room_member_list_mode_banned">"Verbannen"</string>
   <string name="screen_room_member_list_mode_members">"Leden"</string>
-  <string name="screen_room_member_list_pending_header_title">"In behandeling"</string>
   <string name="screen_room_member_list_role_administrator">"Alleen beheerders"</string>
   <string name="screen_room_member_list_role_moderator">"Beheerders en moderators"</string>
   <string name="screen_room_member_list_room_members_header_title">"Kamerleden"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-pl/translations.xml b/features/roomdetails/impl/src/main/res/values-pl/translations.xml
index c065da93a9..b7382e8d90 100644
--- a/features/roomdetails/impl/src/main/res/values-pl/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pl/translations.xml
@@ -81,7 +81,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Odbanuj z pokoju"</string>
   <string name="screen_room_member_list_mode_banned">"Zbanowanych"</string>
   <string name="screen_room_member_list_mode_members">"Członków"</string>
-  <string name="screen_room_member_list_pending_header_title">"Oczekujące"</string>
   <string name="screen_room_member_list_role_administrator">"Tylko administratorzy"</string>
   <string name="screen_room_member_list_role_moderator">"Administratorzy i moderatorzy"</string>
   <string name="screen_room_member_list_role_owner">"Właściciel"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml b/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
index 92fca8b192..4eb9da3062 100644
--- a/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
@@ -78,7 +78,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Desbanir da sala"</string>
   <string name="screen_room_member_list_mode_banned">"Banidos"</string>
   <string name="screen_room_member_list_mode_members">"Membros"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendente"</string>
   <string name="screen_room_member_list_role_administrator">"Somente administradores"</string>
   <string name="screen_room_member_list_role_moderator">"Administradores e moderadores"</string>
   <string name="screen_room_member_list_role_owner">"Proprietário"</string>
@@ -141,6 +140,5 @@ Não recomendamos que você ative a criptografia para salas que qualquer pessoa
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhar facilmente sua sala com outras pessoas.
 Você pode optar por publicar sua sala no diretório público de salas do seu servidor-casa."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicação da sala"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhar facilmente sua sala com outras pessoas."</string>
   <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-pt/translations.xml b/features/roomdetails/impl/src/main/res/values-pt/translations.xml
index dc8b82a28f..7f9aca6ea1 100644
--- a/features/roomdetails/impl/src/main/res/values-pt/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pt/translations.xml
@@ -80,7 +80,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Desbanir da sala"</string>
   <string name="screen_room_member_list_mode_banned">"Banidos"</string>
   <string name="screen_room_member_list_mode_members">"Participantes"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendente"</string>
   <string name="screen_room_member_list_role_administrator">"Apenas administradores"</string>
   <string name="screen_room_member_list_role_moderator">"Administradores e moderadores"</string>
   <string name="screen_room_member_list_role_owner">"Dono / Dona"</string>
@@ -144,7 +143,6 @@ Não recomendamos ativar a cifragem em salas que qualquer pessoa possa encontrar
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Estes endereços permitem encontrar e aceder a sala, bem como a sua fácil partilha com outros.
 Podes escolher publicar a sala no diretório público do teu servidor."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicar sala"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Estes endereços permitem encontrar e aceder a sala, bem como a sua fácil partilha com outros."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade da sala"</string>
   <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-ro/translations.xml b/features/roomdetails/impl/src/main/res/values-ro/translations.xml
index 7dce932a3d..682f312c84 100644
--- a/features/roomdetails/impl/src/main/res/values-ro/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ro/translations.xml
@@ -80,7 +80,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Revocati excluderea din camera"</string>
   <string name="screen_room_member_list_mode_banned">"Excluși"</string>
   <string name="screen_room_member_list_mode_members">"Membri"</string>
-  <string name="screen_room_member_list_pending_header_title">"În așteptare"</string>
   <string name="screen_room_member_list_role_administrator">"Doar administratori"</string>
   <string name="screen_room_member_list_role_moderator">"Administratori și moderatori"</string>
   <string name="screen_room_member_list_role_owner">"Proprietar"</string>
@@ -143,6 +142,5 @@ Nu recomandăm activarea criptării pentru camerele pe care oricine le poate gă
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresele camerelor sunt modalități de a găsi și accesa camere. Acest lucru vă asigură, de asemenea, că puteți partaja cu ușurință camera dumneavoastră cu alte persoane.
 Puteți alege să publicați camera în directorul public al camerelor serverului dumneavoastră."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicare cameră"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresele camerelor sunt modalități de a găsi și accesa camerele. Acest lucru vă asigură, de asemenea, că puteți partaja cu ușurință camera dvs. cu alte persoane."</string>
   <string name="screen_security_and_privacy_title">"Securitate &amp; confidențialitate"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-ru/translations.xml b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
index e3cdf7d851..324caed3dc 100644
--- a/features/roomdetails/impl/src/main/res/values-ru/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
@@ -71,6 +71,8 @@
   <string name="screen_room_details_topic_title">"Тема"</string>
   <string name="screen_room_details_updating_room">"Обновление комнаты…"</string>
   <string name="screen_room_member_list_banned_empty">"В этой комнате нет заблокированных пользователей."</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"Проверьте правописание или попробуйте новый поиск"</string>
+  <string name="screen_room_member_list_empty_search_title">"Отсутствует результат по запросу “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d пользователь"</item>
     <item quantity="few">"%1$d пользователя"</item>
@@ -83,7 +85,7 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Разблокировать в комнате"</string>
   <string name="screen_room_member_list_mode_banned">"Заблокированные"</string>
   <string name="screen_room_member_list_mode_members">"Участники"</string>
-  <string name="screen_room_member_list_pending_header_title">"В ожидании"</string>
+  <string name="screen_room_member_list_pending_status">"В ожидании"</string>
   <string name="screen_room_member_list_role_administrator">"Только администраторы"</string>
   <string name="screen_room_member_list_role_moderator">"Модератор"</string>
   <string name="screen_room_member_list_role_owner">"Владелец"</string>
@@ -119,8 +121,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Роли"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Информация о комнате"</string>
   <string name="screen_room_roles_and_permissions_title">"Роли и разрешения"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Добавить адрес комнаты"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Любой желающий может подать заявку на присоединение к комнате, но администратор должен будет принять запрос."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Добавить адрес"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Каждый должен запросить доступ."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Попросить присоединиться"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Да, включить шифрование"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Шифрование комнаты нельзя будет отключить, история сообщений будет видна только участникам комнаты с момента их приглашения или с момента присоединения к комнате.
@@ -138,7 +140,7 @@
   <string name="screen_security_and_privacy_room_access_space_members_option_description">"Пространства в настоящее время не поддерживаются."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Участники пространства"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Вам понадобится адрес комнаты, чтобы сделать ее видимой в каталоге."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Опубликованный адрес"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Адрес"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Опубликовать %1$s в каталоге публичных комнат"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Разрешить поиск в публичном каталоге."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Доступна в списке публичных комнат"</string>
@@ -149,7 +151,6 @@
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Адреса комнат — это способ найти комнату и получить к ней доступ. Это также гарантирует, что вы сможете легко поделиться своей комнатой с другими.
 Вы можете опубликовать свою комнату в каталоге общедоступных комнат на домашнем сервере."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Публикация комнат"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Адреса комнат — это способ найти комнату и получить к ним доступ. Это также гарантирует, что вы сможете легко поделиться своей комнатой с другими."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Видимость комнаты"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Видимость"</string>
   <string name="screen_security_and_privacy_title">"Безопасность и конфиденциальность"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-sk/translations.xml b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
index ad79d94860..662a7c166a 100644
--- a/features/roomdetails/impl/src/main/res/values-sk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
@@ -81,7 +81,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Zrušiť zákaz prístupu do miestnosti"</string>
   <string name="screen_room_member_list_mode_banned">"Zakázaní"</string>
   <string name="screen_room_member_list_mode_members">"Členovia"</string>
-  <string name="screen_room_member_list_pending_header_title">"Čaká sa"</string>
   <string name="screen_room_member_list_role_administrator">"Iba správcovia"</string>
   <string name="screen_room_member_list_role_moderator">"Správcovia a moderátori"</string>
   <string name="screen_room_member_list_role_owner">"Vlastník"</string>
@@ -145,7 +144,6 @@ To môže brániť správnemu fungovaniu robotov a premostení. Neodporúčame p
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy miestností predstavujú spôsoby, ako nájsť a získať prístup k miestnostiam. To tiež zaisťuje, že môžete jednoducho zdieľať svoju miestnosť s ostatnými. 
 Môžete sa rozhodnúť zverejniť svoju miestnosť v adresári verejných miestností vášho domovského servera."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Zverejnenie miestnosti"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy miestností predstavujú spôsoby, ako nájsť a získať prístup k miestnostiam. Toto tiež zaisťuje, že môžete jednoducho zdieľať svoju miestnosť s ostatnými."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Viditeľnosť miestnosti"</string>
   <string name="screen_security_and_privacy_title">"Bezpečnosť a súkromie"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-sv/translations.xml b/features/roomdetails/impl/src/main/res/values-sv/translations.xml
index 353a586c00..8e2df0138e 100644
--- a/features/roomdetails/impl/src/main/res/values-sv/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sv/translations.xml
@@ -78,7 +78,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Avbanna från rummet"</string>
   <string name="screen_room_member_list_mode_banned">"Bannade"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmar"</string>
-  <string name="screen_room_member_list_pending_header_title">"Väntar"</string>
   <string name="screen_room_member_list_role_administrator">"Endast administratörer"</string>
   <string name="screen_room_member_list_role_moderator">"Administratörer och moderatorer"</string>
   <string name="screen_room_member_list_role_owner">"Ägare"</string>
@@ -141,6 +140,5 @@ Vi rekommenderar inte att aktivera kryptering för rum som vem som helst kan hit
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Rumsadresser är sätt att hitta och komma åt rum. Detta säkerställer också att du enkelt kan dela ditt rum med andra.
 Du kan välja att publicera ditt rum i din hemservers offentliga rumskatalog."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Rumspublicering"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Rumsadresser är sätt att hitta och komma åt rum. Detta säkerställer också att du enkelt kan dela ditt rum med andra."</string>
   <string name="screen_security_and_privacy_title">"Säkerhet och sekretess"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-tr/translations.xml b/features/roomdetails/impl/src/main/res/values-tr/translations.xml
index 90a1a5b3c7..11201d0da0 100644
--- a/features/roomdetails/impl/src/main/res/values-tr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-tr/translations.xml
@@ -73,7 +73,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"Davet edildikleri takdirde bu odaya tekrar katılabileceklerdir."</string>
   <string name="screen_room_member_list_mode_banned">"Yasaklandı"</string>
   <string name="screen_room_member_list_mode_members">"Üyeler"</string>
-  <string name="screen_room_member_list_pending_header_title">"Beklemede"</string>
   <string name="screen_room_member_list_role_administrator">"Yalnızca yöneticiler"</string>
   <string name="screen_room_member_list_role_moderator">"Yöneticiler ve moderatörler"</string>
   <string name="screen_room_member_list_room_members_header_title">"Oda üyeleri"</string>
@@ -134,7 +133,6 @@ Herkesin bulabileceği ve katılabileceği odalar için şifrelemenin etkinleşt
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Oda adresleri, odaları bulmanın ve odalara erişmenin yoludur. Bu aynı zamanda odanızı başkalarıyla kolayca paylaşabilmenizi sağlar.
 Odanızı ana sunucunuzun genel oda dizininde yayınlamayı seçebilirsiniz."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Oda yayınlama"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Oda adresleri, odaları bulmanın ve odalara erişmenin yollarıdır. Bu aynı zamanda odanızı başkalarıyla kolayca paylaşabilmenizi sağlar."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Oda görünürlüğü"</string>
   <string name="screen_security_and_privacy_title">"Güvenlik ve gizlilik"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-uk/translations.xml b/features/roomdetails/impl/src/main/res/values-uk/translations.xml
index f8ab7a1ced..34663f9db9 100644
--- a/features/roomdetails/impl/src/main/res/values-uk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-uk/translations.xml
@@ -79,7 +79,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Розблокувати в кімнаті"</string>
   <string name="screen_room_member_list_mode_banned">"Заблоковані"</string>
   <string name="screen_room_member_list_mode_members">"Учасники"</string>
-  <string name="screen_room_member_list_pending_header_title">"На розгляді"</string>
   <string name="screen_room_member_list_role_administrator">"Тільки для адміністраторів"</string>
   <string name="screen_room_member_list_role_moderator">"Адміністратори та модератори"</string>
   <string name="screen_room_member_list_role_owner">"Власник"</string>
@@ -143,7 +142,6 @@
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Адреси кімнат — це спосіб знайти кімнату та отримати до неї доступ. Це також гарантує, що ви можете легко поділитися своєю кімнатою з іншими.
 Ви можете опублікувати свою кімнату в каталозі загальнодоступних кімнат вашого домашнього сервера."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Публікація в кімнаті"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Адреси кімнат — це спосіб знайти та отримати доступ до кімнат. Це також гарантує, що ви зможете легко поділитися своєю кімнатою з іншими."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Видимість кімнати"</string>
   <string name="screen_security_and_privacy_title">"Безпека й приватність"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-ur/translations.xml b/features/roomdetails/impl/src/main/res/values-ur/translations.xml
index 5f6eb34bca..524afe515d 100644
--- a/features/roomdetails/impl/src/main/res/values-ur/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ur/translations.xml
@@ -68,7 +68,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"اگر وہ مدعو کیا جائیں تو وہ دوبارہ اس کمرے میں شامل ہوسکیں گے۔"</string>
   <string name="screen_room_member_list_mode_banned">"محظور"</string>
   <string name="screen_room_member_list_mode_members">"اراکین"</string>
-  <string name="screen_room_member_list_pending_header_title">"زیر التواء"</string>
   <string name="screen_room_member_list_role_administrator">"صرف منتظمین"</string>
   <string name="screen_room_member_list_role_moderator">"منتظمین اور ناظمین"</string>
   <string name="screen_room_member_list_room_members_header_title">"کمرے کے ارکان"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-uz/translations.xml b/features/roomdetails/impl/src/main/res/values-uz/translations.xml
index f4a4d891ce..a95af68769 100644
--- a/features/roomdetails/impl/src/main/res/values-uz/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-uz/translations.xml
@@ -68,7 +68,6 @@
   <string name="screen_room_member_list_manage_member_unban_message">"Agar taklif qilinsa, ular bu xonaga qayta qo‘shilishlari mumkin."</string>
   <string name="screen_room_member_list_mode_banned">"Taqiqlangan"</string>
   <string name="screen_room_member_list_mode_members">"Azolar"</string>
-  <string name="screen_room_member_list_pending_header_title">"Kutilmoqda"</string>
   <string name="screen_room_member_list_role_administrator">"Faqat adminlar"</string>
   <string name="screen_room_member_list_role_moderator">"Adminlar va moderatorlar"</string>
   <string name="screen_room_member_list_room_members_header_title">"Xona a\'zolari"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml b/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
index 83b71a81fe..9de710e576 100644
--- a/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"您需要聊天室地址才能在目錄中顯示它。"</string>
-  <string name="screen_edit_room_address_title">"聊天室地址"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"您需要地址才能在公開目錄中顯示。"</string>
+  <string name="screen_edit_room_address_title">"編輯地址"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"更新通知設定時發生錯誤。"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"您的家伺服器在加密聊天室中不支援此選項，可能無法收到部份聊天室的通知。"</string>
   <string name="screen_polls_history_title">"所有投票"</string>
-  <string name="screen_room_change_permissions_administrators">"僅限管理員"</string>
+  <string name="screen_room_change_permissions_administrators">"管理員"</string>
   <string name="screen_room_change_permissions_ban_people">"管理黑名單"</string>
   <string name="screen_room_change_permissions_delete_messages">"移除訊息"</string>
-  <string name="screen_room_change_permissions_invite_people">"邀請夥伴並接受加入請求"</string>
+  <string name="screen_room_change_permissions_everyone">"成員"</string>
+  <string name="screen_room_change_permissions_invite_people">"邀請夥伴"</string>
+  <string name="screen_room_change_permissions_member_moderation">"管理成員"</string>
   <string name="screen_room_change_permissions_messages_and_content">"訊息與內容"</string>
-  <string name="screen_room_change_permissions_moderators">"管理員和版主"</string>
-  <string name="screen_room_change_permissions_remove_people">"移除夥伴並拒絕加入請求"</string>
+  <string name="screen_room_change_permissions_moderators">"版主"</string>
+  <string name="screen_room_change_permissions_remove_people">"移除夥伴"</string>
   <string name="screen_room_change_permissions_room_avatar">"變更聊天室大頭照"</string>
-  <string name="screen_room_change_permissions_room_details">"編輯聊天室"</string>
+  <string name="screen_room_change_permissions_room_details">"編輯詳細資訊"</string>
   <string name="screen_room_change_permissions_room_name">"變更聊天室名稱"</string>
   <string name="screen_room_change_permissions_room_topic">"變更聊天室主題"</string>
   <string name="screen_room_change_permissions_send_messages">"傳送訊息"</string>
@@ -40,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"已加密"</string>
   <string name="screen_room_details_badge_not_encrypted">"未加密"</string>
   <string name="screen_room_details_badge_public">"公開的聊天室"</string>
-  <string name="screen_room_details_edit_room_title">"編輯聊天室"</string>
+  <string name="screen_room_details_edit_room_title">"編輯詳細資訊"</string>
   <string name="screen_room_details_edition_error">"發生未知錯誤，無法變更資訊。"</string>
   <string name="screen_room_details_edition_error_title">"無法更新聊天室"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"訊息透過鎖定保護。只有您與收件者才有解鎖它們的唯一金鑰。"</string>
@@ -60,7 +62,7 @@
   <string name="screen_room_details_pinned_events_row_title">"釘選訊息"</string>
   <string name="screen_room_details_profile_row_title">"個人檔案"</string>
   <string name="screen_room_details_requests_to_join_title">"請求加入"</string>
-  <string name="screen_room_details_roles_and_permissions">"身份與權限"</string>
+  <string name="screen_room_details_roles_and_permissions">"角色與權限"</string>
   <string name="screen_room_details_room_name_label">"聊天室名稱"</string>
   <string name="screen_room_details_security_and_privacy_title">"安全與隱私"</string>
   <string name="screen_room_details_security_title">"安全性"</string>
@@ -69,8 +71,10 @@
   <string name="screen_room_details_topic_title">"主題"</string>
   <string name="screen_room_details_updating_room">"正在更新聊天室…"</string>
   <string name="screen_room_member_list_banned_empty">"沒有被封鎖的使用者。"</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"檢查拼字或嘗試新搜尋"</string>
+  <string name="screen_room_member_list_empty_search_title">"找不到「%1$s」"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="other">"%1$d 位夥伴"</item>
+    <item quantity="other">"%1$d 個人"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"踢出並加入黑名單"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"僅移除成員"</string>
@@ -79,9 +83,9 @@
   <string name="screen_room_member_list_manage_member_unban_title">"從聊天室解除封鎖"</string>
   <string name="screen_room_member_list_mode_banned">"黑名單"</string>
   <string name="screen_room_member_list_mode_members">"成員"</string>
-  <string name="screen_room_member_list_pending_header_title">"待定"</string>
-  <string name="screen_room_member_list_role_administrator">"僅限管理員"</string>
-  <string name="screen_room_member_list_role_moderator">"管理員和版主"</string>
+  <string name="screen_room_member_list_pending_status">"擱置中"</string>
+  <string name="screen_room_member_list_role_administrator">"管理員"</string>
+  <string name="screen_room_member_list_role_moderator">"版主"</string>
   <string name="screen_room_member_list_role_owner">"擁有者"</string>
   <string name="screen_room_member_list_room_members_header_title">"聊天室成員"</string>
   <string name="screen_room_member_list_unbanning_user">"正在解除黑名單 %1$s"</string>
@@ -108,14 +112,15 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"訊息與內容"</string>
   <string name="screen_room_roles_and_permissions_moderators">"版主"</string>
   <string name="screen_room_roles_and_permissions_owners">"擁有者"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"權限"</string>
   <string name="screen_room_roles_and_permissions_reset">"重設權限"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"重設之後，您會遺失當前的設定。"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"確定要重設權限嗎？"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"身份"</string>
   <string name="screen_room_roles_and_permissions_room_details">"聊天室資訊"</string>
-  <string name="screen_room_roles_and_permissions_title">"身份與權限"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"新增聊天室地址"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"任何人都可以要求加入聊天室，但管理員必須接受請求。"</string>
+  <string name="screen_room_roles_and_permissions_title">"角色與權限"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"新增地址"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"所有人都必須申請存取權。"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"要求加入"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是的，啟用加密"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"啟用後就無法停用聊天室的加密，只有受邀的聊天室成員或加入聊天室後才能看到訊息歷史紀錄。
@@ -125,17 +130,18 @@
   <string name="screen_security_and_privacy_encryption_section_footer">"一旦啟用就無法停用加密。"</string>
   <string name="screen_security_and_privacy_encryption_section_header">"加密"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"啟用端到端加密"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以找到並加入"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以加入。"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"任何人"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"人們僅有受到邀請時才能加入"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"僅受邀者才能加入。"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"僅限邀請"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"聊天室存取權"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"存取權"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_description">"目前不支援空間"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"空間成員"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"您需要聊天室地址才能在目錄中顯示它。"</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"聊天室地址"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"您需要地址才能在公開目錄中顯示。"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"地址"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允許透過搜尋 %1$s 公開聊天室目錄找到此聊天室"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"在公開聊天室目錄中可見"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"允許其他人透過公開目錄找到。"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"在公開目錄中可見"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"誰可以讀取歷史紀錄"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"僅在成員被邀請後"</string>
@@ -143,7 +149,6 @@
   <string name="screen_security_and_privacy_room_publishing_section_footer">"聊天室地址是尋找與存取聊天室的方法。也確保您可以輕鬆與其他人分享聊天室。
 您可以選擇在家伺服器公開聊天室目錄中發佈您的聊天室。"</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"聊天室發佈"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"聊天室地址是尋找與存取聊天室的方法。也確保您可以輕鬆與其他人分享聊天室。"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"聊天室能見度"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"能見度"</string>
   <string name="screen_security_and_privacy_title">"安全與隱私"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-zh/translations.xml b/features/roomdetails/impl/src/main/res/values-zh/translations.xml
index f504744964..a373e5d3c4 100644
--- a/features/roomdetails/impl/src/main/res/values-zh/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-zh/translations.xml
@@ -79,7 +79,6 @@
   <string name="screen_room_member_list_manage_member_unban_title">"从房间取消解封"</string>
   <string name="screen_room_member_list_mode_banned">"已封禁用户"</string>
   <string name="screen_room_member_list_mode_members">"成员"</string>
-  <string name="screen_room_member_list_pending_header_title">"待处理"</string>
   <string name="screen_room_member_list_role_administrator">"仅限管理员"</string>
   <string name="screen_room_member_list_role_moderator">"管理员和协管员"</string>
   <string name="screen_room_member_list_role_owner">"所有者"</string>
@@ -143,7 +142,6 @@
   <string name="screen_security_and_privacy_room_publishing_section_footer">"房间地址是查找和访问房间的方式。这也确保你可以轻松地向他人分享房间。
 你可以选择在你服务器的公共房间目录中发布你的房间。"</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"房间发布"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"房间地址是查找和访问房间的方式。这也确保你可以轻松地向他人分享房间。"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"房间可见性"</string>
   <string name="screen_security_and_privacy_title">"安全与隐私"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values/localazy.xml b/features/roomdetails/impl/src/main/res/values/localazy.xml
index 2f9f2de9b7..2f57c250f1 100644
--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@@ -71,9 +71,15 @@
   <string name="screen_room_details_topic_title">"Topic"</string>
   <string name="screen_room_details_updating_room">"Updating room…"</string>
   <string name="screen_room_member_list_banned_empty">"There are no banned users."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Banned"</item>
+    <item quantity="other">"%1$d Banned"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Check the spelling or try a new search"</string>
+  <string name="screen_room_member_list_empty_search_title">"No results for “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d person"</item>
-    <item quantity="other">"%1$d people"</item>
+    <item quantity="one">"%1$d Person"</item>
+    <item quantity="other">"%1$d People"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Ban user"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Only remove member"</string>
@@ -82,7 +88,11 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Unban user"</string>
   <string name="screen_room_member_list_mode_banned">"Banned"</string>
   <string name="screen_room_member_list_mode_members">"Members"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pending"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invited"</item>
+    <item quantity="other">"%1$d Invited"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Pending"</string>
   <string name="screen_room_member_list_role_administrator">"Admin"</string>
   <string name="screen_room_member_list_role_moderator">"Moderator"</string>
   <string name="screen_room_member_list_role_owner">"Owner"</string>
@@ -148,7 +158,7 @@ We do not recommend enabling encryption for rooms that anyone can find and join.
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.
 You can choose to publish your room in your homeserver public room directory."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Room publishing"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Addresses are a way to find and access rooms. This also ensures you can easily share your room with others."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Addresses are a way to find and access rooms and spaces. This also ensures you can easily share them with others."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Visibility"</string>
   <string name="screen_security_and_privacy_title">"Security &amp; privacy"</string>
 </resources>
diff --git a/features/roommembermoderation/impl/src/main/res/values-zh-rTW/translations.xml b/features/roommembermoderation/impl/src/main/res/values-zh-rTW/translations.xml
index de8a9712ee..14a044a7dc 100644
--- a/features/roommembermoderation/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-zh-rTW/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"加入黑名單"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"即使收到邀請，他們仍然無法加入聊天室。"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"您確定要將此成員加入黑名單？"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"即使被邀請，他們也無法再次加入此空間，但他們仍將保留其在任何聊天室或子空間的成員資格。"</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"正在將 %1$s 加入黑名單"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"移除"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"如果收到邀請，他們能再次加入聊天室。"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"您真的想要移除此成員嗎？"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"若受邀，他們將可以再次加入此空間，並保留所有聊天室與子空間的成員資格。"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"查看個人檔案"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"踢出聊天室"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"移除使用者"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"移除成員並禁止未來再度加入？"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"正在踢出 %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"從聊天室解除封鎖"</string>
diff --git a/features/space/impl/src/main/res/values-zh-rTW/translations.xml b/features/space/impl/src/main/res/values-zh-rTW/translations.xml
index 977024c5cf..abf495860f 100644
--- a/features/space/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/space/impl/src/main/res/values-zh-rTW/translations.xml
@@ -10,6 +10,6 @@
   <string name="screen_leave_space_title">"離開 %1$s？"</string>
   <string name="screen_leave_space_title_last_admin">"您是 %1$s 唯一的管理員"</string>
   <string name="screen_space_settings_leave_space">"離開空間"</string>
-  <string name="screen_space_settings_roles_and_permissions">"身份與權限"</string>
+  <string name="screen_space_settings_roles_and_permissions">"角色與權限"</string>
   <string name="screen_space_settings_security_and_privacy">"安全與隱私"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-bg/translations.xml b/features/verifysession/impl/src/main/res/values-bg/translations.xml
index 1a2e194696..357600cf60 100644
--- a/features/verifysession/impl/src/main/res/values-bg/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-bg/translations.xml
@@ -10,6 +10,9 @@
   <string name="screen_session_verification_cancelled_subtitle">"Нещо не изглежда наред. Или времето за изчакване на заявката е изтекло, или заявката е отхвърлена."</string>
   <string name="screen_session_verification_compare_emojis_subtitle">"Потвърдете, че емоджитата по-долу съвпадат с показаните в другото ви устройство."</string>
   <string name="screen_session_verification_compare_emojis_title">"Сравнете емоджита"</string>
+  <string name="screen_session_verification_compare_emojis_user_subtitle">"Уверете се, че емоджитата по-долу съвпадат с показаните на другото устройство."</string>
+  <string name="screen_session_verification_compare_numbers_subtitle">"Уверете се, че числата по-долу съвпадат с показаните на другата ви сесия."</string>
+  <string name="screen_session_verification_compare_numbers_title">"Сравнете числа"</string>
   <string name="screen_session_verification_complete_subtitle">"Сега можете да четете или изпращате съобщения сигурно на другото си устройство."</string>
   <string name="screen_session_verification_device_verified">"Устройството е потвърдено"</string>
   <string name="screen_session_verification_enter_recovery_key">"Въвеждане на ключ за възстановяване"</string>
@@ -20,13 +23,17 @@
   <string name="screen_session_verification_positive_button_verifying_ongoing">"В очакване на съвпадение"</string>
   <string name="screen_session_verification_ready_subtitle">"Сравнете уникален набор от емоджита."</string>
   <string name="screen_session_verification_request_accepted_subtitle">"Сравнете уникалните емоджита, като се уверите, че се появяват в същия ред."</string>
+  <string name="screen_session_verification_request_details_timestamp">"Влезли"</string>
   <string name="screen_session_verification_request_failure_title">"Неуспешно потвърждаване"</string>
+  <string name="screen_session_verification_request_footer">"Продължете само ако вие сте инициирали това потвърждаване."</string>
   <string name="screen_session_verification_request_success_subtitle">"Сега можете да четете или изпращате съобщения сигурно на другото си устройство."</string>
   <string name="screen_session_verification_request_success_title">"Устройството е потвърдено"</string>
+  <string name="screen_session_verification_request_title">"Поискано е потвърждение"</string>
   <string name="screen_session_verification_they_dont_match">"Те не съвпадат"</string>
   <string name="screen_session_verification_they_match">"Те съвпадат"</string>
   <string name="screen_session_verification_use_another_device_subtitle">"Уверете се, че приложението е отворено на другото устройство, преди да започнете потвърждението оттук."</string>
   <string name="screen_session_verification_use_another_device_title">"Отворете приложението на друго потвърдено устройство"</string>
+  <string name="screen_session_verification_user_initiator_title">"Потвърждаване на този потребител?"</string>
   <string name="screen_session_verification_waiting_other_user_title">"Чака се другият потребител"</string>
   <string name="screen_session_verification_waiting_subtitle">"След като бъдете приети, ще можете да продължите потвърждението."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Приемете заявката, за да започнете процеса на потвърждаване в другата си сесия, за да продължите."</string>
diff --git a/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml b/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml
index 9e167a2e92..f0c1f1046f 100644
--- a/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml
@@ -11,6 +11,7 @@
   <plurals name="notification_compat_summary_title">
     <item quantity="other">"%d 個通知"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Unified Push 通知散佈程式註冊失敗，因此您無法再收到通知。請檢查應用程式的通知設定與推播散佈程式的狀態。"</string>
   <string name="notification_fallback_content">"您有新訊息。"</string>
   <string name="notification_incoming_call">"📹 來電"</string>
   <string name="notification_inline_reply_failed">"** 無法傳送，請開啟聊天室"</string>
diff --git a/libraries/ui-strings/src/main/res/values-bg/translations.xml b/libraries/ui-strings/src/main/res/values-bg/translations.xml
index da290cbec5..5265110a65 100644
--- a/libraries/ui-strings/src/main/res/values-bg/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-bg/translations.xml
@@ -130,7 +130,9 @@
   <string name="common_about">"Относно"</string>
   <string name="common_acceptable_use_policy">"Политика за приемлива употреба"</string>
   <string name="common_add_account">"Добавяне на акаунт"</string>
+  <string name="common_add_another_account">"Добавяне на друг акаунт"</string>
   <string name="common_advanced_settings">"Разширени настройки"</string>
+  <string name="common_an_image">"изображение"</string>
   <string name="common_analytics">"Статистика"</string>
   <string name="common_android_shortcuts_remove_reason_left_room">"Напуснахте стаята"</string>
   <string name="common_appearance">"Облик"</string>
@@ -142,6 +144,7 @@
   <string name="common_copyright">"Авторски права"</string>
   <string name="common_creating_room">"Създаване на стая…"</string>
   <string name="common_current_user_left_room">"Стаята е напусната"</string>
+  <string name="common_current_user_left_space">"Пространството е напуснато"</string>
   <string name="common_dark">"Тъмен"</string>
   <string name="common_decryption_error">"Грешка при разшифроване"</string>
   <string name="common_description">"Описание"</string>
@@ -172,6 +175,7 @@
   <string name="common_install_apk_android">"Инсталиране на APK"</string>
   <string name="common_invite_unknown_profile">"Този Matrix ID не може да бъде намерен, така че поканата може да не бъде получена."</string>
   <string name="common_leaving_room">"Стаята се напуска"</string>
+  <string name="common_leaving_space">"Пространството се напуска"</string>
   <string name="common_light">"Светъл"</string>
   <string name="common_link_copied_to_clipboard">"Връзката е копирана в клипборда"</string>
   <string name="common_loading">"Зарежда се…"</string>
@@ -214,6 +218,7 @@
   <string name="common_preparing">"Подготвя се…"</string>
   <string name="common_privacy_policy">"Политика за поверителност"</string>
   <string name="common_private_room">"Частна стая"</string>
+  <string name="common_private_space">"Частно пространство"</string>
   <string name="common_public_room">"Общодостъпна стая"</string>
   <string name="common_public_space">"Общодостъпно пространство"</string>
   <string name="common_reaction">"Реакция"</string>
@@ -243,15 +248,19 @@
   <string name="common_search_results">"Резултати от търсенето"</string>
   <string name="common_security">"Защита"</string>
   <string name="common_seen_by">"Видяно от"</string>
+  <string name="common_select_account">"Избиране на акаунт"</string>
   <string name="common_sending">"Изпраща се…"</string>
   <string name="common_sending_failed">"Изпращането е неуспешно"</string>
   <string name="common_sent">"Изпратено"</string>
   <string name="common_server_not_supported">"Сървърът не се поддържа"</string>
   <string name="common_server_url">"URL адрес на сървъра"</string>
   <string name="common_settings">"Настройки"</string>
+  <string name="common_share_space">"Споделяне на пространството"</string>
   <string name="common_shared_location">"Споделено местоположение"</string>
   <string name="common_signing_out">"Излизате"</string>
+  <string name="common_something_went_wrong">"Нещо се обърка"</string>
   <string name="common_something_went_wrong_message">"Възникна проблем. Моля, опитайте отново."</string>
+  <string name="common_space">"Пространство"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d пространство"</item>
     <item quantity="other">"%1$d пространства"</item>
@@ -268,6 +277,7 @@
   <string name="common_topic">"Тема"</string>
   <string name="common_topic_placeholder">"За какво се отнася тази стая?"</string>
   <string name="common_unable_to_decrypt">"Не може да се разшифрова"</string>
+  <string name="common_unable_to_decrypt_no_access">"Нямате достъп до това съобщение"</string>
   <string name="common_unable_to_invite_message">"Поканите не можаха да бъдат изпратени до един или повече потребители."</string>
   <string name="common_unable_to_invite_title">"Не може да се изпрати покана(и)"</string>
   <string name="common_unlock">"Отключване"</string>
@@ -282,6 +292,9 @@
   <string name="common_verify_identity">"Потвърждаване на самоличността"</string>
   <string name="common_verify_user">"Потвърждаване на потребителя"</string>
   <string name="common_video">"Видео"</string>
+  <string name="common_video_quality_high">"Високо качество"</string>
+  <string name="common_video_quality_low">"Ниско качество"</string>
+  <string name="common_video_quality_standard">"Стандартно качество"</string>
   <string name="common_voice_message">"Гласово съобщение"</string>
   <string name="common_waiting">"Изчаква се…"</string>
   <string name="common_waiting_for_decryption_key">"В очакване на това съобщение"</string>
@@ -320,9 +333,11 @@
   <string name="screen_share_this_location_action">"Споделяне на това местоположение"</string>
   <string name="screen_space_list_parent_space">"%1$s пространство"</string>
   <string name="screen_space_list_title">"Пространства"</string>
+  <string name="screen_space_menu_action_members">"Преглед на членовете"</string>
   <string name="screen_view_location_title">"Местоположение"</string>
   <string name="settings_version_number">"Версия: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"bg"</string>
   <string name="timeline_decryption_failure_historical_event_unverified_device">"Трябва да потвърдите това устройство за да достъпите исторически съобщения"</string>
+  <string name="timeline_decryption_failure_historical_event_user_not_joined">"Нямате достъп до това съобщение"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Съобщението не може да се разшифрова"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
index 0a8f32a694..1c88ac71df 100644
--- a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
@@ -93,6 +93,7 @@
   <string name="action_forgot_password">"忘記密碼？"</string>
   <string name="action_forward">"轉寄"</string>
   <string name="action_go_back">"返回"</string>
+  <string name="action_go_to_roles_and_permissions">"前往角色與權限"</string>
   <string name="action_go_to_settings">"前往設定"</string>
   <string name="action_ignore">"忽略"</string>
   <string name="action_invite">"邀請"</string>
@@ -435,6 +436,10 @@
   <string name="screen_resolve_send_failure_unsigned_device_title">"未傳送您的訊息，因為 %1$s 尚未驗證所有裝置。"</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"您的一個或多個裝置未經驗證。您仍可傳送訊息，也可以取消並在您驗證您的所有裝置後再試一次。"</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"因為您尚未驗證一個或多個裝置，因為未傳送您的訊息"</string>
+  <string name="screen_room_change_permissions_change_settings">"變更設定"</string>
+  <string name="screen_room_change_permissions_manage_space">"管理空間"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"管理聊天室"</string>
+  <string name="screen_room_change_permissions_title">"權限"</string>
   <string name="screen_room_change_role_administrators_or_owners_title">"編輯管理員或擁有者"</string>
   <string name="screen_room_error_failed_processing_media">"無法處理要上傳的媒體，請再試一次。"</string>
   <string name="screen_room_error_failed_retrieving_user_details">"無法擷取使用者詳細資訊"</string>
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_de.png
new file mode 100644
index 0000000000..747cad00c9
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:640f53a7cac7a3b6693d462bb86a50db212d749a8603e8edaeed6c874ae573ba
+size 66148
diff --git a/screenshots/html/data.js b/screenshots/html/data.js
index 1626eec982..6d8ee5fbab 100644
--- a/screenshots/html/data.js
+++ b/screenshots/html/data.js
@@ -1,80 +1,80 @@
 // Generated file, do not edit
 export const screenshots = [
 ["en","en-dark","de",],
-["features.preferences.impl.about_AboutView_Day_0_en","features.preferences.impl.about_AboutView_Night_0_en",20412,],
+["features.preferences.impl.about_AboutView_Day_0_en","features.preferences.impl.about_AboutView_Night_0_en",20413,],
 ["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_0_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_0_en",0,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en",20412,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en",20412,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en",20412,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en",20412,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_5_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_5_en",20412,],
-["features.logout.impl_AccountDeactivationView_Day_0_en","features.logout.impl_AccountDeactivationView_Night_0_en",20412,],
-["features.logout.impl_AccountDeactivationView_Day_1_en","features.logout.impl_AccountDeactivationView_Night_1_en",20412,],
-["features.logout.impl_AccountDeactivationView_Day_2_en","features.logout.impl_AccountDeactivationView_Night_2_en",20412,],
-["features.logout.impl_AccountDeactivationView_Day_3_en","features.logout.impl_AccountDeactivationView_Night_3_en",20412,],
-["features.logout.impl_AccountDeactivationView_Day_4_en","features.logout.impl_AccountDeactivationView_Night_4_en",20412,],
-["features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en","features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en",20412,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en",20413,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en",20413,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en",20413,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en",20413,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_5_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_5_en",20413,],
+["features.logout.impl_AccountDeactivationView_Day_0_en","features.logout.impl_AccountDeactivationView_Night_0_en",20413,],
+["features.logout.impl_AccountDeactivationView_Day_1_en","features.logout.impl_AccountDeactivationView_Night_1_en",20413,],
+["features.logout.impl_AccountDeactivationView_Day_2_en","features.logout.impl_AccountDeactivationView_Night_2_en",20413,],
+["features.logout.impl_AccountDeactivationView_Day_3_en","features.logout.impl_AccountDeactivationView_Night_3_en",20413,],
+["features.logout.impl_AccountDeactivationView_Day_4_en","features.logout.impl_AccountDeactivationView_Night_4_en",20413,],
+["features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en","features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en",20413,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_0_en","features.login.impl.accountprovider_AccountProviderView_Night_0_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_1_en","features.login.impl.accountprovider_AccountProviderView_Night_1_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_2_en","features.login.impl.accountprovider_AccountProviderView_Night_2_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_3_en","features.login.impl.accountprovider_AccountProviderView_Night_3_en",0,],
-["libraries.accountselect.impl_AccountSelectView_Day_0_en","libraries.accountselect.impl_AccountSelectView_Night_0_en",20412,],
-["libraries.accountselect.impl_AccountSelectView_Day_1_en","libraries.accountselect.impl_AccountSelectView_Night_1_en",20412,],
+["libraries.accountselect.impl_AccountSelectView_Day_0_en","libraries.accountselect.impl_AccountSelectView_Night_0_en",20413,],
+["libraries.accountselect.impl_AccountSelectView_Day_1_en","libraries.accountselect.impl_AccountSelectView_Night_1_en",20413,],
 ["features.messages.impl.actionlist_ActionListViewContent_Day_0_en","features.messages.impl.actionlist_ActionListViewContent_Night_0_en",0,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_10_en","features.messages.impl.actionlist_ActionListViewContent_Night_10_en",20412,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_11_en","features.messages.impl.actionlist_ActionListViewContent_Night_11_en",20412,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_12_en","features.messages.impl.actionlist_ActionListViewContent_Night_12_en",20412,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_10_en","features.messages.impl.actionlist_ActionListViewContent_Night_10_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_11_en","features.messages.impl.actionlist_ActionListViewContent_Night_11_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_12_en","features.messages.impl.actionlist_ActionListViewContent_Night_12_en",20413,],
 ["features.messages.impl.actionlist_ActionListViewContent_Day_1_en","features.messages.impl.actionlist_ActionListViewContent_Night_1_en",0,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_2_en","features.messages.impl.actionlist_ActionListViewContent_Night_2_en",20412,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_3_en","features.messages.impl.actionlist_ActionListViewContent_Night_3_en",20412,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_4_en","features.messages.impl.actionlist_ActionListViewContent_Night_4_en",20412,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_5_en","features.messages.impl.actionlist_ActionListViewContent_Night_5_en",20412,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_6_en","features.messages.impl.actionlist_ActionListViewContent_Night_6_en",20412,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_7_en","features.messages.impl.actionlist_ActionListViewContent_Night_7_en",20412,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_8_en","features.messages.impl.actionlist_ActionListViewContent_Night_8_en",20412,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_9_en","features.messages.impl.actionlist_ActionListViewContent_Night_9_en",20412,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_0_en","features.createroom.impl.addpeople_AddPeopleView_Night_0_en",20412,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_1_en","features.createroom.impl.addpeople_AddPeopleView_Night_1_en",20412,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_2_en","features.createroom.impl.addpeople_AddPeopleView_Night_2_en",20412,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_3_en","features.createroom.impl.addpeople_AddPeopleView_Night_3_en",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en","",20412,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en","",20412,],
-["libraries.designsystem.components.dialogs_AlertDialogContent_Dialogs_en","",20412,],
-["libraries.designsystem.components.dialogs_AlertDialog_Day_0_en","libraries.designsystem.components.dialogs_AlertDialog_Night_0_en",20412,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_2_en","features.messages.impl.actionlist_ActionListViewContent_Night_2_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_3_en","features.messages.impl.actionlist_ActionListViewContent_Night_3_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_4_en","features.messages.impl.actionlist_ActionListViewContent_Night_4_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_5_en","features.messages.impl.actionlist_ActionListViewContent_Night_5_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_6_en","features.messages.impl.actionlist_ActionListViewContent_Night_6_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_7_en","features.messages.impl.actionlist_ActionListViewContent_Night_7_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_8_en","features.messages.impl.actionlist_ActionListViewContent_Night_8_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_9_en","features.messages.impl.actionlist_ActionListViewContent_Night_9_en",20413,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_0_en","features.createroom.impl.addpeople_AddPeopleView_Night_0_en",20413,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_1_en","features.createroom.impl.addpeople_AddPeopleView_Night_1_en",20413,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_2_en","features.createroom.impl.addpeople_AddPeopleView_Night_2_en",20413,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_3_en","features.createroom.impl.addpeople_AddPeopleView_Night_3_en",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en","",20413,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en","",20413,],
+["libraries.designsystem.components.dialogs_AlertDialogContent_Dialogs_en","",20413,],
+["libraries.designsystem.components.dialogs_AlertDialog_Day_0_en","libraries.designsystem.components.dialogs_AlertDialog_Night_0_en",20413,],
 ["libraries.designsystem.theme.components_AllIcons_Icons_en","",0,],
-["features.analytics.impl_AnalyticsOptInView_Day_0_en","features.analytics.impl_AnalyticsOptInView_Night_0_en",20412,],
-["features.analytics.impl_AnalyticsOptInView_Day_1_en","features.analytics.impl_AnalyticsOptInView_Night_1_en",20412,],
-["features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en",20412,],
-["features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en",20412,],
-["features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en","features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en",20412,],
+["features.analytics.impl_AnalyticsOptInView_Day_0_en","features.analytics.impl_AnalyticsOptInView_Night_0_en",20413,],
+["features.analytics.impl_AnalyticsOptInView_Day_1_en","features.analytics.impl_AnalyticsOptInView_Night_1_en",20413,],
+["features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en",20413,],
+["features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en",20413,],
+["features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en","features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en",20413,],
 ["libraries.designsystem.components_Announcement_Day_0_en","libraries.designsystem.components_Announcement_Night_0_en",0,],
-["services.apperror.impl_AppErrorView_Day_0_en","services.apperror.impl_AppErrorView_Night_0_en",20412,],
+["services.apperror.impl_AppErrorView_Day_0_en","services.apperror.impl_AppErrorView_Night_0_en",20413,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_0_en","libraries.designsystem.components.async_AsyncActionView_Night_0_en",0,],
-["libraries.designsystem.components.async_AsyncActionView_Day_1_en","libraries.designsystem.components.async_AsyncActionView_Night_1_en",20412,],
+["libraries.designsystem.components.async_AsyncActionView_Day_1_en","libraries.designsystem.components.async_AsyncActionView_Night_1_en",20413,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_2_en","libraries.designsystem.components.async_AsyncActionView_Night_2_en",0,],
-["libraries.designsystem.components.async_AsyncActionView_Day_3_en","libraries.designsystem.components.async_AsyncActionView_Night_3_en",20412,],
+["libraries.designsystem.components.async_AsyncActionView_Day_3_en","libraries.designsystem.components.async_AsyncActionView_Night_3_en",20413,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_4_en","libraries.designsystem.components.async_AsyncActionView_Night_4_en",0,],
-["libraries.designsystem.components.async_AsyncFailure_Day_0_en","libraries.designsystem.components.async_AsyncFailure_Night_0_en",20412,],
+["libraries.designsystem.components.async_AsyncFailure_Day_0_en","libraries.designsystem.components.async_AsyncFailure_Night_0_en",20413,],
 ["libraries.designsystem.components.async_AsyncIndicatorFailure_Day_0_en","libraries.designsystem.components.async_AsyncIndicatorFailure_Night_0_en",0,],
 ["libraries.designsystem.components.async_AsyncIndicatorLoading_Day_0_en","libraries.designsystem.components.async_AsyncIndicatorLoading_Night_0_en",0,],
 ["libraries.designsystem.components.async_AsyncLoading_Day_0_en","libraries.designsystem.components.async_AsyncLoading_Night_0_en",0,],
-["features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en","features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en",20412,],
+["features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en","features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en",20413,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_0_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_0_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_1_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_1_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_2_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_2_en",0,],
@@ -84,19 +84,19 @@ export const screenshots = [
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_6_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_6_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_7_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_7_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_8_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_8_en",0,],
-["features.messages.impl.attachments.preview_AttachmentsView_0_en","",20412,],
-["features.messages.impl.attachments.preview_AttachmentsView_1_en","",20412,],
-["features.messages.impl.attachments.preview_AttachmentsView_2_en","",20412,],
-["features.messages.impl.attachments.preview_AttachmentsView_3_en","",20412,],
-["features.messages.impl.attachments.preview_AttachmentsView_4_en","",20412,],
-["features.messages.impl.attachments.preview_AttachmentsView_5_en","",20412,],
-["features.messages.impl.attachments.preview_AttachmentsView_6_en","",20412,],
-["features.messages.impl.attachments.preview_AttachmentsView_7_en","",20412,],
-["features.messages.impl.attachments.preview_AttachmentsView_8_en","",20412,],
+["features.messages.impl.attachments.preview_AttachmentsView_0_en","",20413,],
+["features.messages.impl.attachments.preview_AttachmentsView_1_en","",20413,],
+["features.messages.impl.attachments.preview_AttachmentsView_2_en","",20413,],
+["features.messages.impl.attachments.preview_AttachmentsView_3_en","",20413,],
+["features.messages.impl.attachments.preview_AttachmentsView_4_en","",20413,],
+["features.messages.impl.attachments.preview_AttachmentsView_5_en","",20413,],
+["features.messages.impl.attachments.preview_AttachmentsView_6_en","",20413,],
+["features.messages.impl.attachments.preview_AttachmentsView_7_en","",20413,],
+["features.messages.impl.attachments.preview_AttachmentsView_8_en","",20413,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_1_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_2_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_2_en",0,],
-["libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en","libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en",20412,],
+["libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en","libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en",20413,],
 ["libraries.designsystem.components.avatar.internal_AvatarCluster_Avatars_en","",0,],
 ["libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Day_0_en","libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Night_0_en",0,],
 ["libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Day_1_en","libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Night_1_en",0,],
@@ -123,22 +123,22 @@ export const screenshots = [
 ["libraries.designsystem.modifiers_BackgroundVerticalGradientDisabled_Day_0_en","libraries.designsystem.modifiers_BackgroundVerticalGradientDisabled_Night_0_en",0,],
 ["libraries.designsystem.modifiers_BackgroundVerticalGradient_Day_0_en","libraries.designsystem.modifiers_BackgroundVerticalGradient_Night_0_en",0,],
 ["libraries.designsystem.components_Badge_Day_0_en","libraries.designsystem.components_Badge_Night_0_en",0,],
-["features.home.impl.components_BatteryOptimizationBanner_Day_0_en","features.home.impl.components_BatteryOptimizationBanner_Night_0_en",20412,],
+["features.home.impl.components_BatteryOptimizationBanner_Day_0_en","features.home.impl.components_BatteryOptimizationBanner_Night_0_en",20413,],
 ["libraries.designsystem.atomic.atoms_BetaLabel_Day_0_en","libraries.designsystem.atomic.atoms_BetaLabel_Night_0_en",0,],
 ["libraries.designsystem.components_BigIcon_Day_0_en","libraries.designsystem.components_BigIcon_Night_0_en",0,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en",20412,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en",20412,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en",20412,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en",20412,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en",20412,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en",20412,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en",20412,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en",20413,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en",20413,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en",20413,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en",20413,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en",20413,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en",20413,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en",20413,],
 ["libraries.designsystem.theme.components_BottomSheetDragHandle_Day_0_en","libraries.designsystem.theme.components_BottomSheetDragHandle_Night_0_en",0,],
-["features.rageshake.impl.bugreport_BugReportViewDay_0_en","",20412,],
-["features.rageshake.impl.bugreport_BugReportViewDay_1_en","",20412,],
-["features.rageshake.impl.bugreport_BugReportViewDay_2_en","",20412,],
-["features.rageshake.impl.bugreport_BugReportViewDay_3_en","",20412,],
-["features.rageshake.impl.bugreport_BugReportViewDay_4_en","",20412,],
+["features.rageshake.impl.bugreport_BugReportViewDay_0_en","",20413,],
+["features.rageshake.impl.bugreport_BugReportViewDay_1_en","",20413,],
+["features.rageshake.impl.bugreport_BugReportViewDay_2_en","",20413,],
+["features.rageshake.impl.bugreport_BugReportViewDay_3_en","",20413,],
+["features.rageshake.impl.bugreport_BugReportViewDay_4_en","",20413,],
 ["features.rageshake.impl.bugreport_BugReportViewNight_0_en","",0,],
 ["features.rageshake.impl.bugreport_BugReportViewNight_1_en","",0,],
 ["features.rageshake.impl.bugreport_BugReportViewNight_2_en","",0,],
@@ -148,132 +148,133 @@ export const screenshots = [
 ["libraries.designsystem.atomic.molecules_ButtonRowMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ButtonRowMolecule_Night_0_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_0_en","features.messages.impl.timeline.components_CallMenuItem_Night_0_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_1_en","features.messages.impl.timeline.components_CallMenuItem_Night_1_en",0,],
-["features.messages.impl.timeline.components_CallMenuItem_Day_2_en","features.messages.impl.timeline.components_CallMenuItem_Night_2_en",20412,],
-["features.messages.impl.timeline.components_CallMenuItem_Day_3_en","features.messages.impl.timeline.components_CallMenuItem_Night_3_en",20412,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_2_en","features.messages.impl.timeline.components_CallMenuItem_Night_2_en",20413,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_3_en","features.messages.impl.timeline.components_CallMenuItem_Night_3_en",20413,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_4_en","features.messages.impl.timeline.components_CallMenuItem_Night_4_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_5_en","features.messages.impl.timeline.components_CallMenuItem_Night_5_en",0,],
 ["features.call.impl.ui_CallScreenView_Day_0_en","features.call.impl.ui_CallScreenView_Night_0_en",0,],
-["features.call.impl.ui_CallScreenView_Day_1_en","features.call.impl.ui_CallScreenView_Night_1_en",20412,],
-["features.call.impl.ui_CallScreenView_Day_2_en","features.call.impl.ui_CallScreenView_Night_2_en",20412,],
-["features.call.impl.ui_CallScreenView_Day_3_en","features.call.impl.ui_CallScreenView_Night_3_en",20412,],
-["libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en","libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en",20412,],
-["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en",20412,],
-["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_0_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en",20412,],
+["features.call.impl.ui_CallScreenView_Day_1_en","features.call.impl.ui_CallScreenView_Night_1_en",20413,],
+["features.call.impl.ui_CallScreenView_Day_2_en","features.call.impl.ui_CallScreenView_Night_2_en",20413,],
+["features.call.impl.ui_CallScreenView_Day_3_en","features.call.impl.ui_CallScreenView_Night_3_en",20413,],
+["libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en","libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en",20413,],
+["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en",20413,],
+["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_0_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en",20416,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en",20413,],
 ["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_5_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_5_en",0,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en",20412,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en",20412,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en",20412,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en",20412,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en",20412,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en",20412,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en",20412,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en",20413,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en",20413,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en",20413,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en",20413,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en",20413,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en",20413,],
 ["features.login.impl.changeserver_ChangeServerView_Day_0_en","features.login.impl.changeserver_ChangeServerView_Night_0_en",0,],
-["features.login.impl.changeserver_ChangeServerView_Day_1_en","features.login.impl.changeserver_ChangeServerView_Night_1_en",20412,],
-["features.login.impl.changeserver_ChangeServerView_Day_2_en","features.login.impl.changeserver_ChangeServerView_Night_2_en",20412,],
-["features.login.impl.changeserver_ChangeServerView_Day_3_en","features.login.impl.changeserver_ChangeServerView_Night_3_en",20412,],
-["features.login.impl.changeserver_ChangeServerView_Day_4_en","features.login.impl.changeserver_ChangeServerView_Night_4_en",20412,],
-["features.login.impl.changeserver_ChangeServerView_Day_5_en","features.login.impl.changeserver_ChangeServerView_Night_5_en",20412,],
+["features.login.impl.changeserver_ChangeServerView_Day_1_en","features.login.impl.changeserver_ChangeServerView_Night_1_en",20413,],
+["features.login.impl.changeserver_ChangeServerView_Day_2_en","features.login.impl.changeserver_ChangeServerView_Night_2_en",20413,],
+["features.login.impl.changeserver_ChangeServerView_Day_3_en","features.login.impl.changeserver_ChangeServerView_Night_3_en",20413,],
+["features.login.impl.changeserver_ChangeServerView_Day_4_en","features.login.impl.changeserver_ChangeServerView_Night_4_en",20413,],
+["features.login.impl.changeserver_ChangeServerView_Day_5_en","features.login.impl.changeserver_ChangeServerView_Night_5_en",20413,],
 ["libraries.matrix.ui.components_CheckableResolvedUserRow_en","",0,],
-["libraries.matrix.ui.components_CheckableUnresolvedUserRow_en","",20412,],
+["libraries.matrix.ui.components_CheckableUnresolvedUserRow_en","",20413,],
 ["libraries.designsystem.theme.components_Checkboxes_Toggles_en","",0,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en",20412,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en",20412,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en",20412,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en",20412,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en",20412,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en",20412,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en",20412,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_4_en",20412,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en",20413,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en",20413,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en",20413,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en",20413,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en",20413,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en",20413,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en",20413,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_4_en",20413,],
 ["libraries.designsystem.theme.components_CircularProgressIndicator_Progress_Indicators_en","",0,],
 ["libraries.designsystem.components_ClickableLinkText_Text_en","",0,],
 ["libraries.designsystem.theme_ColorAliases_Day_0_en","libraries.designsystem.theme_ColorAliases_Night_0_en",0,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en",20412,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_1_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_1_en",20412,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_2_en",20412,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_3_en",20412,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_4_en",20412,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_5_en",20412,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_6_en",20412,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_7_en",20412,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_8_en",20412,],
-["libraries.textcomposer_ComposerModeView_Day_0_en","libraries.textcomposer_ComposerModeView_Night_0_en",20412,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en",20413,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_1_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_1_en",20413,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_2_en",20413,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_3_en",20413,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_4_en",20413,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_5_en",20413,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_6_en",20413,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_7_en",20413,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_8_en",20413,],
+["libraries.textcomposer_ComposerModeView_Day_0_en","libraries.textcomposer_ComposerModeView_Night_0_en",20413,],
 ["libraries.textcomposer_ComposerModeView_Day_1_en","libraries.textcomposer_ComposerModeView_Night_1_en",0,],
 ["libraries.textcomposer_ComposerModeView_Day_2_en","libraries.textcomposer_ComposerModeView_Night_2_en",0,],
 ["libraries.textcomposer_ComposerModeView_Day_3_en","libraries.textcomposer_ComposerModeView_Night_3_en",0,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en","",20412,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en","",20412,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en",20412,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en",20412,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en",20412,],
-["features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en","features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en",20412,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en","",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en","",20413,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en",20413,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en",20413,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en",20413,],
+["features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en","features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en",20413,],
 ["libraries.designsystem.components.dialogs_ConfirmationDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_ConfirmationDialog_Day_0_en","libraries.designsystem.components.dialogs_ConfirmationDialog_Night_0_en",0,],
 ["features.networkmonitor.api.ui_ConnectivityIndicator_Day_0_en","features.networkmonitor.api.ui_ConnectivityIndicator_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_CounterAtom_Day_0_en","libraries.designsystem.atomic.atoms_CounterAtom_Night_0_en",0,],
-["features.rageshake.api.crash_CrashDetectionView_Day_0_en","features.rageshake.api.crash_CrashDetectionView_Night_0_en",20412,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_0_en","features.login.impl.screens.createaccount_CreateAccountView_Night_0_en",20412,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_1_en","features.login.impl.screens.createaccount_CreateAccountView_Night_1_en",20412,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_2_en","features.login.impl.screens.createaccount_CreateAccountView_Night_2_en",20412,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_3_en","features.login.impl.screens.createaccount_CreateAccountView_Night_3_en",20412,],
-["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en",20412,],
-["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en",20412,],
-["features.poll.impl.create_CreatePollView_Day_0_en","features.poll.impl.create_CreatePollView_Night_0_en",20412,],
-["features.poll.impl.create_CreatePollView_Day_1_en","features.poll.impl.create_CreatePollView_Night_1_en",20412,],
-["features.poll.impl.create_CreatePollView_Day_2_en","features.poll.impl.create_CreatePollView_Night_2_en",20412,],
-["features.poll.impl.create_CreatePollView_Day_3_en","features.poll.impl.create_CreatePollView_Night_3_en",20412,],
-["features.poll.impl.create_CreatePollView_Day_4_en","features.poll.impl.create_CreatePollView_Night_4_en",20412,],
-["features.poll.impl.create_CreatePollView_Day_5_en","features.poll.impl.create_CreatePollView_Night_5_en",20412,],
-["features.poll.impl.create_CreatePollView_Day_6_en","features.poll.impl.create_CreatePollView_Night_6_en",20412,],
-["features.poll.impl.create_CreatePollView_Day_7_en","features.poll.impl.create_CreatePollView_Night_7_en",20412,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_0_en","",20412,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_1_en","",20412,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_2_en","",20412,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_3_en","",20412,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_4_en","",20412,],
+["features.rageshake.api.crash_CrashDetectionView_Day_0_en","features.rageshake.api.crash_CrashDetectionView_Night_0_en",20413,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_0_en","features.login.impl.screens.createaccount_CreateAccountView_Night_0_en",20413,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_1_en","features.login.impl.screens.createaccount_CreateAccountView_Night_1_en",20413,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_2_en","features.login.impl.screens.createaccount_CreateAccountView_Night_2_en",20413,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_3_en","features.login.impl.screens.createaccount_CreateAccountView_Night_3_en",20413,],
+["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en",20413,],
+["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en",20413,],
+["features.poll.impl.create_CreatePollView_Day_0_en","features.poll.impl.create_CreatePollView_Night_0_en",20413,],
+["features.poll.impl.create_CreatePollView_Day_1_en","features.poll.impl.create_CreatePollView_Night_1_en",20413,],
+["features.poll.impl.create_CreatePollView_Day_2_en","features.poll.impl.create_CreatePollView_Night_2_en",20413,],
+["features.poll.impl.create_CreatePollView_Day_3_en","features.poll.impl.create_CreatePollView_Night_3_en",20413,],
+["features.poll.impl.create_CreatePollView_Day_4_en","features.poll.impl.create_CreatePollView_Night_4_en",20413,],
+["features.poll.impl.create_CreatePollView_Day_5_en","features.poll.impl.create_CreatePollView_Night_5_en",20413,],
+["features.poll.impl.create_CreatePollView_Day_6_en","features.poll.impl.create_CreatePollView_Night_6_en",20413,],
+["features.poll.impl.create_CreatePollView_Day_7_en","features.poll.impl.create_CreatePollView_Night_7_en",20413,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_0_en","",20413,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_1_en","",20413,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_2_en","",20413,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_3_en","",20413,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_4_en","",20413,],
 ["libraries.mediaviewer.impl.gallery.ui_DateItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_DateItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_DateItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_DateItemView_Night_1_en",0,],
-["libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en","",20412,],
-["libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en","",20412,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en",20412,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en",20412,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en",20412,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en",20412,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en",20412,],
+["libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en","",20413,],
+["libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en","",20413,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en",20413,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en",20413,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en",20413,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en",20413,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en",20413,],
 ["features.logout.impl.direct_DefaultDirectLogoutView_Day_0_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_0_en",0,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_1_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_1_en",20412,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_2_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_2_en",20412,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_3_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_3_en",20412,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_1_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_1_en",20413,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_2_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_2_en",20413,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_3_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_3_en",20413,],
 ["features.logout.impl.direct_DefaultDirectLogoutView_Day_4_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_4_en",0,],
-["features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en","features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en",20412,],
+["features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en","features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en",20413,],
 ["features.licenses.impl.details_DependenciesDetailsView_Day_0_en","features.licenses.impl.details_DependenciesDetailsView_Night_0_en",0,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_0_en","features.licenses.impl.list_DependencyLicensesListView_Night_0_en",20412,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_1_en","features.licenses.impl.list_DependencyLicensesListView_Night_1_en",20412,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_2_en","features.licenses.impl.list_DependencyLicensesListView_Night_2_en",20412,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_3_en","features.licenses.impl.list_DependencyLicensesListView_Night_3_en",20412,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_0_en","features.preferences.impl.developer_DeveloperSettingsView_Night_0_en",20412,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_1_en","features.preferences.impl.developer_DeveloperSettingsView_Night_1_en",20412,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_2_en","features.preferences.impl.developer_DeveloperSettingsView_Night_2_en",20412,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_3_en","features.preferences.impl.developer_DeveloperSettingsView_Night_3_en",20412,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_0_en","features.licenses.impl.list_DependencyLicensesListView_Night_0_en",20413,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_1_en","features.licenses.impl.list_DependencyLicensesListView_Night_1_en",20413,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_2_en","features.licenses.impl.list_DependencyLicensesListView_Night_2_en",20413,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_3_en","features.licenses.impl.list_DependencyLicensesListView_Night_3_en",20413,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_0_en","features.preferences.impl.developer_DeveloperSettingsView_Night_0_en",20413,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_1_en","features.preferences.impl.developer_DeveloperSettingsView_Night_1_en",20413,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_2_en","features.preferences.impl.developer_DeveloperSettingsView_Night_2_en",20413,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_3_en","features.preferences.impl.developer_DeveloperSettingsView_Night_3_en",20413,],
 ["libraries.designsystem.theme.components_DialogWithDestructiveButton_Dialog_with_destructive_button_Dialogs_en","",0,],
 ["libraries.designsystem.theme.components_DialogWithOnlyMessageAndOkButton_Dialog_with_only_message_and_ok_button_Dialogs_en","",0,],
 ["libraries.designsystem.theme.components_DialogWithThirdButton_Dialog_with_third_button_Dialogs_en","",0,],
@@ -288,18 +289,18 @@ export const screenshots = [
 ["libraries.designsystem.text_DpScale_1_0f__en","",0,],
 ["libraries.designsystem.text_DpScale_1_5f__en","",0,],
 ["libraries.designsystem.theme.components_DropdownMenuItem_Menus_en","",0,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en",20412,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en",20412,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en",20412,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en",20412,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en",20412,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en",20412,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en",20412,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en",20412,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en",20412,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en",20412,],
-["features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en",20412,],
-["features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en",20412,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en",20413,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en",20413,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en",20413,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en",20413,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en",20413,],
+["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en",20413,],
+["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en",20413,],
+["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en",20413,],
+["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en",20413,],
+["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en",20413,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en",20413,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en",20413,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_0_en","libraries.matrix.ui.components_EditableAvatarView_Night_0_en",0,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_1_en","libraries.matrix.ui.components_EditableAvatarView_Night_1_en",0,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_2_en","libraries.matrix.ui.components_EditableAvatarView_Night_2_en",0,],
@@ -310,14 +311,14 @@ export const screenshots = [
 ["libraries.designsystem.atomic.atoms_ElementLogoAtomMediumNoBlurShadow_Day_0_en","libraries.designsystem.atomic.atoms_ElementLogoAtomMediumNoBlurShadow_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_ElementLogoAtomMedium_Day_0_en","libraries.designsystem.atomic.atoms_ElementLogoAtomMedium_Night_0_en",0,],
 ["features.messages.impl.timeline.components.customreaction_EmojiItem_Day_0_en","features.messages.impl.timeline.components.customreaction_EmojiItem_Night_0_en",0,],
-["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_0_en",20412,],
-["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en",20412,],
+["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_0_en",20413,],
+["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en",20413,],
 ["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_2_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_2_en",0,],
 ["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_3_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_3_en",0,],
 ["libraries.ui.common.nodes_EmptyView_Day_0_en","libraries.ui.common.nodes_EmptyView_Night_0_en",0,],
-["libraries.designsystem.components.dialogs_ErrorDialogContent_Dialogs_en","",20412,],
-["libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Night_0_en",20412,],
-["libraries.designsystem.components.dialogs_ErrorDialog_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialog_Night_0_en",20412,],
+["libraries.designsystem.components.dialogs_ErrorDialogContent_Dialogs_en","",20413,],
+["libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Night_0_en",20413,],
+["libraries.designsystem.components.dialogs_ErrorDialog_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialog_Night_0_en",20413,],
 ["features.messages.impl.timeline.debug_EventDebugInfoView_Day_0_en","features.messages.impl.timeline.debug_EventDebugInfoView_Night_0_en",0,],
 ["libraries.designsystem.components_ExpandableBottomSheetLayout_en","",0,],
 ["libraries.featureflag.ui_FeatureListView_Day_0_en","libraries.featureflag.ui_FeatureListView_Night_0_en",0,],
@@ -336,43 +337,43 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_FloatingActionButton_Floating_Action_Buttons_en","",0,],
 ["libraries.designsystem.atomic.pages_FlowStepPage_Day_0_en","libraries.designsystem.atomic.pages_FlowStepPage_Night_0_en",0,],
 ["features.messages.impl.timeline.focus_FocusRequestStateView_Day_0_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_0_en",0,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_1_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_1_en",20412,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_2_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_2_en",20412,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_3_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_3_en",20412,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_1_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_1_en",20413,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_2_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_2_en",20413,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_3_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_3_en",20413,],
 ["features.messages.impl.timeline.components_FocusedEvent_Day_0_en","features.messages.impl.timeline.components_FocusedEvent_Night_0_en",0,],
 ["libraries.textcomposer.components_FormattingOption_Day_0_en","libraries.textcomposer.components_FormattingOption_Night_0_en",0,],
 ["features.forward.impl_ForwardMessagesView_Day_0_en","features.forward.impl_ForwardMessagesView_Night_0_en",0,],
 ["features.forward.impl_ForwardMessagesView_Day_1_en","features.forward.impl_ForwardMessagesView_Night_1_en",0,],
 ["features.forward.impl_ForwardMessagesView_Day_2_en","features.forward.impl_ForwardMessagesView_Night_2_en",0,],
-["features.forward.impl_ForwardMessagesView_Day_3_en","features.forward.impl_ForwardMessagesView_Night_3_en",20412,],
-["features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en","features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en",20412,],
+["features.forward.impl_ForwardMessagesView_Day_3_en","features.forward.impl_ForwardMessagesView_Night_3_en",20413,],
+["features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en","features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en",20413,],
 ["libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Day_0_en","libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Night_0_en",0,],
 ["libraries.designsystem.components.button_GradientFloatingActionButton_Day_0_en","libraries.designsystem.components.button_GradientFloatingActionButton_Night_0_en",0,],
 ["features.messages.impl.timeline.components.group_GroupHeaderView_Day_0_en","features.messages.impl.timeline.components.group_GroupHeaderView_Night_0_en",0,],
 ["libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Day_0_en","libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Night_0_en",0,],
 ["libraries.designsystem.atomic.pages_HeaderFooterPage_Day_0_en","libraries.designsystem.atomic.pages_HeaderFooterPage_Night_0_en",0,],
-["features.home.impl.spaces_HomeSpacesView_Day_0_en","features.home.impl.spaces_HomeSpacesView_Night_0_en",20412,],
-["features.home.impl.spaces_HomeSpacesView_Day_1_en","features.home.impl.spaces_HomeSpacesView_Night_1_en",20412,],
-["features.home.impl.components_HomeTopBarMultiAccount_Day_0_en","features.home.impl.components_HomeTopBarMultiAccount_Night_0_en",20412,],
-["features.home.impl.components_HomeTopBarWithIndicator_Day_0_en","features.home.impl.components_HomeTopBarWithIndicator_Night_0_en",20412,],
-["features.home.impl.components_HomeTopBar_Day_0_en","features.home.impl.components_HomeTopBar_Night_0_en",20412,],
+["features.home.impl.spaces_HomeSpacesView_Day_0_en","features.home.impl.spaces_HomeSpacesView_Night_0_en",20413,],
+["features.home.impl.spaces_HomeSpacesView_Day_1_en","features.home.impl.spaces_HomeSpacesView_Night_1_en",20413,],
+["features.home.impl.components_HomeTopBarMultiAccount_Day_0_en","features.home.impl.components_HomeTopBarMultiAccount_Night_0_en",20413,],
+["features.home.impl.components_HomeTopBarWithIndicator_Day_0_en","features.home.impl.components_HomeTopBarWithIndicator_Night_0_en",20413,],
+["features.home.impl.components_HomeTopBar_Day_0_en","features.home.impl.components_HomeTopBar_Night_0_en",20413,],
 ["features.home.impl_HomeViewA11y_en","",0,],
-["features.home.impl_HomeView_Day_0_en","features.home.impl_HomeView_Night_0_en",20412,],
-["features.home.impl_HomeView_Day_10_en","features.home.impl_HomeView_Night_10_en",20412,],
+["features.home.impl_HomeView_Day_0_en","features.home.impl_HomeView_Night_0_en",20413,],
+["features.home.impl_HomeView_Day_10_en","features.home.impl_HomeView_Night_10_en",20413,],
 ["features.home.impl_HomeView_Day_11_en","features.home.impl_HomeView_Night_11_en",0,],
 ["features.home.impl_HomeView_Day_12_en","features.home.impl_HomeView_Night_12_en",0,],
-["features.home.impl_HomeView_Day_13_en","features.home.impl_HomeView_Night_13_en",20412,],
-["features.home.impl_HomeView_Day_14_en","features.home.impl_HomeView_Night_14_en",20412,],
-["features.home.impl_HomeView_Day_15_en","features.home.impl_HomeView_Night_15_en",20412,],
-["features.home.impl_HomeView_Day_1_en","features.home.impl_HomeView_Night_1_en",20412,],
-["features.home.impl_HomeView_Day_2_en","features.home.impl_HomeView_Night_2_en",20412,],
-["features.home.impl_HomeView_Day_3_en","features.home.impl_HomeView_Night_3_en",20412,],
-["features.home.impl_HomeView_Day_4_en","features.home.impl_HomeView_Night_4_en",20412,],
-["features.home.impl_HomeView_Day_5_en","features.home.impl_HomeView_Night_5_en",20412,],
-["features.home.impl_HomeView_Day_6_en","features.home.impl_HomeView_Night_6_en",20412,],
-["features.home.impl_HomeView_Day_7_en","features.home.impl_HomeView_Night_7_en",20412,],
-["features.home.impl_HomeView_Day_8_en","features.home.impl_HomeView_Night_8_en",20412,],
-["features.home.impl_HomeView_Day_9_en","features.home.impl_HomeView_Night_9_en",20412,],
+["features.home.impl_HomeView_Day_13_en","features.home.impl_HomeView_Night_13_en",20413,],
+["features.home.impl_HomeView_Day_14_en","features.home.impl_HomeView_Night_14_en",20413,],
+["features.home.impl_HomeView_Day_15_en","features.home.impl_HomeView_Night_15_en",20413,],
+["features.home.impl_HomeView_Day_1_en","features.home.impl_HomeView_Night_1_en",20413,],
+["features.home.impl_HomeView_Day_2_en","features.home.impl_HomeView_Night_2_en",20413,],
+["features.home.impl_HomeView_Day_3_en","features.home.impl_HomeView_Night_3_en",20413,],
+["features.home.impl_HomeView_Day_4_en","features.home.impl_HomeView_Night_4_en",20413,],
+["features.home.impl_HomeView_Day_5_en","features.home.impl_HomeView_Night_5_en",20413,],
+["features.home.impl_HomeView_Day_6_en","features.home.impl_HomeView_Night_6_en",20413,],
+["features.home.impl_HomeView_Day_7_en","features.home.impl_HomeView_Night_7_en",20413,],
+["features.home.impl_HomeView_Day_8_en","features.home.impl_HomeView_Night_8_en",20413,],
+["features.home.impl_HomeView_Day_9_en","features.home.impl_HomeView_Night_9_en",20413,],
 ["libraries.designsystem.theme.components_HorizontalDivider_Dividers_en","",0,],
 ["libraries.designsystem.ruler_HorizontalRuler_Day_0_en","libraries.designsystem.ruler_HorizontalRuler_Night_0_en",0,],
 ["libraries.designsystem.theme.components_IconButton_Buttons_en","",0,],
@@ -385,8 +386,8 @@ export const screenshots = [
 ["appicon.enterprise_Icon_en","",0,],
 ["libraries.designsystem.icons_IconsOther_Day_0_en","libraries.designsystem.icons_IconsOther_Night_0_en",0,],
 ["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_0_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_0_en",0,],
-["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en",20412,],
-["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_2_en",20412,],
+["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en",20413,],
+["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_2_en",20413,],
 ["libraries.mediaviewer.impl.gallery.ui_ImageItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_ImageItemView_Night_0_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_0_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_0_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_10_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_10_en",0,],
@@ -394,109 +395,109 @@ export const screenshots = [
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_1_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_1_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_2_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_2_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_3_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_3_en",0,],
-["libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en",20412,],
+["libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en",20413,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_5_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_5_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_6_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_6_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_7_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_7_en",0,],
-["libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en",20412,],
+["libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en",20413,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_9_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_9_en",0,],
-["features.call.impl.ui_IncomingCallScreen_Day_0_en","features.call.impl.ui_IncomingCallScreen_Night_0_en",20412,],
+["features.call.impl.ui_IncomingCallScreen_Day_0_en","features.call.impl.ui_IncomingCallScreen_Night_0_en",20413,],
 ["features.verifysession.impl.incoming_IncomingVerificationViewA11y_en","",0,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en",20412,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en",20412,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en",20413,],
 ["libraries.designsystem.atomic.molecules_InfoListItemMolecule_Day_0_en","libraries.designsystem.atomic.molecules_InfoListItemMolecule_Night_0_en",0,],
 ["libraries.designsystem.atomic.organisms_InfoListOrganism_Day_0_en","libraries.designsystem.atomic.organisms_InfoListOrganism_Night_0_en",0,],
 ["libraries.matrix.ui.media_InitialsAvatarBitmapGenerator_Day_0_en","libraries.matrix.ui.media_InitialsAvatarBitmapGenerator_Night_0_en",0,],
-["features.call.impl.ui_InvalidAudioDeviceDialog_Day_0_en","features.call.impl.ui_InvalidAudioDeviceDialog_Night_0_en",20412,],
-["features.invitepeople.impl_InvitePeopleView_Day_0_en","features.invitepeople.impl_InvitePeopleView_Night_0_en",20412,],
-["features.invitepeople.impl_InvitePeopleView_Day_1_en","features.invitepeople.impl_InvitePeopleView_Night_1_en",20412,],
+["features.call.impl.ui_InvalidAudioDeviceDialog_Day_0_en","features.call.impl.ui_InvalidAudioDeviceDialog_Night_0_en",20413,],
+["features.invitepeople.impl_InvitePeopleView_Day_0_en","features.invitepeople.impl_InvitePeopleView_Night_0_en",20413,],
+["features.invitepeople.impl_InvitePeopleView_Day_1_en","features.invitepeople.impl_InvitePeopleView_Night_1_en",20413,],
 ["features.invitepeople.impl_InvitePeopleView_Day_2_en","features.invitepeople.impl_InvitePeopleView_Night_2_en",0,],
 ["features.invitepeople.impl_InvitePeopleView_Day_3_en","features.invitepeople.impl_InvitePeopleView_Night_3_en",0,],
-["features.invitepeople.impl_InvitePeopleView_Day_4_en","features.invitepeople.impl_InvitePeopleView_Night_4_en",20412,],
-["features.invitepeople.impl_InvitePeopleView_Day_5_en","features.invitepeople.impl_InvitePeopleView_Night_5_en",20412,],
-["features.invitepeople.impl_InvitePeopleView_Day_6_en","features.invitepeople.impl_InvitePeopleView_Night_6_en",20412,],
-["features.invitepeople.impl_InvitePeopleView_Day_7_en","features.invitepeople.impl_InvitePeopleView_Night_7_en",20412,],
+["features.invitepeople.impl_InvitePeopleView_Day_4_en","features.invitepeople.impl_InvitePeopleView_Night_4_en",20413,],
+["features.invitepeople.impl_InvitePeopleView_Day_5_en","features.invitepeople.impl_InvitePeopleView_Night_5_en",20413,],
+["features.invitepeople.impl_InvitePeopleView_Day_6_en","features.invitepeople.impl_InvitePeopleView_Night_6_en",20413,],
+["features.invitepeople.impl_InvitePeopleView_Day_7_en","features.invitepeople.impl_InvitePeopleView_Night_7_en",20413,],
 ["features.invitepeople.impl_InvitePeopleView_Day_8_en","features.invitepeople.impl_InvitePeopleView_Night_8_en",0,],
-["features.invitepeople.impl_InvitePeopleView_Day_9_en","features.invitepeople.impl_InvitePeopleView_Night_9_en",20412,],
-["libraries.matrix.ui.components_InviteSenderView_Day_0_en","libraries.matrix.ui.components_InviteSenderView_Night_0_en",20412,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en",20412,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_1_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_1_en",20412,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en",20412,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_3_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_3_en",20412,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en",20412,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en",20412,],
+["features.invitepeople.impl_InvitePeopleView_Day_9_en","features.invitepeople.impl_InvitePeopleView_Night_9_en",20413,],
+["libraries.matrix.ui.components_InviteSenderView_Day_0_en","libraries.matrix.ui.components_InviteSenderView_Night_0_en",20413,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en",20413,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_1_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_1_en",20413,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en",20413,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_3_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_3_en",20413,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en",20413,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en",20413,],
 ["features.joinroom.impl_JoinRoomView_Day_0_en","features.joinroom.impl_JoinRoomView_Night_0_en",0,],
-["features.joinroom.impl_JoinRoomView_Day_10_en","features.joinroom.impl_JoinRoomView_Night_10_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_11_en","features.joinroom.impl_JoinRoomView_Night_11_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_12_en","features.joinroom.impl_JoinRoomView_Night_12_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_13_en","features.joinroom.impl_JoinRoomView_Night_13_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_14_en","features.joinroom.impl_JoinRoomView_Night_14_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_15_en","features.joinroom.impl_JoinRoomView_Night_15_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_16_en","features.joinroom.impl_JoinRoomView_Night_16_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_1_en","features.joinroom.impl_JoinRoomView_Night_1_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_2_en","features.joinroom.impl_JoinRoomView_Night_2_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_3_en","features.joinroom.impl_JoinRoomView_Night_3_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_4_en","features.joinroom.impl_JoinRoomView_Night_4_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_5_en","features.joinroom.impl_JoinRoomView_Night_5_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_6_en","features.joinroom.impl_JoinRoomView_Night_6_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_7_en","features.joinroom.impl_JoinRoomView_Night_7_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_8_en","features.joinroom.impl_JoinRoomView_Night_8_en",20412,],
-["features.joinroom.impl_JoinRoomView_Day_9_en","features.joinroom.impl_JoinRoomView_Night_9_en",20412,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en",20412,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en",20412,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en",20412,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en",20412,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en",20412,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en",20412,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_0_en","features.knockrequests.impl.list_KnockRequestsListView_Night_0_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_10_en","features.knockrequests.impl.list_KnockRequestsListView_Night_10_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_1_en","features.knockrequests.impl.list_KnockRequestsListView_Night_1_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_2_en","features.knockrequests.impl.list_KnockRequestsListView_Night_2_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_3_en","features.knockrequests.impl.list_KnockRequestsListView_Night_3_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_4_en","features.knockrequests.impl.list_KnockRequestsListView_Night_4_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_5_en","features.knockrequests.impl.list_KnockRequestsListView_Night_5_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_6_en","features.knockrequests.impl.list_KnockRequestsListView_Night_6_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_7_en","features.knockrequests.impl.list_KnockRequestsListView_Night_7_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_8_en","features.knockrequests.impl.list_KnockRequestsListView_Night_8_en",20412,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_9_en","features.knockrequests.impl.list_KnockRequestsListView_Night_9_en",20412,],
+["features.joinroom.impl_JoinRoomView_Day_10_en","features.joinroom.impl_JoinRoomView_Night_10_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_11_en","features.joinroom.impl_JoinRoomView_Night_11_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_12_en","features.joinroom.impl_JoinRoomView_Night_12_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_13_en","features.joinroom.impl_JoinRoomView_Night_13_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_14_en","features.joinroom.impl_JoinRoomView_Night_14_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_15_en","features.joinroom.impl_JoinRoomView_Night_15_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_16_en","features.joinroom.impl_JoinRoomView_Night_16_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_1_en","features.joinroom.impl_JoinRoomView_Night_1_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_2_en","features.joinroom.impl_JoinRoomView_Night_2_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_3_en","features.joinroom.impl_JoinRoomView_Night_3_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_4_en","features.joinroom.impl_JoinRoomView_Night_4_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_5_en","features.joinroom.impl_JoinRoomView_Night_5_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_6_en","features.joinroom.impl_JoinRoomView_Night_6_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_7_en","features.joinroom.impl_JoinRoomView_Night_7_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_8_en","features.joinroom.impl_JoinRoomView_Night_8_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_9_en","features.joinroom.impl_JoinRoomView_Night_9_en",20413,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en",20413,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en",20413,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en",20413,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en",20413,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en",20413,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en",20413,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_0_en","features.knockrequests.impl.list_KnockRequestsListView_Night_0_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_10_en","features.knockrequests.impl.list_KnockRequestsListView_Night_10_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_1_en","features.knockrequests.impl.list_KnockRequestsListView_Night_1_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_2_en","features.knockrequests.impl.list_KnockRequestsListView_Night_2_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_3_en","features.knockrequests.impl.list_KnockRequestsListView_Night_3_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_4_en","features.knockrequests.impl.list_KnockRequestsListView_Night_4_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_5_en","features.knockrequests.impl.list_KnockRequestsListView_Night_5_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_6_en","features.knockrequests.impl.list_KnockRequestsListView_Night_6_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_7_en","features.knockrequests.impl.list_KnockRequestsListView_Night_7_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_8_en","features.knockrequests.impl.list_KnockRequestsListView_Night_8_en",20413,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_9_en","features.knockrequests.impl.list_KnockRequestsListView_Night_9_en",20413,],
 ["libraries.designsystem.components_LabelledCheckbox_Toggles_en","",0,],
-["features.preferences.impl.labs_LabsView_Day_0_en","features.preferences.impl.labs_LabsView_Night_0_en",20412,],
-["features.preferences.impl.labs_LabsView_Day_1_en","features.preferences.impl.labs_LabsView_Night_1_en",20412,],
+["features.preferences.impl.labs_LabsView_Day_0_en","features.preferences.impl.labs_LabsView_Night_0_en",20413,],
+["features.preferences.impl.labs_LabsView_Day_1_en","features.preferences.impl.labs_LabsView_Night_1_en",20413,],
 ["features.leaveroom.impl_LeaveRoomView_Day_0_en","features.leaveroom.impl_LeaveRoomView_Night_0_en",0,],
-["features.leaveroom.impl_LeaveRoomView_Day_1_en","features.leaveroom.impl_LeaveRoomView_Night_1_en",20412,],
-["features.leaveroom.impl_LeaveRoomView_Day_2_en","features.leaveroom.impl_LeaveRoomView_Night_2_en",20412,],
-["features.leaveroom.impl_LeaveRoomView_Day_3_en","features.leaveroom.impl_LeaveRoomView_Night_3_en",20412,],
-["features.leaveroom.impl_LeaveRoomView_Day_4_en","features.leaveroom.impl_LeaveRoomView_Night_4_en",20412,],
-["features.leaveroom.impl_LeaveRoomView_Day_5_en","features.leaveroom.impl_LeaveRoomView_Night_5_en",20412,],
-["features.leaveroom.impl_LeaveRoomView_Day_6_en","features.leaveroom.impl_LeaveRoomView_Night_6_en",20412,],
-["features.leaveroom.impl_LeaveRoomView_Day_7_en","features.leaveroom.impl_LeaveRoomView_Night_7_en",20412,],
-["features.space.impl.leave_LeaveSpaceView_Day_0_en","features.space.impl.leave_LeaveSpaceView_Night_0_en",20412,],
-["features.space.impl.leave_LeaveSpaceView_Day_1_en","features.space.impl.leave_LeaveSpaceView_Night_1_en",20412,],
-["features.space.impl.leave_LeaveSpaceView_Day_2_en","features.space.impl.leave_LeaveSpaceView_Night_2_en",20412,],
-["features.space.impl.leave_LeaveSpaceView_Day_3_en","features.space.impl.leave_LeaveSpaceView_Night_3_en",20412,],
-["features.space.impl.leave_LeaveSpaceView_Day_4_en","features.space.impl.leave_LeaveSpaceView_Night_4_en",20412,],
-["features.space.impl.leave_LeaveSpaceView_Day_5_en","features.space.impl.leave_LeaveSpaceView_Night_5_en",20412,],
-["features.space.impl.leave_LeaveSpaceView_Day_6_en","features.space.impl.leave_LeaveSpaceView_Night_6_en",20412,],
-["features.space.impl.leave_LeaveSpaceView_Day_7_en","features.space.impl.leave_LeaveSpaceView_Night_7_en",20412,],
-["features.space.impl.leave_LeaveSpaceView_Day_8_en","features.space.impl.leave_LeaveSpaceView_Night_8_en",20412,],
-["features.space.impl.leave_LeaveSpaceView_Day_9_en","features.space.impl.leave_LeaveSpaceView_Night_9_en",20412,],
+["features.leaveroom.impl_LeaveRoomView_Day_1_en","features.leaveroom.impl_LeaveRoomView_Night_1_en",20413,],
+["features.leaveroom.impl_LeaveRoomView_Day_2_en","features.leaveroom.impl_LeaveRoomView_Night_2_en",20413,],
+["features.leaveroom.impl_LeaveRoomView_Day_3_en","features.leaveroom.impl_LeaveRoomView_Night_3_en",20413,],
+["features.leaveroom.impl_LeaveRoomView_Day_4_en","features.leaveroom.impl_LeaveRoomView_Night_4_en",20413,],
+["features.leaveroom.impl_LeaveRoomView_Day_5_en","features.leaveroom.impl_LeaveRoomView_Night_5_en",20413,],
+["features.leaveroom.impl_LeaveRoomView_Day_6_en","features.leaveroom.impl_LeaveRoomView_Night_6_en",20413,],
+["features.leaveroom.impl_LeaveRoomView_Day_7_en","features.leaveroom.impl_LeaveRoomView_Night_7_en",20413,],
+["features.space.impl.leave_LeaveSpaceView_Day_0_en","features.space.impl.leave_LeaveSpaceView_Night_0_en",20413,],
+["features.space.impl.leave_LeaveSpaceView_Day_1_en","features.space.impl.leave_LeaveSpaceView_Night_1_en",20413,],
+["features.space.impl.leave_LeaveSpaceView_Day_2_en","features.space.impl.leave_LeaveSpaceView_Night_2_en",20413,],
+["features.space.impl.leave_LeaveSpaceView_Day_3_en","features.space.impl.leave_LeaveSpaceView_Night_3_en",20413,],
+["features.space.impl.leave_LeaveSpaceView_Day_4_en","features.space.impl.leave_LeaveSpaceView_Night_4_en",20413,],
+["features.space.impl.leave_LeaveSpaceView_Day_5_en","features.space.impl.leave_LeaveSpaceView_Night_5_en",20413,],
+["features.space.impl.leave_LeaveSpaceView_Day_6_en","features.space.impl.leave_LeaveSpaceView_Night_6_en",20413,],
+["features.space.impl.leave_LeaveSpaceView_Day_7_en","features.space.impl.leave_LeaveSpaceView_Night_7_en",20413,],
+["features.space.impl.leave_LeaveSpaceView_Day_8_en","features.space.impl.leave_LeaveSpaceView_Night_8_en",20413,],
+["features.space.impl.leave_LeaveSpaceView_Day_9_en","features.space.impl.leave_LeaveSpaceView_Night_9_en",20413,],
 ["libraries.designsystem.background_LightGradientBackground_Day_0_en","libraries.designsystem.background_LightGradientBackground_Night_0_en",0,],
 ["libraries.designsystem.theme.components_LinearProgressIndicator_Progress_Indicators_en","",0,],
 ["features.messages.impl.link_LinkView_Day_0_en","features.messages.impl.link_LinkView_Night_0_en",0,],
-["features.messages.impl.link_LinkView_Day_1_en","features.messages.impl.link_LinkView_Night_1_en",20412,],
+["features.messages.impl.link_LinkView_Day_1_en","features.messages.impl.link_LinkView_Night_1_en",20413,],
 ["libraries.designsystem.components.dialogs_ListDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_ListDialog_Day_0_en","libraries.designsystem.components.dialogs_ListDialog_Night_0_en",0,],
 ["libraries.designsystem.theme.components_ListItemPrimaryActionWithIcon_List_item_-_Primary_action_&_Icon_List_items_en","",0,],
@@ -551,38 +552,38 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_ListSupportingTextSmallPadding_List_supporting_text_-_small_padding_List_sections_en","",0,],
 ["libraries.textcomposer.components_LiveWaveformView_Day_0_en","libraries.textcomposer.components_LiveWaveformView_Night_0_en",0,],
 ["appnav.room.joined_LoadingRoomNodeView_Day_0_en","appnav.room.joined_LoadingRoomNodeView_Night_0_en",0,],
-["appnav.room.joined_LoadingRoomNodeView_Day_1_en","appnav.room.joined_LoadingRoomNodeView_Night_1_en",20412,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en",20412,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en",20412,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en",20412,],
+["appnav.room.joined_LoadingRoomNodeView_Day_1_en","appnav.room.joined_LoadingRoomNodeView_Night_1_en",20413,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en",20413,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en",20413,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en",20413,],
 ["appnav.loggedin_LoggedInView_Day_0_en","appnav.loggedin_LoggedInView_Night_0_en",0,],
-["appnav.loggedin_LoggedInView_Day_1_en","appnav.loggedin_LoggedInView_Night_1_en",20412,],
-["appnav.loggedin_LoggedInView_Day_2_en","appnav.loggedin_LoggedInView_Night_2_en",20412,],
-["appnav.loggedin_LoggedInView_Day_3_en","appnav.loggedin_LoggedInView_Night_3_en",20412,],
-["features.login.impl.login_LoginModeView_Day_0_en","features.login.impl.login_LoginModeView_Night_0_en",20412,],
-["features.login.impl.login_LoginModeView_Day_1_en","features.login.impl.login_LoginModeView_Night_1_en",20412,],
-["features.login.impl.login_LoginModeView_Day_2_en","features.login.impl.login_LoginModeView_Night_2_en",20412,],
-["features.login.impl.login_LoginModeView_Day_3_en","features.login.impl.login_LoginModeView_Night_3_en",20412,],
-["features.login.impl.login_LoginModeView_Day_4_en","features.login.impl.login_LoginModeView_Night_4_en",20412,],
-["features.login.impl.login_LoginModeView_Day_5_en","features.login.impl.login_LoginModeView_Night_5_en",20412,],
-["features.login.impl.login_LoginModeView_Day_6_en","features.login.impl.login_LoginModeView_Night_6_en",20412,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en",20412,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en",20412,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en",20412,],
-["features.logout.impl_LogoutView_Day_0_en","features.logout.impl_LogoutView_Night_0_en",20412,],
-["features.logout.impl_LogoutView_Day_10_en","features.logout.impl_LogoutView_Night_10_en",20412,],
-["features.logout.impl_LogoutView_Day_11_en","features.logout.impl_LogoutView_Night_11_en",20412,],
-["features.logout.impl_LogoutView_Day_1_en","features.logout.impl_LogoutView_Night_1_en",20412,],
-["features.logout.impl_LogoutView_Day_2_en","features.logout.impl_LogoutView_Night_2_en",20412,],
-["features.logout.impl_LogoutView_Day_3_en","features.logout.impl_LogoutView_Night_3_en",20412,],
-["features.logout.impl_LogoutView_Day_4_en","features.logout.impl_LogoutView_Night_4_en",20412,],
-["features.logout.impl_LogoutView_Day_5_en","features.logout.impl_LogoutView_Night_5_en",20412,],
-["features.logout.impl_LogoutView_Day_6_en","features.logout.impl_LogoutView_Night_6_en",20412,],
-["features.logout.impl_LogoutView_Day_7_en","features.logout.impl_LogoutView_Night_7_en",20412,],
-["features.logout.impl_LogoutView_Day_8_en","features.logout.impl_LogoutView_Night_8_en",20412,],
-["features.logout.impl_LogoutView_Day_9_en","features.logout.impl_LogoutView_Night_9_en",20412,],
+["appnav.loggedin_LoggedInView_Day_1_en","appnav.loggedin_LoggedInView_Night_1_en",20413,],
+["appnav.loggedin_LoggedInView_Day_2_en","appnav.loggedin_LoggedInView_Night_2_en",20413,],
+["appnav.loggedin_LoggedInView_Day_3_en","appnav.loggedin_LoggedInView_Night_3_en",20413,],
+["features.login.impl.login_LoginModeView_Day_0_en","features.login.impl.login_LoginModeView_Night_0_en",20413,],
+["features.login.impl.login_LoginModeView_Day_1_en","features.login.impl.login_LoginModeView_Night_1_en",20413,],
+["features.login.impl.login_LoginModeView_Day_2_en","features.login.impl.login_LoginModeView_Night_2_en",20413,],
+["features.login.impl.login_LoginModeView_Day_3_en","features.login.impl.login_LoginModeView_Night_3_en",20413,],
+["features.login.impl.login_LoginModeView_Day_4_en","features.login.impl.login_LoginModeView_Night_4_en",20413,],
+["features.login.impl.login_LoginModeView_Day_5_en","features.login.impl.login_LoginModeView_Night_5_en",20413,],
+["features.login.impl.login_LoginModeView_Day_6_en","features.login.impl.login_LoginModeView_Night_6_en",20413,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en",20413,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en",20413,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en",20413,],
+["features.logout.impl_LogoutView_Day_0_en","features.logout.impl_LogoutView_Night_0_en",20413,],
+["features.logout.impl_LogoutView_Day_10_en","features.logout.impl_LogoutView_Night_10_en",20413,],
+["features.logout.impl_LogoutView_Day_11_en","features.logout.impl_LogoutView_Night_11_en",20413,],
+["features.logout.impl_LogoutView_Day_1_en","features.logout.impl_LogoutView_Night_1_en",20413,],
+["features.logout.impl_LogoutView_Day_2_en","features.logout.impl_LogoutView_Night_2_en",20413,],
+["features.logout.impl_LogoutView_Day_3_en","features.logout.impl_LogoutView_Night_3_en",20413,],
+["features.logout.impl_LogoutView_Day_4_en","features.logout.impl_LogoutView_Night_4_en",20413,],
+["features.logout.impl_LogoutView_Day_5_en","features.logout.impl_LogoutView_Night_5_en",20413,],
+["features.logout.impl_LogoutView_Day_6_en","features.logout.impl_LogoutView_Night_6_en",20413,],
+["features.logout.impl_LogoutView_Day_7_en","features.logout.impl_LogoutView_Night_7_en",20413,],
+["features.logout.impl_LogoutView_Day_8_en","features.logout.impl_LogoutView_Night_8_en",20413,],
+["features.logout.impl_LogoutView_Day_9_en","features.logout.impl_LogoutView_Night_9_en",20413,],
 ["libraries.designsystem.components.button_MainActionButton_Buttons_en","",0,],
-["libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en","libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en",20412,],
+["libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en","libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en",20413,],
 ["libraries.textcomposer.components.markdown_MarkdownTextInput_Day_0_en","libraries.textcomposer.components.markdown_MarkdownTextInput_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Night_0_en",0,],
@@ -595,22 +596,22 @@ export const screenshots = [
 ["libraries.matrix.ui.components_MatrixUserRow_Day_1_en","libraries.matrix.ui.components_MatrixUserRow_Night_1_en",0,],
 ["libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en","libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en","libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_1_en",0,],
-["libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en",20412,],
-["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en",20412,],
+["libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en",20413,],
+["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en",20413,],
 ["libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_en","libraries.mediaviewer.impl.local.file_MediaFileView_Night_0_en",0,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en",20412,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en",20412,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en",20413,],
 ["libraries.mediaviewer.impl.local.image_MediaImageView_Day_0_en","libraries.mediaviewer.impl.local.image_MediaImageView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en","libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en","libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_1_en",0,],
@@ -618,14 +619,14 @@ export const screenshots = [
 ["libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en","libraries.mediaviewer.impl.local.video_MediaVideoView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_0_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_10_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_11_en","",20412,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_12_en","",20412,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_11_en","",20413,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_12_en","",20413,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_13_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_14_en","",20412,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_14_en","",20413,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_15_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_16_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_1_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_2_en","",20412,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_2_en","",20413,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_3_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_4_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_5_en","",0,],
@@ -639,7 +640,7 @@ export const screenshots = [
 ["libraries.textcomposer.mentions_MentionSpanTheme_Day_0_en","libraries.textcomposer.mentions_MentionSpanTheme_Night_0_en",0,],
 ["libraries.designsystem.theme.components.previews_Menu_Menus_en","",0,],
 ["features.messages.impl.messagecomposer_MessageComposerViewVoice_Day_0_en","features.messages.impl.messagecomposer_MessageComposerViewVoice_Night_0_en",0,],
-["features.messages.impl.messagecomposer_MessageComposerView_Day_0_en","features.messages.impl.messagecomposer_MessageComposerView_Night_0_en",20412,],
+["features.messages.impl.messagecomposer_MessageComposerView_Day_0_en","features.messages.impl.messagecomposer_MessageComposerView_Night_0_en",20413,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_0_en","features.messages.impl.timeline.components_MessageEventBubble_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_1_en","features.messages.impl.timeline.components_MessageEventBubble_Night_1_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_2_en","features.messages.impl.timeline.components_MessageEventBubble_Night_2_en",0,],
@@ -648,7 +649,7 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_5_en","features.messages.impl.timeline.components_MessageEventBubble_Night_5_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_6_en","features.messages.impl.timeline.components_MessageEventBubble_Night_6_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_7_en","features.messages.impl.timeline.components_MessageEventBubble_Night_7_en",0,],
-["features.messages.impl.timeline.components_MessageShieldView_Day_0_en","features.messages.impl.timeline.components_MessageShieldView_Night_0_en",20412,],
+["features.messages.impl.timeline.components_MessageShieldView_Day_0_en","features.messages.impl.timeline.components_MessageShieldView_Night_0_en",20413,],
 ["features.messages.impl.timeline.components_MessageStateEventContainer_Day_0_en","features.messages.impl.timeline.components_MessageStateEventContainer_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButtonAdd_Day_0_en","features.messages.impl.timeline.components_MessagesReactionButtonAdd_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButtonExtra_Day_0_en","features.messages.impl.timeline.components_MessagesReactionButtonExtra_Night_0_en",0,],
@@ -656,137 +657,137 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_1_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_1_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_2_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_2_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_3_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_3_en",0,],
-["features.messages.impl.topbars_MessagesViewTopBar_Day_0_en","features.messages.impl.topbars_MessagesViewTopBar_Night_0_en",20412,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en",20412,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en",20412,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en",20412,],
-["features.messages.impl_MessagesView_Day_0_en","features.messages.impl_MessagesView_Night_0_en",20412,],
-["features.messages.impl_MessagesView_Day_1_en","features.messages.impl_MessagesView_Night_1_en",20412,],
-["features.messages.impl_MessagesView_Day_2_en","features.messages.impl_MessagesView_Night_2_en",20412,],
-["features.messages.impl_MessagesView_Day_3_en","features.messages.impl_MessagesView_Night_3_en",20412,],
-["features.messages.impl_MessagesView_Day_4_en","features.messages.impl_MessagesView_Night_4_en",20412,],
-["features.messages.impl_MessagesView_Day_5_en","features.messages.impl_MessagesView_Night_5_en",20412,],
-["features.messages.impl_MessagesView_Day_6_en","features.messages.impl_MessagesView_Night_6_en",20412,],
-["features.messages.impl_MessagesView_Day_7_en","features.messages.impl_MessagesView_Night_7_en",20412,],
-["features.messages.impl_MessagesView_Day_8_en","features.messages.impl_MessagesView_Night_8_en",20412,],
-["features.messages.impl_MessagesView_Day_9_en","features.messages.impl_MessagesView_Night_9_en",20412,],
+["features.messages.impl.topbars_MessagesViewTopBar_Day_0_en","features.messages.impl.topbars_MessagesViewTopBar_Night_0_en",20413,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en",20413,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en",20413,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en",20413,],
+["features.messages.impl_MessagesView_Day_0_en","features.messages.impl_MessagesView_Night_0_en",20413,],
+["features.messages.impl_MessagesView_Day_1_en","features.messages.impl_MessagesView_Night_1_en",20413,],
+["features.messages.impl_MessagesView_Day_2_en","features.messages.impl_MessagesView_Night_2_en",20413,],
+["features.messages.impl_MessagesView_Day_3_en","features.messages.impl_MessagesView_Night_3_en",20413,],
+["features.messages.impl_MessagesView_Day_4_en","features.messages.impl_MessagesView_Night_4_en",20413,],
+["features.messages.impl_MessagesView_Day_5_en","features.messages.impl_MessagesView_Night_5_en",20413,],
+["features.messages.impl_MessagesView_Day_6_en","features.messages.impl_MessagesView_Night_6_en",20413,],
+["features.messages.impl_MessagesView_Day_7_en","features.messages.impl_MessagesView_Night_7_en",20413,],
+["features.messages.impl_MessagesView_Day_8_en","features.messages.impl_MessagesView_Night_8_en",20413,],
+["features.messages.impl_MessagesView_Day_9_en","features.messages.impl_MessagesView_Night_9_en",20413,],
 ["features.migration.impl_MigrationView_Day_0_en","features.migration.impl_MigrationView_Night_0_en",0,],
-["features.migration.impl_MigrationView_Day_1_en","features.migration.impl_MigrationView_Night_1_en",20412,],
+["features.migration.impl_MigrationView_Day_1_en","features.migration.impl_MigrationView_Night_1_en",20413,],
 ["libraries.designsystem.theme.components_ModalBottomSheetDark_Bottom_Sheets_en","",0,],
 ["libraries.designsystem.theme.components_ModalBottomSheetLight_Bottom_Sheets_en","",0,],
 ["appicon.element_MonochromeIcon_en","",0,],
-["features.preferences.impl.root_MultiAccountSection_Day_0_en","features.preferences.impl.root_MultiAccountSection_Night_0_en",20412,],
+["features.preferences.impl.root_MultiAccountSection_Day_0_en","features.preferences.impl.root_MultiAccountSection_Night_0_en",20413,],
 ["libraries.designsystem.components.dialogs_MultipleSelectionDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_MultipleSelectionDialog_Day_0_en","libraries.designsystem.components.dialogs_MultipleSelectionDialog_Night_0_en",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItemSelectedTrailingContent_Multiple_selection_List_item_-_selection_in_trailing_content_List_items_en","",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItemSelected_Multiple_selection_List_item_-_selection_in_supporting_text_List_items_en","",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItem_Multiple_selection_List_item_-_no_selection_List_items_en","",0,],
 ["libraries.designsystem.theme.components_NavigationBar_App_Bars_en","",0,],
-["features.home.impl.components_NewNotificationSoundBanner_Day_0_en","features.home.impl.components_NewNotificationSoundBanner_Night_0_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_0_en","features.preferences.impl.notifications_NotificationSettingsView_Night_0_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_10_en","features.preferences.impl.notifications_NotificationSettingsView_Night_10_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_11_en","features.preferences.impl.notifications_NotificationSettingsView_Night_11_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_12_en","features.preferences.impl.notifications_NotificationSettingsView_Night_12_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_13_en","features.preferences.impl.notifications_NotificationSettingsView_Night_13_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_1_en","features.preferences.impl.notifications_NotificationSettingsView_Night_1_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_2_en","features.preferences.impl.notifications_NotificationSettingsView_Night_2_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_3_en","features.preferences.impl.notifications_NotificationSettingsView_Night_3_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_4_en","features.preferences.impl.notifications_NotificationSettingsView_Night_4_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_5_en","features.preferences.impl.notifications_NotificationSettingsView_Night_5_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_6_en","features.preferences.impl.notifications_NotificationSettingsView_Night_6_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_7_en","features.preferences.impl.notifications_NotificationSettingsView_Night_7_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_8_en","features.preferences.impl.notifications_NotificationSettingsView_Night_8_en",20412,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_9_en","features.preferences.impl.notifications_NotificationSettingsView_Night_9_en",20412,],
-["features.ftue.impl.notifications_NotificationsOptInView_Day_0_en","features.ftue.impl.notifications_NotificationsOptInView_Night_0_en",20412,],
+["features.home.impl.components_NewNotificationSoundBanner_Day_0_en","features.home.impl.components_NewNotificationSoundBanner_Night_0_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_0_en","features.preferences.impl.notifications_NotificationSettingsView_Night_0_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_10_en","features.preferences.impl.notifications_NotificationSettingsView_Night_10_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_11_en","features.preferences.impl.notifications_NotificationSettingsView_Night_11_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_12_en","features.preferences.impl.notifications_NotificationSettingsView_Night_12_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_13_en","features.preferences.impl.notifications_NotificationSettingsView_Night_13_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_1_en","features.preferences.impl.notifications_NotificationSettingsView_Night_1_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_2_en","features.preferences.impl.notifications_NotificationSettingsView_Night_2_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_3_en","features.preferences.impl.notifications_NotificationSettingsView_Night_3_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_4_en","features.preferences.impl.notifications_NotificationSettingsView_Night_4_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_5_en","features.preferences.impl.notifications_NotificationSettingsView_Night_5_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_6_en","features.preferences.impl.notifications_NotificationSettingsView_Night_6_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_7_en","features.preferences.impl.notifications_NotificationSettingsView_Night_7_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_8_en","features.preferences.impl.notifications_NotificationSettingsView_Night_8_en",20413,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_9_en","features.preferences.impl.notifications_NotificationSettingsView_Night_9_en",20413,],
+["features.ftue.impl.notifications_NotificationsOptInView_Day_0_en","features.ftue.impl.notifications_NotificationsOptInView_Night_0_en",20413,],
 ["libraries.designsystem.atomic.pages_OnBoardingPage_Day_0_en","libraries.designsystem.atomic.pages_OnBoardingPage_Night_0_en",0,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_0_en","features.login.impl.screens.onboarding_OnBoardingView_Night_0_en",20412,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_1_en","features.login.impl.screens.onboarding_OnBoardingView_Night_1_en",20412,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_2_en","features.login.impl.screens.onboarding_OnBoardingView_Night_2_en",20412,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_3_en","features.login.impl.screens.onboarding_OnBoardingView_Night_3_en",20412,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_4_en","features.login.impl.screens.onboarding_OnBoardingView_Night_4_en",20412,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_5_en","features.login.impl.screens.onboarding_OnBoardingView_Night_5_en",20412,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_6_en","features.login.impl.screens.onboarding_OnBoardingView_Night_6_en",20412,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_7_en","features.login.impl.screens.onboarding_OnBoardingView_Night_7_en",20412,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_0_en","features.login.impl.screens.onboarding_OnBoardingView_Night_0_en",20413,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_1_en","features.login.impl.screens.onboarding_OnBoardingView_Night_1_en",20413,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_2_en","features.login.impl.screens.onboarding_OnBoardingView_Night_2_en",20413,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_3_en","features.login.impl.screens.onboarding_OnBoardingView_Night_3_en",20413,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_4_en","features.login.impl.screens.onboarding_OnBoardingView_Night_4_en",20413,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_5_en","features.login.impl.screens.onboarding_OnBoardingView_Night_5_en",20413,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_6_en","features.login.impl.screens.onboarding_OnBoardingView_Night_6_en",20413,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_7_en","features.login.impl.screens.onboarding_OnBoardingView_Night_7_en",20413,],
 ["libraries.designsystem.background_OnboardingBackground_Day_0_en","libraries.designsystem.background_OnboardingBackground_Night_0_en",0,],
-["libraries.matrix.ui.components_OrganizationHeader_Day_0_en","libraries.matrix.ui.components_OrganizationHeader_Night_0_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en",20412,],
+["libraries.matrix.ui.components_OrganizationHeader_Day_0_en","libraries.matrix.ui.components_OrganizationHeader_Night_0_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en",20413,],
 ["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_12_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_12_en",0,],
 ["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_13_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_13_en",0,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en",20412,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en",20412,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en",20413,],
 ["libraries.designsystem.theme.components_OutlinedButtonLargeLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonLarge_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonMediumLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonMedium_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonSmall_Buttons_en","",0,],
-["libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Day_0_en","libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Night_0_en",20412,],
-["features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Day_0_en","features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Night_0_en",20412,],
-["libraries.permissions.api_PermissionsView_Day_0_en","libraries.permissions.api_PermissionsView_Night_0_en",20412,],
-["libraries.permissions.api_PermissionsView_Day_1_en","libraries.permissions.api_PermissionsView_Night_1_en",20412,],
-["libraries.permissions.api_PermissionsView_Day_2_en","libraries.permissions.api_PermissionsView_Night_2_en",20412,],
-["libraries.permissions.api_PermissionsView_Day_3_en","libraries.permissions.api_PermissionsView_Night_3_en",20412,],
+["libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Day_0_en","libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Night_0_en",20413,],
+["features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Day_0_en","features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Night_0_en",20413,],
+["libraries.permissions.api_PermissionsView_Day_0_en","libraries.permissions.api_PermissionsView_Night_0_en",20413,],
+["libraries.permissions.api_PermissionsView_Day_1_en","libraries.permissions.api_PermissionsView_Night_1_en",20413,],
+["libraries.permissions.api_PermissionsView_Day_2_en","libraries.permissions.api_PermissionsView_Night_2_en",20413,],
+["libraries.permissions.api_PermissionsView_Day_3_en","libraries.permissions.api_PermissionsView_Night_3_en",20413,],
 ["features.lockscreen.impl.components_PinEntryTextField_Day_0_en","features.lockscreen.impl.components_PinEntryTextField_Night_0_en",0,],
 ["libraries.designsystem.components_PinIcon_Day_0_en","libraries.designsystem.components_PinIcon_Night_0_en",0,],
 ["features.lockscreen.impl.unlock.keypad_PinKeypad_Day_0_en","features.lockscreen.impl.unlock.keypad_PinKeypad_Night_0_en",0,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_0_en","features.lockscreen.impl.unlock_PinUnlockView_Night_0_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_1_en","features.lockscreen.impl.unlock_PinUnlockView_Night_1_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_2_en","features.lockscreen.impl.unlock_PinUnlockView_Night_2_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_3_en","features.lockscreen.impl.unlock_PinUnlockView_Night_3_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_4_en","features.lockscreen.impl.unlock_PinUnlockView_Night_4_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_5_en","features.lockscreen.impl.unlock_PinUnlockView_Night_5_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_6_en","features.lockscreen.impl.unlock_PinUnlockView_Night_6_en",20412,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_7_en","features.lockscreen.impl.unlock_PinUnlockView_Night_7_en",20412,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_0_en","features.lockscreen.impl.unlock_PinUnlockView_Night_0_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_1_en","features.lockscreen.impl.unlock_PinUnlockView_Night_1_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_2_en","features.lockscreen.impl.unlock_PinUnlockView_Night_2_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_3_en","features.lockscreen.impl.unlock_PinUnlockView_Night_3_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_4_en","features.lockscreen.impl.unlock_PinUnlockView_Night_4_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_5_en","features.lockscreen.impl.unlock_PinUnlockView_Night_5_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_6_en","features.lockscreen.impl.unlock_PinUnlockView_Night_6_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_7_en","features.lockscreen.impl.unlock_PinUnlockView_Night_7_en",20413,],
 ["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_0_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_0_en",0,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_10_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_10_en",20412,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en",20412,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en",20412,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_3_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_3_en",20412,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_4_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_4_en",20412,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_5_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_5_en",20412,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_6_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_6_en",20412,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_7_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_7_en",20412,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_8_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_8_en",20412,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_9_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_9_en",20412,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en",20412,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en",20412,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en",20412,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en",20412,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_10_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_10_en",20413,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en",20413,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en",20413,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_3_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_3_en",20413,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_4_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_4_en",20413,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_5_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_5_en",20413,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_6_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_6_en",20413,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_7_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_7_en",20413,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_8_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_8_en",20413,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_9_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_9_en",20413,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en",20413,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en",20413,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en",20413,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en",20413,],
 ["libraries.designsystem.atomic.atoms_PlaceholderAtom_Day_0_en","libraries.designsystem.atomic.atoms_PlaceholderAtom_Night_0_en",0,],
-["features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en",20412,],
-["features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en",20412,],
-["features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en",20412,],
-["features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en",20412,],
-["features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en",20412,],
+["features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en",20413,],
+["features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en",20413,],
+["features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en",20413,],
+["features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en",20413,],
+["features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en",20413,],
 ["features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Night_0_en",0,],
 ["features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Night_0_en",0,],
-["features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en",20412,],
-["features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en",20412,],
-["features.poll.api.pollcontent_PollContentViewCreator_Day_0_en","features.poll.api.pollcontent_PollContentViewCreator_Night_0_en",20412,],
-["features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en",20412,],
-["features.poll.api.pollcontent_PollContentViewEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewEnded_Night_0_en",20412,],
-["features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en",20412,],
-["features.poll.impl.history_PollHistoryView_Day_0_en","features.poll.impl.history_PollHistoryView_Night_0_en",20412,],
-["features.poll.impl.history_PollHistoryView_Day_1_en","features.poll.impl.history_PollHistoryView_Night_1_en",20412,],
-["features.poll.impl.history_PollHistoryView_Day_2_en","features.poll.impl.history_PollHistoryView_Night_2_en",20412,],
-["features.poll.impl.history_PollHistoryView_Day_3_en","features.poll.impl.history_PollHistoryView_Night_3_en",20412,],
-["features.poll.impl.history_PollHistoryView_Day_4_en","features.poll.impl.history_PollHistoryView_Night_4_en",20412,],
+["features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en",20413,],
+["features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en",20413,],
+["features.poll.api.pollcontent_PollContentViewCreator_Day_0_en","features.poll.api.pollcontent_PollContentViewCreator_Night_0_en",20413,],
+["features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en",20413,],
+["features.poll.api.pollcontent_PollContentViewEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewEnded_Night_0_en",20413,],
+["features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en",20413,],
+["features.poll.impl.history_PollHistoryView_Day_0_en","features.poll.impl.history_PollHistoryView_Night_0_en",20413,],
+["features.poll.impl.history_PollHistoryView_Day_1_en","features.poll.impl.history_PollHistoryView_Night_1_en",20413,],
+["features.poll.impl.history_PollHistoryView_Day_2_en","features.poll.impl.history_PollHistoryView_Night_2_en",20413,],
+["features.poll.impl.history_PollHistoryView_Day_3_en","features.poll.impl.history_PollHistoryView_Night_3_en",20413,],
+["features.poll.impl.history_PollHistoryView_Day_4_en","features.poll.impl.history_PollHistoryView_Night_4_en",20413,],
 ["features.poll.api.pollcontent_PollTitleView_Day_0_en","features.poll.api.pollcontent_PollTitleView_Night_0_en",0,],
 ["libraries.designsystem.components.preferences_PreferenceCategory_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceCheckbox_Preferences_en","",0,],
@@ -800,211 +801,211 @@ export const screenshots = [
 ["libraries.designsystem.components.preferences_PreferenceRow_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceSlide_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceSwitch_Preferences_en","",0,],
-["features.preferences.impl.root_PreferencesRootViewDark_0_en","",20412,],
-["features.preferences.impl.root_PreferencesRootViewDark_1_en","",20412,],
-["features.preferences.impl.root_PreferencesRootViewLight_0_en","",20412,],
-["features.preferences.impl.root_PreferencesRootViewLight_1_en","",20412,],
+["features.preferences.impl.root_PreferencesRootViewDark_0_en","",20413,],
+["features.preferences.impl.root_PreferencesRootViewDark_1_en","",20413,],
+["features.preferences.impl.root_PreferencesRootViewLight_0_en","",20413,],
+["features.preferences.impl.root_PreferencesRootViewLight_1_en","",20413,],
 ["features.messages.impl.timeline.components.event_ProgressButton_Day_0_en","features.messages.impl.timeline.components.event_ProgressButton_Night_0_en",0,],
-["libraries.designsystem.components_ProgressDialogContent_Dialogs_en","",20412,],
-["libraries.designsystem.components_ProgressDialogWithContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithContent_Night_0_en",20412,],
+["libraries.designsystem.components_ProgressDialogContent_Dialogs_en","",20413,],
+["libraries.designsystem.components_ProgressDialogWithContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithContent_Night_0_en",20413,],
 ["libraries.designsystem.components_ProgressDialogWithTextAndContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithTextAndContent_Night_0_en",0,],
-["libraries.designsystem.components_ProgressDialog_Day_0_en","libraries.designsystem.components_ProgressDialog_Night_0_en",20412,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_0_en","features.messages.impl.timeline.protection_ProtectedView_Night_0_en",20412,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_1_en","features.messages.impl.timeline.protection_ProtectedView_Night_1_en",20412,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_2_en","features.messages.impl.timeline.protection_ProtectedView_Night_2_en",20412,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_3_en","features.messages.impl.timeline.protection_ProtectedView_Night_3_en",20412,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en",20412,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en",20412,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en",20412,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en",20412,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en",20412,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en",20412,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en",20412,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en",20412,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en",20412,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en",20412,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en",20412,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en",20412,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en",20412,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en",20412,],
-["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en",20412,],
-["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en",20412,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en",20412,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en",20412,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en",20412,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en",20412,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en",20412,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en",20412,],
+["libraries.designsystem.components_ProgressDialog_Day_0_en","libraries.designsystem.components_ProgressDialog_Night_0_en",20413,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_0_en","features.messages.impl.timeline.protection_ProtectedView_Night_0_en",20413,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_1_en","features.messages.impl.timeline.protection_ProtectedView_Night_1_en",20413,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_2_en","features.messages.impl.timeline.protection_ProtectedView_Night_2_en",20413,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_3_en","features.messages.impl.timeline.protection_ProtectedView_Night_3_en",20413,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en",20413,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en",20413,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en",20413,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en",20413,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en",20413,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en",20413,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en",20413,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en",20413,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en",20413,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en",20413,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en",20413,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en",20413,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en",20413,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en",20413,],
+["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en",20413,],
+["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en",20413,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en",20413,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en",20413,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en",20413,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en",20413,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en",20413,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en",20413,],
 ["libraries.designsystem.theme.components_RadioButton_Toggles_en","",0,],
-["features.rageshake.api.detection_RageshakeDialogContent_Day_0_en","features.rageshake.api.detection_RageshakeDialogContent_Night_0_en",20412,],
-["features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en",20412,],
+["features.rageshake.api.detection_RageshakeDialogContent_Day_0_en","features.rageshake.api.detection_RageshakeDialogContent_Night_0_en",20413,],
+["features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en",20413,],
 ["features.rageshake.api.preferences_RageshakePreferencesView_Day_1_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.reactionsummary_ReactionSummaryViewContent_Day_0_en","features.messages.impl.timeline.components.reactionsummary_ReactionSummaryViewContent_Night_0_en",0,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en",20412,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en",20412,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en",20412,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en",20412,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en",20412,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_0_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_0_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_1_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_1_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_2_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_2_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_3_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_3_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_4_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_4_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_5_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_5_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_6_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_6_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_7_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_7_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en",20412,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en",20412,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en",20413,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en",20413,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en",20413,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en",20413,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en",20413,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_0_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_0_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_1_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_1_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_2_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_2_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_3_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_3_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_4_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_4_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_5_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_5_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_6_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_6_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_7_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_7_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en",20413,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en",20413,],
 ["libraries.designsystem.atomic.atoms_RedIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_RedIndicatorAtom_Night_0_en",0,],
 ["features.messages.impl.timeline.components_ReplySwipeIndicator_Day_0_en","features.messages.impl.timeline.components_ReplySwipeIndicator_Night_0_en",0,],
-["features.messages.impl.report_ReportMessageView_Day_0_en","features.messages.impl.report_ReportMessageView_Night_0_en",20412,],
-["features.messages.impl.report_ReportMessageView_Day_1_en","features.messages.impl.report_ReportMessageView_Night_1_en",20412,],
-["features.messages.impl.report_ReportMessageView_Day_2_en","features.messages.impl.report_ReportMessageView_Night_2_en",20412,],
-["features.messages.impl.report_ReportMessageView_Day_3_en","features.messages.impl.report_ReportMessageView_Night_3_en",20412,],
-["features.messages.impl.report_ReportMessageView_Day_4_en","features.messages.impl.report_ReportMessageView_Night_4_en",20412,],
-["features.messages.impl.report_ReportMessageView_Day_5_en","features.messages.impl.report_ReportMessageView_Night_5_en",20412,],
-["features.reportroom.impl_ReportRoomView_Day_0_en","features.reportroom.impl_ReportRoomView_Night_0_en",20412,],
-["features.reportroom.impl_ReportRoomView_Day_1_en","features.reportroom.impl_ReportRoomView_Night_1_en",20412,],
-["features.reportroom.impl_ReportRoomView_Day_2_en","features.reportroom.impl_ReportRoomView_Night_2_en",20412,],
-["features.reportroom.impl_ReportRoomView_Day_3_en","features.reportroom.impl_ReportRoomView_Night_3_en",20412,],
-["features.reportroom.impl_ReportRoomView_Day_4_en","features.reportroom.impl_ReportRoomView_Night_4_en",20412,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en",20412,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en",20412,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en",20412,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en",20412,],
-["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en",20412,],
-["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en",20412,],
+["features.messages.impl.report_ReportMessageView_Day_0_en","features.messages.impl.report_ReportMessageView_Night_0_en",20413,],
+["features.messages.impl.report_ReportMessageView_Day_1_en","features.messages.impl.report_ReportMessageView_Night_1_en",20413,],
+["features.messages.impl.report_ReportMessageView_Day_2_en","features.messages.impl.report_ReportMessageView_Night_2_en",20413,],
+["features.messages.impl.report_ReportMessageView_Day_3_en","features.messages.impl.report_ReportMessageView_Night_3_en",20413,],
+["features.messages.impl.report_ReportMessageView_Day_4_en","features.messages.impl.report_ReportMessageView_Night_4_en",20413,],
+["features.messages.impl.report_ReportMessageView_Day_5_en","features.messages.impl.report_ReportMessageView_Night_5_en",20413,],
+["features.reportroom.impl_ReportRoomView_Day_0_en","features.reportroom.impl_ReportRoomView_Night_0_en",20413,],
+["features.reportroom.impl_ReportRoomView_Day_1_en","features.reportroom.impl_ReportRoomView_Night_1_en",20413,],
+["features.reportroom.impl_ReportRoomView_Day_2_en","features.reportroom.impl_ReportRoomView_Night_2_en",20413,],
+["features.reportroom.impl_ReportRoomView_Day_3_en","features.reportroom.impl_ReportRoomView_Night_3_en",20413,],
+["features.reportroom.impl_ReportRoomView_Day_4_en","features.reportroom.impl_ReportRoomView_Night_4_en",20413,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en",20413,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en",20413,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en",20413,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en",20413,],
+["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en",20413,],
+["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en",20413,],
 ["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_0_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_0_en",0,],
-["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en",20412,],
-["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en",20412,],
-["libraries.designsystem.components.dialogs_RetryDialogContent_Dialogs_en","",20412,],
-["libraries.designsystem.components.dialogs_RetryDialog_Day_0_en","libraries.designsystem.components.dialogs_RetryDialog_Night_0_en",20412,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en",20412,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en",20412,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en",20412,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en",20412,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en",20412,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en",20412,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en",20412,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en",20412,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en",20412,],
+["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en",20413,],
+["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en",20413,],
+["libraries.designsystem.components.dialogs_RetryDialogContent_Dialogs_en","",20413,],
+["libraries.designsystem.components.dialogs_RetryDialog_Day_0_en","libraries.designsystem.components.dialogs_RetryDialog_Night_0_en",20413,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en",20413,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en",20413,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en",20413,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en",20413,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en",20413,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en",20413,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en",20413,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en",20413,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en",20413,],
 ["libraries.matrix.ui.room.address_RoomAddressField_Day_0_en","libraries.matrix.ui.room.address_RoomAddressField_Night_0_en",0,],
 ["features.roomaliasresolver.impl_RoomAliasResolverView_Day_0_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_0_en",0,],
-["features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en",20412,],
-["features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en",20412,],
-["features.roomdetails.impl_RoomDetailsDark_0_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_10_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_11_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_12_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_13_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_14_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_15_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_16_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_17_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_18_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_19_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_1_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_2_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_3_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_4_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_5_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_6_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_7_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_8_en","",20412,],
-["features.roomdetails.impl_RoomDetailsDark_9_en","",20412,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_0_en",20412,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_1_en",20412,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_2_en",20412,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_3_en",20412,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_4_en",20412,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_5_en",20412,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_6_en",20412,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_7_en",20412,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_8_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_8_en",20412,],
-["features.roomdetails.impl_RoomDetails_0_en","",20412,],
-["features.roomdetails.impl_RoomDetails_10_en","",20412,],
-["features.roomdetails.impl_RoomDetails_11_en","",20412,],
-["features.roomdetails.impl_RoomDetails_12_en","",20412,],
-["features.roomdetails.impl_RoomDetails_13_en","",20412,],
-["features.roomdetails.impl_RoomDetails_14_en","",20412,],
-["features.roomdetails.impl_RoomDetails_15_en","",20412,],
-["features.roomdetails.impl_RoomDetails_16_en","",20412,],
-["features.roomdetails.impl_RoomDetails_17_en","",20412,],
-["features.roomdetails.impl_RoomDetails_18_en","",20412,],
-["features.roomdetails.impl_RoomDetails_19_en","",20412,],
-["features.roomdetails.impl_RoomDetails_1_en","",20412,],
-["features.roomdetails.impl_RoomDetails_2_en","",20412,],
-["features.roomdetails.impl_RoomDetails_3_en","",20412,],
-["features.roomdetails.impl_RoomDetails_4_en","",20412,],
-["features.roomdetails.impl_RoomDetails_5_en","",20412,],
-["features.roomdetails.impl_RoomDetails_6_en","",20412,],
-["features.roomdetails.impl_RoomDetails_7_en","",20412,],
-["features.roomdetails.impl_RoomDetails_8_en","",20412,],
-["features.roomdetails.impl_RoomDetails_9_en","",20412,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en",20412,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en",20412,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en",20412,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en",20412,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en",20412,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en",20412,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en",20412,],
-["features.home.impl.components_RoomListContentView_Day_0_en","features.home.impl.components_RoomListContentView_Night_0_en",20412,],
-["features.home.impl.components_RoomListContentView_Day_1_en","features.home.impl.components_RoomListContentView_Night_1_en",20412,],
+["features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en",20413,],
+["features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en",20413,],
+["features.roomdetails.impl_RoomDetailsDark_0_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_10_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_11_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_12_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_13_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_14_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_15_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_16_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_17_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_18_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_19_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_1_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_2_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_3_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_4_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_5_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_6_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_7_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_8_en","",20413,],
+["features.roomdetails.impl_RoomDetailsDark_9_en","",20413,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_0_en",20413,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_1_en",20413,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_2_en",20413,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_3_en",20413,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_4_en",20413,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_5_en",20413,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_6_en",20413,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_7_en",20413,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_8_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_8_en",20413,],
+["features.roomdetails.impl_RoomDetails_0_en","",20413,],
+["features.roomdetails.impl_RoomDetails_10_en","",20413,],
+["features.roomdetails.impl_RoomDetails_11_en","",20413,],
+["features.roomdetails.impl_RoomDetails_12_en","",20413,],
+["features.roomdetails.impl_RoomDetails_13_en","",20413,],
+["features.roomdetails.impl_RoomDetails_14_en","",20413,],
+["features.roomdetails.impl_RoomDetails_15_en","",20413,],
+["features.roomdetails.impl_RoomDetails_16_en","",20413,],
+["features.roomdetails.impl_RoomDetails_17_en","",20413,],
+["features.roomdetails.impl_RoomDetails_18_en","",20413,],
+["features.roomdetails.impl_RoomDetails_19_en","",20413,],
+["features.roomdetails.impl_RoomDetails_1_en","",20413,],
+["features.roomdetails.impl_RoomDetails_2_en","",20413,],
+["features.roomdetails.impl_RoomDetails_3_en","",20413,],
+["features.roomdetails.impl_RoomDetails_4_en","",20413,],
+["features.roomdetails.impl_RoomDetails_5_en","",20413,],
+["features.roomdetails.impl_RoomDetails_6_en","",20413,],
+["features.roomdetails.impl_RoomDetails_7_en","",20413,],
+["features.roomdetails.impl_RoomDetails_8_en","",20413,],
+["features.roomdetails.impl_RoomDetails_9_en","",20413,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en",20413,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en",20413,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en",20413,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en",20413,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en",20413,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en",20413,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en",20413,],
+["features.home.impl.components_RoomListContentView_Day_0_en","features.home.impl.components_RoomListContentView_Night_0_en",20413,],
+["features.home.impl.components_RoomListContentView_Day_1_en","features.home.impl.components_RoomListContentView_Night_1_en",20413,],
 ["features.home.impl.components_RoomListContentView_Day_2_en","features.home.impl.components_RoomListContentView_Night_2_en",0,],
-["features.home.impl.components_RoomListContentView_Day_3_en","features.home.impl.components_RoomListContentView_Night_3_en",20412,],
-["features.home.impl.components_RoomListContentView_Day_4_en","features.home.impl.components_RoomListContentView_Night_4_en",20412,],
-["features.home.impl.components_RoomListContentView_Day_5_en","features.home.impl.components_RoomListContentView_Night_5_en",20412,],
-["features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_en","features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Night_0_en",20412,],
-["features.home.impl.filters_RoomListFiltersView_Day_0_en","features.home.impl.filters_RoomListFiltersView_Night_0_en",20412,],
-["features.home.impl.filters_RoomListFiltersView_Day_1_en","features.home.impl.filters_RoomListFiltersView_Night_1_en",20412,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_0_en",20412,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_1_en",20412,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_2_en",20412,],
+["features.home.impl.components_RoomListContentView_Day_3_en","features.home.impl.components_RoomListContentView_Night_3_en",20413,],
+["features.home.impl.components_RoomListContentView_Day_4_en","features.home.impl.components_RoomListContentView_Night_4_en",20413,],
+["features.home.impl.components_RoomListContentView_Day_5_en","features.home.impl.components_RoomListContentView_Night_5_en",20413,],
+["features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_en","features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Night_0_en",20413,],
+["features.home.impl.filters_RoomListFiltersView_Day_0_en","features.home.impl.filters_RoomListFiltersView_Night_0_en",20413,],
+["features.home.impl.filters_RoomListFiltersView_Day_1_en","features.home.impl.filters_RoomListFiltersView_Night_1_en",20413,],
+["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_0_en",20413,],
+["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_1_en",20413,],
+["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_2_en",20413,],
 ["features.home.impl.search_RoomListSearchContent_Day_0_en","features.home.impl.search_RoomListSearchContent_Night_0_en",0,],
-["features.home.impl.search_RoomListSearchContent_Day_1_en","features.home.impl.search_RoomListSearchContent_Night_1_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_0_en","features.roomdetails.impl.members_RoomMemberListView_Night_0_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_1_en","features.roomdetails.impl.members_RoomMemberListView_Night_1_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_2_en","features.roomdetails.impl.members_RoomMemberListView_Night_2_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_3_en","features.roomdetails.impl.members_RoomMemberListView_Night_3_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_4_en","features.roomdetails.impl.members_RoomMemberListView_Night_4_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_5_en","features.roomdetails.impl.members_RoomMemberListView_Night_5_en",20412,],
+["features.home.impl.search_RoomListSearchContent_Day_1_en","features.home.impl.search_RoomListSearchContent_Night_1_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_0_en","features.roomdetails.impl.members_RoomMemberListView_Night_0_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_1_en","features.roomdetails.impl.members_RoomMemberListView_Night_1_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_2_en","features.roomdetails.impl.members_RoomMemberListView_Night_2_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_3_en","features.roomdetails.impl.members_RoomMemberListView_Night_3_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_4_en","features.roomdetails.impl.members_RoomMemberListView_Night_4_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_5_en","features.roomdetails.impl.members_RoomMemberListView_Night_5_en",20413,],
 ["features.roomdetails.impl.members_RoomMemberListView_Day_6_en","features.roomdetails.impl.members_RoomMemberListView_Night_6_en",0,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_7_en","features.roomdetails.impl.members_RoomMemberListView_Night_7_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_8_en","features.roomdetails.impl.members_RoomMemberListView_Night_8_en",20412,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_9_en","features.roomdetails.impl.members_RoomMemberListView_Night_9_en",20412,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en",20412,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en",20412,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en",20412,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en",20412,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en",20412,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en",20412,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en",20412,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en",20412,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en",20412,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_7_en","features.roomdetails.impl.members_RoomMemberListView_Night_7_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_8_en","features.roomdetails.impl.members_RoomMemberListView_Night_8_en",20413,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_9_en","features.roomdetails.impl.members_RoomMemberListView_Night_9_en",20413,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en",20413,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en",20413,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en",20413,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en",20413,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en",20413,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en",20413,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en",20413,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en",20413,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en",20413,],
 ["features.roommembermoderation.impl_RoomMemberModerationView_Day_9_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_9_en",0,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en",20412,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en",20412,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en",20412,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en",20412,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en",20412,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en",20412,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en",20412,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en",20412,],
-["libraries.roomselect.impl_RoomSelectView_Day_0_en","libraries.roomselect.impl_RoomSelectView_Night_0_en",20412,],
-["libraries.roomselect.impl_RoomSelectView_Day_1_en","libraries.roomselect.impl_RoomSelectView_Night_1_en",20412,],
-["libraries.roomselect.impl_RoomSelectView_Day_2_en","libraries.roomselect.impl_RoomSelectView_Night_2_en",20412,],
-["libraries.roomselect.impl_RoomSelectView_Day_3_en","libraries.roomselect.impl_RoomSelectView_Night_3_en",20412,],
-["libraries.roomselect.impl_RoomSelectView_Day_4_en","libraries.roomselect.impl_RoomSelectView_Night_4_en",20412,],
-["libraries.roomselect.impl_RoomSelectView_Day_5_en","libraries.roomselect.impl_RoomSelectView_Night_5_en",20412,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en",20413,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en",20413,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en",20413,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en",20413,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en",20413,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en",20413,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en",20413,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en",20413,],
+["libraries.roomselect.impl_RoomSelectView_Day_0_en","libraries.roomselect.impl_RoomSelectView_Night_0_en",20413,],
+["libraries.roomselect.impl_RoomSelectView_Day_1_en","libraries.roomselect.impl_RoomSelectView_Night_1_en",20413,],
+["libraries.roomselect.impl_RoomSelectView_Day_2_en","libraries.roomselect.impl_RoomSelectView_Night_2_en",20413,],
+["libraries.roomselect.impl_RoomSelectView_Day_3_en","libraries.roomselect.impl_RoomSelectView_Night_3_en",20413,],
+["libraries.roomselect.impl_RoomSelectView_Day_4_en","libraries.roomselect.impl_RoomSelectView_Night_4_en",20413,],
+["libraries.roomselect.impl_RoomSelectView_Day_5_en","libraries.roomselect.impl_RoomSelectView_Night_5_en",20413,],
 ["features.home.impl.components_RoomSummaryPlaceholderRow_Day_0_en","features.home.impl.components_RoomSummaryPlaceholderRow_Night_0_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_0_en","features.home.impl.components_RoomSummaryRow_Night_0_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_10_en","features.home.impl.components_RoomSummaryRow_Night_10_en",0,],
@@ -1027,14 +1028,14 @@ export const screenshots = [
 ["features.home.impl.components_RoomSummaryRow_Day_26_en","features.home.impl.components_RoomSummaryRow_Night_26_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_27_en","features.home.impl.components_RoomSummaryRow_Night_27_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_28_en","features.home.impl.components_RoomSummaryRow_Night_28_en",0,],
-["features.home.impl.components_RoomSummaryRow_Day_29_en","features.home.impl.components_RoomSummaryRow_Night_29_en",20412,],
-["features.home.impl.components_RoomSummaryRow_Day_2_en","features.home.impl.components_RoomSummaryRow_Night_2_en",20412,],
-["features.home.impl.components_RoomSummaryRow_Day_30_en","features.home.impl.components_RoomSummaryRow_Night_30_en",20412,],
-["features.home.impl.components_RoomSummaryRow_Day_31_en","features.home.impl.components_RoomSummaryRow_Night_31_en",20412,],
-["features.home.impl.components_RoomSummaryRow_Day_32_en","features.home.impl.components_RoomSummaryRow_Night_32_en",20412,],
-["features.home.impl.components_RoomSummaryRow_Day_33_en","features.home.impl.components_RoomSummaryRow_Night_33_en",20412,],
-["features.home.impl.components_RoomSummaryRow_Day_34_en","features.home.impl.components_RoomSummaryRow_Night_34_en",20412,],
-["features.home.impl.components_RoomSummaryRow_Day_35_en","features.home.impl.components_RoomSummaryRow_Night_35_en",20412,],
+["features.home.impl.components_RoomSummaryRow_Day_29_en","features.home.impl.components_RoomSummaryRow_Night_29_en",20413,],
+["features.home.impl.components_RoomSummaryRow_Day_2_en","features.home.impl.components_RoomSummaryRow_Night_2_en",20413,],
+["features.home.impl.components_RoomSummaryRow_Day_30_en","features.home.impl.components_RoomSummaryRow_Night_30_en",20413,],
+["features.home.impl.components_RoomSummaryRow_Day_31_en","features.home.impl.components_RoomSummaryRow_Night_31_en",20413,],
+["features.home.impl.components_RoomSummaryRow_Day_32_en","features.home.impl.components_RoomSummaryRow_Night_32_en",20413,],
+["features.home.impl.components_RoomSummaryRow_Day_33_en","features.home.impl.components_RoomSummaryRow_Night_33_en",20413,],
+["features.home.impl.components_RoomSummaryRow_Day_34_en","features.home.impl.components_RoomSummaryRow_Night_34_en",20413,],
+["features.home.impl.components_RoomSummaryRow_Day_35_en","features.home.impl.components_RoomSummaryRow_Night_35_en",20413,],
 ["features.home.impl.components_RoomSummaryRow_Day_3_en","features.home.impl.components_RoomSummaryRow_Night_3_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_4_en","features.home.impl.components_RoomSummaryRow_Night_4_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_5_en","features.home.impl.components_RoomSummaryRow_Night_5_en",0,],
@@ -1042,83 +1043,83 @@ export const screenshots = [
 ["features.home.impl.components_RoomSummaryRow_Day_7_en","features.home.impl.components_RoomSummaryRow_Night_7_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_8_en","features.home.impl.components_RoomSummaryRow_Night_8_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_9_en","features.home.impl.components_RoomSummaryRow_Night_9_en",0,],
-["appnav.root_RootView_Day_0_en","appnav.root_RootView_Night_0_en",20412,],
-["appnav.root_RootView_Day_1_en","appnav.root_RootView_Night_1_en",20412,],
-["appnav.root_RootView_Day_2_en","appnav.root_RootView_Night_2_en",20412,],
+["appnav.root_RootView_Day_0_en","appnav.root_RootView_Night_0_en",20413,],
+["appnav.root_RootView_Day_1_en","appnav.root_RootView_Night_1_en",20413,],
+["appnav.root_RootView_Day_2_en","appnav.root_RootView_Night_2_en",20413,],
 ["appicon.enterprise_RoundIcon_en","",0,],
 ["appicon.element_RoundIcon_en","",0,],
 ["libraries.designsystem.atomic.atoms_RoundedIconAtom_Day_0_en","libraries.designsystem.atomic.atoms_RoundedIconAtom_Night_0_en",0,],
-["features.verifysession.impl.emoji_SasEmojis_Day_0_en","features.verifysession.impl.emoji_SasEmojis_Night_0_en",20412,],
-["libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_en","libraries.designsystem.components.dialogs_SaveChangesDialog_Night_0_en",20412,],
-["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en",20412,],
-["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en",20412,],
+["features.verifysession.impl.emoji_SasEmojis_Day_0_en","features.verifysession.impl.emoji_SasEmojis_Night_0_en",20413,],
+["libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_en","libraries.designsystem.components.dialogs_SaveChangesDialog_Night_0_en",20413,],
+["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en",20413,],
+["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en",20413,],
 ["libraries.designsystem.theme.components_SearchBarActiveNoneQuery_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithContent_Search_views_en","",0,],
-["libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en","",20412,],
+["libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en","",20413,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithQueryNoBackButton_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithQuery_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarInactive_Search_views_en","",0,],
-["features.startchat.impl.components_SearchMultipleUsersResultItem_en","",20412,],
-["features.startchat.impl.components_SearchSingleUserResultItem_en","",20412,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en",20412,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en",20412,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en",20412,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en",20412,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en",20412,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en",20412,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en",20412,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en",20412,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_0_en","features.securebackup.impl.root_SecureBackupRootView_Night_0_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_10_en","features.securebackup.impl.root_SecureBackupRootView_Night_10_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_11_en","features.securebackup.impl.root_SecureBackupRootView_Night_11_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_12_en","features.securebackup.impl.root_SecureBackupRootView_Night_12_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_13_en","features.securebackup.impl.root_SecureBackupRootView_Night_13_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_14_en","features.securebackup.impl.root_SecureBackupRootView_Night_14_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_15_en","features.securebackup.impl.root_SecureBackupRootView_Night_15_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_16_en","features.securebackup.impl.root_SecureBackupRootView_Night_16_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_17_en","features.securebackup.impl.root_SecureBackupRootView_Night_17_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_1_en","features.securebackup.impl.root_SecureBackupRootView_Night_1_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_2_en","features.securebackup.impl.root_SecureBackupRootView_Night_2_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_3_en","features.securebackup.impl.root_SecureBackupRootView_Night_3_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_4_en","features.securebackup.impl.root_SecureBackupRootView_Night_4_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_5_en","features.securebackup.impl.root_SecureBackupRootView_Night_5_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_6_en","features.securebackup.impl.root_SecureBackupRootView_Night_6_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_7_en","features.securebackup.impl.root_SecureBackupRootView_Night_7_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_8_en","features.securebackup.impl.root_SecureBackupRootView_Night_8_en",20412,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_9_en","features.securebackup.impl.root_SecureBackupRootView_Night_9_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en",20412,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en","",20412,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en","",20412,],
+["features.startchat.impl.components_SearchMultipleUsersResultItem_en","",20413,],
+["features.startchat.impl.components_SearchSingleUserResultItem_en","",20413,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en",20413,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en",20413,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en",20413,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en",20413,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en",20413,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en",20413,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en",20413,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en",20413,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_0_en","features.securebackup.impl.root_SecureBackupRootView_Night_0_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_10_en","features.securebackup.impl.root_SecureBackupRootView_Night_10_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_11_en","features.securebackup.impl.root_SecureBackupRootView_Night_11_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_12_en","features.securebackup.impl.root_SecureBackupRootView_Night_12_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_13_en","features.securebackup.impl.root_SecureBackupRootView_Night_13_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_14_en","features.securebackup.impl.root_SecureBackupRootView_Night_14_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_15_en","features.securebackup.impl.root_SecureBackupRootView_Night_15_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_16_en","features.securebackup.impl.root_SecureBackupRootView_Night_16_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_17_en","features.securebackup.impl.root_SecureBackupRootView_Night_17_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_1_en","features.securebackup.impl.root_SecureBackupRootView_Night_1_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_2_en","features.securebackup.impl.root_SecureBackupRootView_Night_2_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_3_en","features.securebackup.impl.root_SecureBackupRootView_Night_3_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_4_en","features.securebackup.impl.root_SecureBackupRootView_Night_4_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_5_en","features.securebackup.impl.root_SecureBackupRootView_Night_5_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_6_en","features.securebackup.impl.root_SecureBackupRootView_Night_6_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_7_en","features.securebackup.impl.root_SecureBackupRootView_Night_7_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_8_en","features.securebackup.impl.root_SecureBackupRootView_Night_8_en",20413,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_9_en","features.securebackup.impl.root_SecureBackupRootView_Night_9_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en",20413,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en","",20413,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en","",20413,],
 ["libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Night_0_en",0,],
 ["libraries.matrix.ui.components_SelectedRoomRtl_Day_0_en","libraries.matrix.ui.components_SelectedRoomRtl_Night_0_en",0,],
 ["libraries.matrix.ui.components_SelectedRoomRtl_Day_1_en","libraries.matrix.ui.components_SelectedRoomRtl_Night_1_en",0,],
@@ -1132,11 +1133,11 @@ export const screenshots = [
 ["libraries.matrix.ui.components_SelectedUser_Day_1_en","libraries.matrix.ui.components_SelectedUser_Night_1_en",0,],
 ["libraries.matrix.ui.components_SelectedUsersRowList_Day_0_en","libraries.matrix.ui.components_SelectedUsersRowList_Night_0_en",0,],
 ["libraries.textcomposer.components_SendButton_Day_0_en","libraries.textcomposer.components_SendButton_Night_0_en",0,],
-["features.location.impl.send_SendLocationView_Day_0_en","features.location.impl.send_SendLocationView_Night_0_en",20412,],
-["features.location.impl.send_SendLocationView_Day_1_en","features.location.impl.send_SendLocationView_Night_1_en",20412,],
-["features.location.impl.send_SendLocationView_Day_2_en","features.location.impl.send_SendLocationView_Night_2_en",20412,],
-["features.location.impl.send_SendLocationView_Day_3_en","features.location.impl.send_SendLocationView_Night_3_en",20412,],
-["features.location.impl.send_SendLocationView_Day_4_en","features.location.impl.send_SendLocationView_Night_4_en",20412,],
+["features.location.impl.send_SendLocationView_Day_0_en","features.location.impl.send_SendLocationView_Night_0_en",20413,],
+["features.location.impl.send_SendLocationView_Day_1_en","features.location.impl.send_SendLocationView_Night_1_en",20413,],
+["features.location.impl.send_SendLocationView_Day_2_en","features.location.impl.send_SendLocationView_Night_2_en",20413,],
+["features.location.impl.send_SendLocationView_Day_3_en","features.location.impl.send_SendLocationView_Night_3_en",20413,],
+["features.location.impl.send_SendLocationView_Day_4_en","features.location.impl.send_SendLocationView_Night_4_en",20413,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_0_en","libraries.matrix.ui.messages.sender_SenderName_Night_0_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_1_en","libraries.matrix.ui.messages.sender_SenderName_Night_1_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_2_en","libraries.matrix.ui.messages.sender_SenderName_Night_2_en",0,],
@@ -1146,27 +1147,27 @@ export const screenshots = [
 ["libraries.matrix.ui.messages.sender_SenderName_Day_6_en","libraries.matrix.ui.messages.sender_SenderName_Night_6_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_7_en","libraries.matrix.ui.messages.sender_SenderName_Night_7_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_8_en","libraries.matrix.ui.messages.sender_SenderName_Night_8_en",0,],
-["features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en","features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en",20412,],
-["features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en","features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en",20412,],
-["features.lockscreen.impl.setup.biometric_SetupBiometricView_Day_0_en","features.lockscreen.impl.setup.biometric_SetupBiometricView_Night_0_en",20412,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en",20412,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en",20412,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en",20412,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en",20412,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en",20412,],
+["features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en","features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en",20413,],
+["features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en","features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en",20413,],
+["features.lockscreen.impl.setup.biometric_SetupBiometricView_Day_0_en","features.lockscreen.impl.setup.biometric_SetupBiometricView_Night_0_en",20413,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en",20413,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en",20413,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en",20413,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en",20413,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en",20413,],
 ["features.share.impl_ShareView_Day_0_en","features.share.impl_ShareView_Night_0_en",0,],
 ["features.share.impl_ShareView_Day_1_en","features.share.impl_ShareView_Night_1_en",0,],
 ["features.share.impl_ShareView_Day_2_en","features.share.impl_ShareView_Night_2_en",0,],
-["features.share.impl_ShareView_Day_3_en","features.share.impl_ShareView_Night_3_en",20412,],
-["features.location.impl.show_ShowLocationView_Day_0_en","features.location.impl.show_ShowLocationView_Night_0_en",20412,],
-["features.location.impl.show_ShowLocationView_Day_1_en","features.location.impl.show_ShowLocationView_Night_1_en",20412,],
-["features.location.impl.show_ShowLocationView_Day_2_en","features.location.impl.show_ShowLocationView_Night_2_en",20412,],
-["features.location.impl.show_ShowLocationView_Day_3_en","features.location.impl.show_ShowLocationView_Night_3_en",20412,],
-["features.location.impl.show_ShowLocationView_Day_4_en","features.location.impl.show_ShowLocationView_Night_4_en",20412,],
-["features.location.impl.show_ShowLocationView_Day_5_en","features.location.impl.show_ShowLocationView_Night_5_en",20412,],
-["features.location.impl.show_ShowLocationView_Day_6_en","features.location.impl.show_ShowLocationView_Night_6_en",20412,],
-["features.location.impl.show_ShowLocationView_Day_7_en","features.location.impl.show_ShowLocationView_Night_7_en",20412,],
-["features.signedout.impl_SignedOutView_Day_0_en","features.signedout.impl_SignedOutView_Night_0_en",20412,],
+["features.share.impl_ShareView_Day_3_en","features.share.impl_ShareView_Night_3_en",20413,],
+["features.location.impl.show_ShowLocationView_Day_0_en","features.location.impl.show_ShowLocationView_Night_0_en",20413,],
+["features.location.impl.show_ShowLocationView_Day_1_en","features.location.impl.show_ShowLocationView_Night_1_en",20413,],
+["features.location.impl.show_ShowLocationView_Day_2_en","features.location.impl.show_ShowLocationView_Night_2_en",20413,],
+["features.location.impl.show_ShowLocationView_Day_3_en","features.location.impl.show_ShowLocationView_Night_3_en",20413,],
+["features.location.impl.show_ShowLocationView_Day_4_en","features.location.impl.show_ShowLocationView_Night_4_en",20413,],
+["features.location.impl.show_ShowLocationView_Day_5_en","features.location.impl.show_ShowLocationView_Night_5_en",20413,],
+["features.location.impl.show_ShowLocationView_Day_6_en","features.location.impl.show_ShowLocationView_Night_6_en",20413,],
+["features.location.impl.show_ShowLocationView_Day_7_en","features.location.impl.show_ShowLocationView_Night_7_en",20413,],
+["features.signedout.impl_SignedOutView_Day_0_en","features.signedout.impl_SignedOutView_Night_0_en",20413,],
 ["libraries.designsystem.components_SimpleModalBottomSheet_Day_0_en","libraries.designsystem.components_SimpleModalBottomSheet_Night_0_en",0,],
 ["libraries.designsystem.components.dialogs_SingleSelectionDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_SingleSelectionDialog_Day_0_en","libraries.designsystem.components.dialogs_SingleSelectionDialog_Night_0_en",0,],
@@ -1176,102 +1177,102 @@ export const screenshots = [
 ["libraries.designsystem.components.list_SingleSelectionListItemUnselectedWithSupportingText_Single_selection_List_item_-_no_selection,_supporting_text_List_items_en","",0,],
 ["libraries.designsystem.components.list_SingleSelectionListItem_Single_selection_List_item_-_no_selection_List_items_en","",0,],
 ["libraries.designsystem.theme.components_Sliders_Sliders_en","",0,],
-["features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en","features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en",20412,],
+["features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en","features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en",20413,],
 ["libraries.designsystem.theme.components_SnackbarWithActionAndCloseButton_Snackbar_with_action_and_close_button_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithActionOnNewLineAndCloseButton_Snackbar_with_action_and_close_button_on_new_line_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithActionOnNewLine_Snackbar_with_action_on_new_line_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithAction_Snackbar_with_action_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_Snackbar_Snackbar_Snackbars_en","",0,],
-["features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_en","features.announcement.impl.spaces_SpaceAnnouncementView_Night_0_en",20412,],
+["features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_en","features.announcement.impl.spaces_SpaceAnnouncementView_Night_0_en",20413,],
 ["libraries.designsystem.components.avatar.internal_SpaceAvatar_Avatars_en","",0,],
-["libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en",20412,],
-["libraries.matrix.ui.components_SpaceHeaderView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderView_Night_0_en",20412,],
-["libraries.matrix.ui.components_SpaceInfoRow_Day_0_en","libraries.matrix.ui.components_SpaceInfoRow_Night_0_en",20412,],
+["libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en",20413,],
+["libraries.matrix.ui.components_SpaceHeaderView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderView_Night_0_en",20413,],
+["libraries.matrix.ui.components_SpaceInfoRow_Day_0_en","libraries.matrix.ui.components_SpaceInfoRow_Night_0_en",20413,],
 ["libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Day_0_en","libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Night_0_en",0,],
 ["libraries.matrix.ui.components_SpaceMembersView_Day_0_en","libraries.matrix.ui.components_SpaceMembersView_Night_0_en",0,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en",20412,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en",20412,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en",20412,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en",20412,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en",20412,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en",20412,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en",20412,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en",20412,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en",20412,],
-["features.space.impl.settings_SpaceSettingsView_Day_0_en","features.space.impl.settings_SpaceSettingsView_Night_0_en",20412,],
-["features.space.impl.settings_SpaceSettingsView_Day_1_en","features.space.impl.settings_SpaceSettingsView_Night_1_en",20412,],
-["features.space.impl.settings_SpaceSettingsView_Day_2_en","features.space.impl.settings_SpaceSettingsView_Night_2_en",20412,],
-["features.space.impl.settings_SpaceSettingsView_Day_3_en","features.space.impl.settings_SpaceSettingsView_Night_3_en",20412,],
-["features.space.impl.root_SpaceView_Day_0_en","features.space.impl.root_SpaceView_Night_0_en",20412,],
-["features.space.impl.root_SpaceView_Day_1_en","features.space.impl.root_SpaceView_Night_1_en",20412,],
-["features.space.impl.root_SpaceView_Day_2_en","features.space.impl.root_SpaceView_Night_2_en",20412,],
-["features.space.impl.root_SpaceView_Day_3_en","features.space.impl.root_SpaceView_Night_3_en",20412,],
-["features.space.impl.root_SpaceView_Day_4_en","features.space.impl.root_SpaceView_Night_4_en",20412,],
-["features.space.impl.root_SpaceView_Day_5_en","features.space.impl.root_SpaceView_Night_5_en",20412,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en",20413,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en",20413,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en",20413,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en",20413,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en",20413,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en",20413,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en",20413,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en",20413,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en",20413,],
+["features.space.impl.settings_SpaceSettingsView_Day_0_en","features.space.impl.settings_SpaceSettingsView_Night_0_en",20413,],
+["features.space.impl.settings_SpaceSettingsView_Day_1_en","features.space.impl.settings_SpaceSettingsView_Night_1_en",20413,],
+["features.space.impl.settings_SpaceSettingsView_Day_2_en","features.space.impl.settings_SpaceSettingsView_Night_2_en",20413,],
+["features.space.impl.settings_SpaceSettingsView_Day_3_en","features.space.impl.settings_SpaceSettingsView_Night_3_en",20413,],
+["features.space.impl.root_SpaceView_Day_0_en","features.space.impl.root_SpaceView_Night_0_en",20413,],
+["features.space.impl.root_SpaceView_Day_1_en","features.space.impl.root_SpaceView_Night_1_en",20413,],
+["features.space.impl.root_SpaceView_Day_2_en","features.space.impl.root_SpaceView_Night_2_en",20413,],
+["features.space.impl.root_SpaceView_Day_3_en","features.space.impl.root_SpaceView_Night_3_en",20413,],
+["features.space.impl.root_SpaceView_Day_4_en","features.space.impl.root_SpaceView_Night_4_en",20413,],
+["features.space.impl.root_SpaceView_Day_5_en","features.space.impl.root_SpaceView_Night_5_en",20413,],
 ["libraries.designsystem.modifiers_SquareSizeModifierInsideSquare_en","",0,],
 ["libraries.designsystem.modifiers_SquareSizeModifierLargeHeight_en","",0,],
 ["libraries.designsystem.modifiers_SquareSizeModifierLargeWidth_en","",0,],
-["features.startchat.impl.root_StartChatView_Day_0_en","features.startchat.impl.root_StartChatView_Night_0_en",20412,],
-["features.startchat.impl.root_StartChatView_Day_1_en","features.startchat.impl.root_StartChatView_Night_1_en",20412,],
-["features.startchat.impl.root_StartChatView_Day_2_en","features.startchat.impl.root_StartChatView_Night_2_en",20412,],
-["features.startchat.impl.root_StartChatView_Day_3_en","features.startchat.impl.root_StartChatView_Night_3_en",20412,],
-["features.startchat.impl.root_StartChatView_Day_4_en","features.startchat.impl.root_StartChatView_Night_4_en",20412,],
-["features.startchat.impl.root_StartChatView_Day_5_en","features.startchat.impl.root_StartChatView_Night_5_en",20412,],
-["features.location.api.internal_StaticMapPlaceholder_Day_0_en","features.location.api.internal_StaticMapPlaceholder_Night_0_en",20412,],
+["features.startchat.impl.root_StartChatView_Day_0_en","features.startchat.impl.root_StartChatView_Night_0_en",20413,],
+["features.startchat.impl.root_StartChatView_Day_1_en","features.startchat.impl.root_StartChatView_Night_1_en",20413,],
+["features.startchat.impl.root_StartChatView_Day_2_en","features.startchat.impl.root_StartChatView_Night_2_en",20413,],
+["features.startchat.impl.root_StartChatView_Day_3_en","features.startchat.impl.root_StartChatView_Night_3_en",20413,],
+["features.startchat.impl.root_StartChatView_Day_4_en","features.startchat.impl.root_StartChatView_Night_4_en",20413,],
+["features.startchat.impl.root_StartChatView_Day_5_en","features.startchat.impl.root_StartChatView_Night_5_en",20413,],
+["features.location.api.internal_StaticMapPlaceholder_Day_0_en","features.location.api.internal_StaticMapPlaceholder_Night_0_en",20413,],
 ["features.location.api_StaticMapView_Day_0_en","features.location.api_StaticMapView_Night_0_en",0,],
-["features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en","features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en",20412,],
+["features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en","features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en",20413,],
 ["libraries.designsystem.atomic.pages_SunsetPage_Day_0_en","libraries.designsystem.atomic.pages_SunsetPage_Night_0_en",0,],
 ["libraries.designsystem.components.button_SuperButton_Day_0_en","libraries.designsystem.components.button_SuperButton_Night_0_en",0,],
 ["libraries.designsystem.theme.components_Surface_en","",0,],
 ["libraries.designsystem.theme.components_Switch_Toggles_en","",0,],
-["appnav.loggedin_SyncStateView_Day_0_en","appnav.loggedin_SyncStateView_Night_0_en",20412,],
+["appnav.loggedin_SyncStateView_Day_0_en","appnav.loggedin_SyncStateView_Night_0_en",20413,],
 ["libraries.designsystem.components.avatar.internal_TextAvatar_Avatars_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonLargeLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonLarge_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonMediumLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonMedium_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonSmall_Buttons_en","",0,],
-["libraries.textcomposer_TextComposerAddCaption_Day_0_en","libraries.textcomposer_TextComposerAddCaption_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerCaption_Day_0_en","libraries.textcomposer_TextComposerCaption_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerEditCaption_Day_0_en","libraries.textcomposer_TextComposerEditCaption_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerEdit_Day_0_en","libraries.textcomposer_TextComposerEdit_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerFormatting_Day_0_en","libraries.textcomposer_TextComposerFormatting_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerLinkDialogCreateLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLink_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerLinkDialogEditLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogEditLink_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en",20412,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_0_en","libraries.textcomposer_TextComposerReply_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_10_en","libraries.textcomposer_TextComposerReply_Night_10_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_11_en","libraries.textcomposer_TextComposerReply_Night_11_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_1_en","libraries.textcomposer_TextComposerReply_Night_1_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_2_en","libraries.textcomposer_TextComposerReply_Night_2_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_3_en","libraries.textcomposer_TextComposerReply_Night_3_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_4_en","libraries.textcomposer_TextComposerReply_Night_4_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_5_en","libraries.textcomposer_TextComposerReply_Night_5_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_6_en","libraries.textcomposer_TextComposerReply_Night_6_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_7_en","libraries.textcomposer_TextComposerReply_Night_7_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_8_en","libraries.textcomposer_TextComposerReply_Night_8_en",20412,],
-["libraries.textcomposer_TextComposerReply_Day_9_en","libraries.textcomposer_TextComposerReply_Night_9_en",20412,],
-["libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerSimple_Day_0_en","libraries.textcomposer_TextComposerSimple_Night_0_en",20412,],
-["libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en",20412,],
+["libraries.textcomposer_TextComposerAddCaption_Day_0_en","libraries.textcomposer_TextComposerAddCaption_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerCaption_Day_0_en","libraries.textcomposer_TextComposerCaption_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerEditCaption_Day_0_en","libraries.textcomposer_TextComposerEditCaption_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerEdit_Day_0_en","libraries.textcomposer_TextComposerEdit_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerFormatting_Day_0_en","libraries.textcomposer_TextComposerFormatting_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerLinkDialogCreateLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLink_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerLinkDialogEditLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogEditLink_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en",20413,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_0_en","libraries.textcomposer_TextComposerReply_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_10_en","libraries.textcomposer_TextComposerReply_Night_10_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_11_en","libraries.textcomposer_TextComposerReply_Night_11_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_1_en","libraries.textcomposer_TextComposerReply_Night_1_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_2_en","libraries.textcomposer_TextComposerReply_Night_2_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_3_en","libraries.textcomposer_TextComposerReply_Night_3_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_4_en","libraries.textcomposer_TextComposerReply_Night_4_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_5_en","libraries.textcomposer_TextComposerReply_Night_5_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_6_en","libraries.textcomposer_TextComposerReply_Night_6_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_7_en","libraries.textcomposer_TextComposerReply_Night_7_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_8_en","libraries.textcomposer_TextComposerReply_Night_8_en",20413,],
+["libraries.textcomposer_TextComposerReply_Day_9_en","libraries.textcomposer_TextComposerReply_Night_9_en",20413,],
+["libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerSimple_Day_0_en","libraries.textcomposer_TextComposerSimple_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en",20413,],
 ["libraries.textcomposer_TextComposerVoice_Day_0_en","libraries.textcomposer_TextComposerVoice_Night_0_en",0,],
 ["libraries.designsystem.theme.components_TextDark_Text_en","",0,],
-["libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en",20412,],
-["libraries.designsystem.components.dialogs_TextFieldDialog_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialog_Night_0_en",20412,],
+["libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en",20413,],
+["libraries.designsystem.components.dialogs_TextFieldDialog_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialog_Night_0_en",20413,],
 ["libraries.designsystem.components.list_TextFieldListItemEmpty_Text_field_List_item_-_empty_List_items_en","",0,],
 ["libraries.designsystem.components.list_TextFieldListItemTextFieldValue_Text_field_List_item_-_textfieldvalue_List_items_en","",0,],
 ["libraries.designsystem.components.list_TextFieldListItem_Text_field_List_item_-_text_List_items_en","",0,],
@@ -1283,16 +1284,16 @@ export const screenshots = [
 ["libraries.mediaviewer.impl.local.txt_TextFileContentView_Day_3_en","libraries.mediaviewer.impl.local.txt_TextFileContentView_Night_3_en",0,],
 ["libraries.textcomposer.components_TextFormatting_Day_0_en","libraries.textcomposer.components_TextFormatting_Night_0_en",0,],
 ["libraries.designsystem.theme.components_TextLight_Text_en","",0,],
-["features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en","features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en",20412,],
-["features.messages.impl.topbars_ThreadTopBar_Day_0_en","features.messages.impl.topbars_ThreadTopBar_Night_0_en",20412,],
-["libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en","",20412,],
-["libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en","",20412,],
-["libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en","",20412,],
+["features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en","features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en",20413,],
+["features.messages.impl.topbars_ThreadTopBar_Day_0_en","features.messages.impl.topbars_ThreadTopBar_Night_0_en",20413,],
+["libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en","",20413,],
+["libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en","",20413,],
+["libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en","",20413,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_0_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_1_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_2_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en",20412,],
-["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en",20412,],
+["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en",20413,],
+["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en",20413,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_5_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_6_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_6_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_7_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_7_en",0,],
@@ -1302,18 +1303,18 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_4_en",0,],
-["features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en","features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en",20412,],
+["features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en","features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en",20413,],
 ["features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Day_1_en","features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Night_1_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en",20412,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en",20413,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_en","",0,],
@@ -1321,18 +1322,18 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_3_en",20412,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en",20412,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_3_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en",20413,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_5_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_6_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_6_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en",20412,],
-["features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en",20412,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en",20412,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en",20413,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en",20412,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en",20412,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en",20413,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en",0,],
@@ -1341,41 +1342,41 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en",20412,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en",20413,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en",20412,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en",20413,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en",20412,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en",20413,],
 ["features.messages.impl.timeline.components_TimelineItemEventRow_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRow_Night_0_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en","",20412,],
+["features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en","",20413,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_4_en",0,],
-["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en",20412,],
-["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Night_0_en",20412,],
+["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Night_0_en",20413,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemInformativeView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemInformativeView_Night_0_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en",20412,],
+["features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en",20413,],
 ["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_1_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en",20412,],
-["features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en",20412,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en",20413,],
 ["features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Night_0_en",0,],
-["features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en",20412,],
-["features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en",20412,],
+["features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en",20413,],
 ["features.messages.impl.timeline.components_TimelineItemReactionsView_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsView_Night_0_en",0,],
-["features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en",20412,],
+["features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en",20413,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_0_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_1_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_2_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_2_en",0,],
@@ -1384,8 +1385,8 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_5_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_5_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_6_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_6_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_7_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_7_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en",20412,],
-["features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en",20412,],
+["features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en",20413,],
+["features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en",20413,],
 ["features.messages.impl.timeline.components_TimelineItemStateEventRow_Day_0_en","features.messages.impl.timeline.components_TimelineItemStateEventRow_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemStateView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemStateView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemStickerView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemStickerView_Night_0_en",0,],
@@ -1400,8 +1401,8 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_4_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_5_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en",20412,],
-["features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Night_0_en",20412,],
+["features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Night_0_en",20413,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_2_en",0,],
@@ -1424,85 +1425,85 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_9_en","features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_9_en",0,],
 ["features.messages.impl.timeline.components.virtual_TimelineLoadingMoreIndicator_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineLoadingMoreIndicator_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Day_0_en","features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Night_0_en",0,],
-["features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en","features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en",20412,],
-["features.messages.impl.timeline_TimelineView_Day_0_en","features.messages.impl.timeline_TimelineView_Night_0_en",20412,],
+["features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en","features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_0_en","features.messages.impl.timeline_TimelineView_Night_0_en",20413,],
 ["features.messages.impl.timeline_TimelineView_Day_10_en","features.messages.impl.timeline_TimelineView_Night_10_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_11_en","features.messages.impl.timeline_TimelineView_Night_11_en",20412,],
-["features.messages.impl.timeline_TimelineView_Day_12_en","features.messages.impl.timeline_TimelineView_Night_12_en",20412,],
-["features.messages.impl.timeline_TimelineView_Day_13_en","features.messages.impl.timeline_TimelineView_Night_13_en",20412,],
-["features.messages.impl.timeline_TimelineView_Day_14_en","features.messages.impl.timeline_TimelineView_Night_14_en",20412,],
-["features.messages.impl.timeline_TimelineView_Day_15_en","features.messages.impl.timeline_TimelineView_Night_15_en",20412,],
-["features.messages.impl.timeline_TimelineView_Day_16_en","features.messages.impl.timeline_TimelineView_Night_16_en",20412,],
-["features.messages.impl.timeline_TimelineView_Day_17_en","features.messages.impl.timeline_TimelineView_Night_17_en",20412,],
-["features.messages.impl.timeline_TimelineView_Day_1_en","features.messages.impl.timeline_TimelineView_Night_1_en",20412,],
+["features.messages.impl.timeline_TimelineView_Day_11_en","features.messages.impl.timeline_TimelineView_Night_11_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_12_en","features.messages.impl.timeline_TimelineView_Night_12_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_13_en","features.messages.impl.timeline_TimelineView_Night_13_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_14_en","features.messages.impl.timeline_TimelineView_Night_14_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_15_en","features.messages.impl.timeline_TimelineView_Night_15_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_16_en","features.messages.impl.timeline_TimelineView_Night_16_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_17_en","features.messages.impl.timeline_TimelineView_Night_17_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_1_en","features.messages.impl.timeline_TimelineView_Night_1_en",20413,],
 ["features.messages.impl.timeline_TimelineView_Day_2_en","features.messages.impl.timeline_TimelineView_Night_2_en",0,],
 ["features.messages.impl.timeline_TimelineView_Day_3_en","features.messages.impl.timeline_TimelineView_Night_3_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_4_en","features.messages.impl.timeline_TimelineView_Night_4_en",20412,],
+["features.messages.impl.timeline_TimelineView_Day_4_en","features.messages.impl.timeline_TimelineView_Night_4_en",20413,],
 ["features.messages.impl.timeline_TimelineView_Day_5_en","features.messages.impl.timeline_TimelineView_Night_5_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_6_en","features.messages.impl.timeline_TimelineView_Night_6_en",20412,],
+["features.messages.impl.timeline_TimelineView_Day_6_en","features.messages.impl.timeline_TimelineView_Night_6_en",20413,],
 ["features.messages.impl.timeline_TimelineView_Day_7_en","features.messages.impl.timeline_TimelineView_Night_7_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_8_en","features.messages.impl.timeline_TimelineView_Night_8_en",20412,],
+["features.messages.impl.timeline_TimelineView_Day_8_en","features.messages.impl.timeline_TimelineView_Night_8_en",20413,],
 ["features.messages.impl.timeline_TimelineView_Day_9_en","features.messages.impl.timeline_TimelineView_Night_9_en",0,],
 ["libraries.designsystem.components.avatar.internal_TombstonedRoomAvatar_Avatars_en","",0,],
 ["libraries.designsystem.theme.components_TopAppBarStr_App_Bars_en","",0,],
 ["libraries.designsystem.theme.components_TopAppBar_App_Bars_en","",0,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en",20412,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en",20412,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en",20412,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en",20412,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en",20412,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en",20412,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en",20412,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en",20412,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en",20413,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en",20413,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en",20413,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en",20413,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en",20413,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en",20413,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en",20413,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en",20413,],
 ["features.messages.impl.typing_TypingNotificationView_Day_0_en","features.messages.impl.typing_TypingNotificationView_Night_0_en",0,],
-["features.messages.impl.typing_TypingNotificationView_Day_1_en","features.messages.impl.typing_TypingNotificationView_Night_1_en",20412,],
-["features.messages.impl.typing_TypingNotificationView_Day_2_en","features.messages.impl.typing_TypingNotificationView_Night_2_en",20412,],
-["features.messages.impl.typing_TypingNotificationView_Day_3_en","features.messages.impl.typing_TypingNotificationView_Night_3_en",20412,],
-["features.messages.impl.typing_TypingNotificationView_Day_4_en","features.messages.impl.typing_TypingNotificationView_Night_4_en",20412,],
-["features.messages.impl.typing_TypingNotificationView_Day_5_en","features.messages.impl.typing_TypingNotificationView_Night_5_en",20412,],
-["features.messages.impl.typing_TypingNotificationView_Day_6_en","features.messages.impl.typing_TypingNotificationView_Night_6_en",20412,],
+["features.messages.impl.typing_TypingNotificationView_Day_1_en","features.messages.impl.typing_TypingNotificationView_Night_1_en",20413,],
+["features.messages.impl.typing_TypingNotificationView_Day_2_en","features.messages.impl.typing_TypingNotificationView_Night_2_en",20413,],
+["features.messages.impl.typing_TypingNotificationView_Day_3_en","features.messages.impl.typing_TypingNotificationView_Night_3_en",20413,],
+["features.messages.impl.typing_TypingNotificationView_Day_4_en","features.messages.impl.typing_TypingNotificationView_Night_4_en",20413,],
+["features.messages.impl.typing_TypingNotificationView_Day_5_en","features.messages.impl.typing_TypingNotificationView_Night_5_en",20413,],
+["features.messages.impl.typing_TypingNotificationView_Day_6_en","features.messages.impl.typing_TypingNotificationView_Night_6_en",20413,],
 ["features.messages.impl.typing_TypingNotificationView_Day_7_en","features.messages.impl.typing_TypingNotificationView_Night_7_en",0,],
 ["features.messages.impl.typing_TypingNotificationView_Day_8_en","features.messages.impl.typing_TypingNotificationView_Night_8_en",0,],
 ["libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Night_0_en",0,],
-["libraries.matrix.ui.components_UnresolvedUserRow_en","",20412,],
+["libraries.matrix.ui.components_UnresolvedUserRow_en","",20413,],
 ["libraries.matrix.ui.components_UnsavedAvatar_Day_0_en","libraries.matrix.ui.components_UnsavedAvatar_Night_0_en",0,],
 ["libraries.designsystem.components.avatar.internal_UserAvatarColors_Day_0_en","libraries.designsystem.components.avatar.internal_UserAvatarColors_Night_0_en",0,],
-["features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en",20412,],
-["features.startchat.impl.components_UserListView_Day_0_en","features.startchat.impl.components_UserListView_Night_0_en",20412,],
-["features.startchat.impl.components_UserListView_Day_1_en","features.startchat.impl.components_UserListView_Night_1_en",20412,],
-["features.startchat.impl.components_UserListView_Day_2_en","features.startchat.impl.components_UserListView_Night_2_en",20412,],
+["features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en",20413,],
+["features.startchat.impl.components_UserListView_Day_0_en","features.startchat.impl.components_UserListView_Night_0_en",20413,],
+["features.startchat.impl.components_UserListView_Day_1_en","features.startchat.impl.components_UserListView_Night_1_en",20413,],
+["features.startchat.impl.components_UserListView_Day_2_en","features.startchat.impl.components_UserListView_Night_2_en",20413,],
 ["features.startchat.impl.components_UserListView_Day_3_en","features.startchat.impl.components_UserListView_Night_3_en",0,],
 ["features.startchat.impl.components_UserListView_Day_4_en","features.startchat.impl.components_UserListView_Night_4_en",0,],
 ["features.startchat.impl.components_UserListView_Day_5_en","features.startchat.impl.components_UserListView_Night_5_en",0,],
 ["features.startchat.impl.components_UserListView_Day_6_en","features.startchat.impl.components_UserListView_Night_6_en",0,],
-["features.startchat.impl.components_UserListView_Day_7_en","features.startchat.impl.components_UserListView_Night_7_en",20412,],
+["features.startchat.impl.components_UserListView_Day_7_en","features.startchat.impl.components_UserListView_Night_7_en",20413,],
 ["features.startchat.impl.components_UserListView_Day_8_en","features.startchat.impl.components_UserListView_Night_8_en",0,],
-["features.startchat.impl.components_UserListView_Day_9_en","features.startchat.impl.components_UserListView_Night_9_en",20412,],
+["features.startchat.impl.components_UserListView_Day_9_en","features.startchat.impl.components_UserListView_Night_9_en",20413,],
 ["features.preferences.impl.user_UserPreferences_Day_0_en","features.preferences.impl.user_UserPreferences_Night_0_en",0,],
 ["features.preferences.impl.user_UserPreferences_Day_1_en","features.preferences.impl.user_UserPreferences_Night_1_en",0,],
 ["features.preferences.impl.user_UserPreferences_Day_2_en","features.preferences.impl.user_UserPreferences_Night_2_en",0,],
-["features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en","features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en",20412,],
-["features.userprofile.shared_UserProfileHeaderSection_Day_0_en","features.userprofile.shared_UserProfileHeaderSection_Night_0_en",20412,],
-["features.userprofile.shared_UserProfileView_Day_0_en","features.userprofile.shared_UserProfileView_Night_0_en",20412,],
-["features.userprofile.shared_UserProfileView_Day_1_en","features.userprofile.shared_UserProfileView_Night_1_en",20412,],
-["features.userprofile.shared_UserProfileView_Day_2_en","features.userprofile.shared_UserProfileView_Night_2_en",20412,],
-["features.userprofile.shared_UserProfileView_Day_3_en","features.userprofile.shared_UserProfileView_Night_3_en",20412,],
-["features.userprofile.shared_UserProfileView_Day_4_en","features.userprofile.shared_UserProfileView_Night_4_en",20412,],
-["features.userprofile.shared_UserProfileView_Day_5_en","features.userprofile.shared_UserProfileView_Night_5_en",20412,],
-["features.userprofile.shared_UserProfileView_Day_6_en","features.userprofile.shared_UserProfileView_Night_6_en",20412,],
-["features.userprofile.shared_UserProfileView_Day_7_en","features.userprofile.shared_UserProfileView_Night_7_en",20412,],
-["features.userprofile.shared_UserProfileView_Day_8_en","features.userprofile.shared_UserProfileView_Night_8_en",20412,],
-["features.userprofile.shared_UserProfileView_Day_9_en","features.userprofile.shared_UserProfileView_Night_9_en",20412,],
+["features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en","features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en",20413,],
+["features.userprofile.shared_UserProfileHeaderSection_Day_0_en","features.userprofile.shared_UserProfileHeaderSection_Night_0_en",20413,],
+["features.userprofile.shared_UserProfileView_Day_0_en","features.userprofile.shared_UserProfileView_Night_0_en",20413,],
+["features.userprofile.shared_UserProfileView_Day_1_en","features.userprofile.shared_UserProfileView_Night_1_en",20413,],
+["features.userprofile.shared_UserProfileView_Day_2_en","features.userprofile.shared_UserProfileView_Night_2_en",20413,],
+["features.userprofile.shared_UserProfileView_Day_3_en","features.userprofile.shared_UserProfileView_Night_3_en",20413,],
+["features.userprofile.shared_UserProfileView_Day_4_en","features.userprofile.shared_UserProfileView_Night_4_en",20413,],
+["features.userprofile.shared_UserProfileView_Day_5_en","features.userprofile.shared_UserProfileView_Night_5_en",20413,],
+["features.userprofile.shared_UserProfileView_Day_6_en","features.userprofile.shared_UserProfileView_Night_6_en",20413,],
+["features.userprofile.shared_UserProfileView_Day_7_en","features.userprofile.shared_UserProfileView_Night_7_en",20413,],
+["features.userprofile.shared_UserProfileView_Day_8_en","features.userprofile.shared_UserProfileView_Night_8_en",20413,],
+["features.userprofile.shared_UserProfileView_Day_9_en","features.userprofile.shared_UserProfileView_Night_9_en",20413,],
 ["features.verifysession.impl.ui_VerificationUserProfileContent_Day_0_en","features.verifysession.impl.ui_VerificationUserProfileContent_Night_0_en",0,],
 ["libraries.designsystem.ruler_VerticalRuler_Day_0_en","libraries.designsystem.ruler_VerticalRuler_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_1_en",0,],
-["features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en","features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en",20412,],
-["features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en","features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en",20412,],
+["features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en","features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en",20413,],
+["features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en","features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en",20413,],
 ["features.viewfolder.impl.file_ViewFileView_Day_0_en","features.viewfolder.impl.file_ViewFileView_Night_0_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_1_en","features.viewfolder.impl.file_ViewFileView_Night_1_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_2_en","features.viewfolder.impl.file_ViewFileView_Night_2_en",0,],
-["features.viewfolder.impl.file_ViewFileView_Day_3_en","features.viewfolder.impl.file_ViewFileView_Night_3_en",20412,],
+["features.viewfolder.impl.file_ViewFileView_Day_3_en","features.viewfolder.impl.file_ViewFileView_Night_3_en",20413,],
 ["features.viewfolder.impl.file_ViewFileView_Day_4_en","features.viewfolder.impl.file_ViewFileView_Night_4_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_5_en","features.viewfolder.impl.file_ViewFileView_Night_5_en",0,],
 ["features.viewfolder.impl.folder_ViewFolderView_Day_0_en","features.viewfolder.impl.folder_ViewFolderView_Night_0_en",0,],
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png
index a88b62fba0..51c0e52a4a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f9bce15f8c83865c215539629270f233b00aa6f313433d4a4d5bae74e6584c4
-size 44262
+oid sha256:08172934ef864d57cb335b738dea8ad6f96ee2df4710c4f9d7e5adc3d110ad67
+size 44215
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png
index 842147e3f0..92584108e8 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cd12c68415f61b198696a9f9d8b19da5e6ced287e015071a8a850100238862b
-size 49992
+oid sha256:ad1fce13a5034b6db192a0735317b6cf5f10536ac05ccf1cc4996ad029ce9513
+size 49951
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png
index 601d893545..a6d1f7bb95 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56ade704db88b09b1952df179e21c939779d7e7835424745971f16b87fc607f3
-size 24515
+oid sha256:7f509f0c857c9d2c0a23657d213ea49961bb900b652edd116c4dcf29853c7776
+size 24336
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png
index ed4e6f7c84..2b024e7b08 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ffd537ca46c6008cb186af649c2d83744d40d7c55bdc93a510373b85f2831e2
-size 44279
+oid sha256:bd62c76e687e342f46b792958ddd3c36d44f5c603e4ddbe79f4fd2a8e41b9750
+size 44198
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png
index ad5b94c86d..35fbc68769 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be897269967951ea0ddb0cc209005d07d4904531a8ab9d865b6e622c9ba98e18
-size 49747
+oid sha256:cc7dd1459c04997170247296b34b9bd7953418361c2d72840d43aa159000a806
+size 49655
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png
index 50b7d88a03..f137d5539a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93df87720426e598912ff2715b440503124fa3b7703ebe5c58c86d816e2632a7
-size 24476
+oid sha256:bd6d96abbeda8ab8dd7804929ed205cd2c1eb8bb04d83d00a343387e93bc693b
+size 24297
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png
index b536317715..5ffb675c87 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45c9afb0e9d60806b7fdf3b3377bf48b8a7e7976f69cb81bb5a7b7aca723b08a
-size 56838
+oid sha256:b4701427ccafa8bb12a8f384433862770b84c650268772e11df91343c25bb1b0
+size 56924
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png
index 73bf612214..f227c74f10 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c529cb7f8d705b6ec5d401fdad59befd9d2cd8391a65207a7aed4f3ad70f3553
-size 54803
+oid sha256:b307b024232c5033ab6aaf2930f244106fdb5a2bdd6c4919c24a60266fb4a814
+size 54885
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png
index 6a53772be9..08e6c8aad9 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1227822d8dc0bda1b59570e7ea825bc5b95ce3aac8c56ba47739950a4692fe9c
-size 57315
+oid sha256:aad071d4ebb05c5db831bbf75021b7dcc9de185455c7f0292d3275247bcd5b75
+size 57403
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png
index 9f972f15bd..474c7943ff 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08b4d5a2b0f0a9d11adb1295392ede1950c0bc3cbb7dae865e309dd301476f31
-size 57423
+oid sha256:25c09f5b840f62fc4d71b15acefb6ad73f64df7ed6e7228d0cdfd16487f1e20e
+size 57503
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en.png
index 0f99dccd38..1dc35b3b2b 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8307cf65f832870038708f805541336dc152a2989d67d24d334ef4d774d98bd5
-size 56535
+oid sha256:53101722bdc3002df0d01827753d56cd0d47676396967b4c0d8b01fe9d048947
+size 56621
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png
index aebdcc6a9a..43b341d174 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cebda6fa848e04c19d3c0662e76d49ce325c5c8949d65f91fa940295ac00eaee
-size 58906
+oid sha256:6d3bc2a629aceda805d0976f46c6cf9ddca8ef05123fafe5d51500d68fea5c99
+size 58981
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png
index 4e05cf5fcb..2ae2618dac 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db196c0997393e76812470ee2437952ed936efac9c545820389e269a4cafd506
-size 56833
+oid sha256:518131a76d772d7b7eddbf74702e4a2a477dfea2ae9b89de58269d02820bfdca
+size 56907
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png
index 1e08988275..afbdc3a813 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ae1617b038bd52d66c85c0b0137f158bb30a258c806035bff9679aebe6b2875
-size 59392
+oid sha256:767c62fbb463557379dae310a4d830c0f86818ace934a25307ea3befe86042ac
+size 59459
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png
index aa6f091f7b..52568b8670 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0478c0f3c2c0111db5815132c751dfb6b0f47f7fc117eabb3c01f5bbb213952f
-size 59506
+oid sha256:b85a87cdb67b1ef8280d65e77abb77f6319a029a571a0747c4c56c2f4a652824
+size 59580
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en.png
index b69e9ebd09..47ebe3a1fd 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:704c6d6e29cfe0f52445e0ab28b5fd5fb138321a93a964ee9b7e2fd0c3cfa65d
-size 58576
+oid sha256:083a8f10725f4573807865f02b53ca0a3c6ff2bf43d99997afa9412a547c33bd
+size 58652
diff --git a/tools/localazy/config.json b/tools/localazy/config.json
index 405451bb34..8cb1228b94 100644
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@@ -198,6 +198,7 @@
         "screen_room_details_.*",
         "screen\\.room_details\\..*",
         "screen_room_member_list_.*",
+        "screen\\.room_member_list\\..*",
         "screen_room_notification_settings_.*",
         "screen_notification_settings_edit_failed_updating_default_mode",
         "screen_polls_history_title",
@@ -373,7 +374,8 @@
         "screen_room_change_.*",
         "screen_room_roles_.*",
         "screen\\.room_roles_and_permissions\\..*",
-        "screen_room_member_list.*"
+        "screen_room_member_list.*",
+        "screen\\.room_member_list\\..*"
       ]
     }
   ]

From 1246bfa21e4e876a4f93962c3a0c6417d92b79cf Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 24 Nov 2025 20:22:11 +0100
Subject: [PATCH 044/113] deps(sdk) : add fallbackToServer on userIdentity api.

---
 .../matrix/api/encryption/EncryptionService.kt       |  6 +++---
 .../matrix/impl/encryption/RustEncryptionService.kt  | 12 ++++--------
 .../matrix/test/encryption/FakeEncryptionService.kt  |  7 +------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt
index 4ae75774c1..aefad517dc 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt
@@ -64,8 +64,6 @@ interface EncryptionService {
      */
     suspend fun startIdentityReset(): Result<IdentityResetHandle?>
 
-    suspend fun isUserVerified(userId: UserId): Result<Boolean>
-
     /**
      * Remember this identity, ensuring it does not result in a pin violation.
      */
@@ -82,8 +80,10 @@ interface EncryptionService {
 
     /**
      * Get the identity state of a user, if known.
+     * @param userId the user id to get the identity for.
+     * @param fallbackToServer whether to fallback to fetching the identity from the server if not known locally. Defaults to true.
      */
-    suspend fun getUserIdentity(userId: UserId): Result<IdentityState?>
+    suspend fun getUserIdentity(userId: UserId, fallbackToServer: Boolean = true): Result<IdentityState?>
 }
 
 /**
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
index 6ebf80337c..e081d1c9f1 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
@@ -240,10 +240,6 @@ class RustEncryptionService(
         }
     }
 
-    override suspend fun isUserVerified(userId: UserId): Result<Boolean> = runCatchingExceptions {
-        getUserIdentityInternal(userId).isVerified()
-    }
-
     override suspend fun pinUserIdentity(userId: UserId): Result<Unit> = runCatchingExceptions {
         getUserIdentityInternal(userId).pin()
     }
@@ -252,8 +248,8 @@ class RustEncryptionService(
         getUserIdentityInternal(userId).withdrawVerification()
     }
 
-    override suspend fun getUserIdentity(userId: UserId): Result<IdentityState?> = runCatchingExceptions {
-        val identity = getUserIdentityInternal(userId)
+    override suspend fun getUserIdentity(userId: UserId, fallbackToServer: Boolean): Result<IdentityState?> = runCatchingExceptions {
+        val identity = getUserIdentityInternal(userId, fallbackToServer)
         val isVerified = identity.isVerified()
         when {
             identity.hasVerificationViolation() -> IdentityState.VerificationViolation
@@ -263,10 +259,10 @@ class RustEncryptionService(
         }
     }
 
-    suspend fun getUserIdentityInternal(userId: UserId): UserIdentity {
+    private suspend fun getUserIdentityInternal(userId: UserId, fallbackToServer: Boolean = true): UserIdentity {
         return service.userIdentity(
             userId = userId.value,
-            // requestFromHomeserverIfNeeded = true,
+            fallbackToServer = fallbackToServer,
         ) ?: error("User identity not found")
     }
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt
index a94de15f1e..04e3779298 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt
@@ -26,7 +26,6 @@ import kotlinx.coroutines.flow.flowOf
 class FakeEncryptionService(
     var startIdentityResetLambda: () -> Result<IdentityResetHandle?> = { lambdaError() },
     private val pinUserIdentityResult: (UserId) -> Result<Unit> = { lambdaError() },
-    private val isUserVerifiedResult: (UserId) -> Result<Boolean> = { lambdaError() },
     private val withdrawVerificationResult: (UserId) -> Result<Unit> = { lambdaError() },
     private val getUserIdentityResult: (UserId) -> Result<IdentityState?> = { lambdaError() },
     private val enableRecoveryLambda: (Boolean) -> Result<Unit> = { lambdaError() },
@@ -139,11 +138,7 @@ class FakeEncryptionService(
         return withdrawVerificationResult(userId)
     }
 
-    override suspend fun isUserVerified(userId: UserId): Result<Boolean> = simulateLongTask {
-        isUserVerifiedResult(userId)
-    }
-
-    override suspend fun getUserIdentity(userId: UserId): Result<IdentityState?> = simulateLongTask {
+    override suspend fun getUserIdentity(userId: UserId, fallbackToServer: Boolean): Result<IdentityState?> = simulateLongTask {
         return getUserIdentityResult(userId)
     }
 

From 46136aafe4e6b97aced7231265d9192b430ee720 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 24 Nov 2025 20:23:46 +0100
Subject: [PATCH 045/113] change(member list): use only local user identity

---
 .../roomdetails/impl/members/RoomMemberListPresenter.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
index e69ddb744a..9274c1a8e5 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -179,7 +179,7 @@ class RoomMemberListPresenter(
         return if (room.info().isEncrypted != true) {
             RoomMemberWithIdentityState(this, null)
         } else {
-            val identityState = identityStates[userId] ?: encryptionService.getUserIdentity(userId).getOrNull()
+            val identityState = identityStates[userId] ?: encryptionService.getUserIdentity(userId, fallbackToServer = false).getOrNull()
             RoomMemberWithIdentityState(this, identityState)
         }
     }

From 5d6bd1edd9a6e4004fb36c115116ba3d31fb9da1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Nov 2025 10:28:23 +0100
Subject: [PATCH 046/113] fix(deps): update metro to v0.7.7 (#5771)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 593aaa2d70..29b5e722db 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -53,7 +53,7 @@ haze = "1.6.10"
 dependencyAnalysis = "3.5.0"
 
 # DI
-metro = "0.7.6"
+metro = "0.7.7"
 
 # Auto service
 autoservice = "1.1.1"

From c5f636b4ef80675f18867dd28e382cec8d01ca11 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Nov 2025 10:37:57 +0100
Subject: [PATCH 047/113] chore(deps): update plugin sonarqube to v7.1.0.6387
 (#5783)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 29b5e722db..3743d8800f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -265,7 +265,7 @@ roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 firebaseAppDistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppDistribution" }
 knit = { id = "org.jetbrains.kotlinx.knit", version = "0.5.0" }
-sonarqube = "org.sonarqube:7.0.1.6134"
+sonarqube = "org.sonarqube:7.1.0.6387"
 licensee = "app.cash.licensee:1.14.1"
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 gms_google_services = { id = "com.google.gms.google-services", version = "4.4.4" }

From 1195b9a32c06106d4265c2cce4311391de064b85 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 25 Nov 2025 11:01:18 +0100
Subject: [PATCH 048/113] quality: fix test after api removal

---
 .../features/userprofile/impl/UserProfilePresenterTest.kt       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt b/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt
index 8dcf6aab20..aa984f0066 100644
--- a/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt
+++ b/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt
@@ -386,14 +386,12 @@ class UserProfilePresenterTest {
     }
 
     private fun createFakeMatrixClient(
-        isUserVerified: Boolean = true,
         userIdentityState: IdentityState? = null,
         ignoreUserResult: (UserId) -> Result<Unit> = { Result.success(Unit) },
         unIgnoreUserResult: (UserId) -> Result<Unit> = { Result.success(Unit) },
         ignoredUsersFlow: StateFlow<ImmutableList<UserId>> = MutableStateFlow(persistentListOf())
     ) = FakeMatrixClient(
         encryptionService = FakeEncryptionService(
-            isUserVerifiedResult = { Result.success(isUserVerified) },
             getUserIdentityResult = { Result.success(userIdentityState) }
         ),
         ignoreUserResult = ignoreUserResult,

From f3602c2d8a4de064e7a3feb5f9612a7df10c21c8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Nov 2025 11:17:54 +0100
Subject: [PATCH 049/113] fix(deps): update dependency
 io.github.sergio-sastre.composablepreviewscanner:android to v0.7.2 (#5799)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3743d8800f..86d4ef286e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -168,7 +168,7 @@ test_truth = "com.google.truth:truth:1.4.5"
 test_parameter_injector = "com.google.testparameterinjector:test-parameter-injector:1.19"
 test_robolectric = "org.robolectric:robolectric:4.15.1"
 test_appyx_junit = { module = "com.bumble.appyx:testing-junit4", version.ref = "appyx" }
-test_composable_preview_scanner = "io.github.sergio-sastre.ComposablePreviewScanner:android:0.7.1"
+test_composable_preview_scanner = "io.github.sergio-sastre.ComposablePreviewScanner:android:0.7.2"
 test_detekt_api = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" }
 test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version.ref = "detekt" }
 

From 6a23c4a68556d5af2ba6c94e225de9dade8c9aa8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Nov 2025 10:20:00 +0000
Subject: [PATCH 050/113] fix(deps): update dependency
 io.element.android:emojibase-bindings to v1.5.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 86d4ef286e..805046016c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -223,7 +223,7 @@ sentry = "io.sentry:sentry-android:8.26.0"
 matrix_analytics_events = "com.github.matrix-org:matrix-analytics-events:0.29.2"
 
 # Emojibase
-matrix_emojibase_bindings = "io.element.android:emojibase-bindings:1.4.3"
+matrix_emojibase_bindings = "io.element.android:emojibase-bindings:1.5.0"
 sigpwned_emoji4j = "com.sigpwned:emoji4j-core:16.0.0"
 
 # Di

From 58d0eb260ae9c214e288fc97700033947d99aa48 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Nov 2025 12:25:37 +0100
Subject: [PATCH 051/113] fix(deps): update dependency io.sentry:sentry-android
 to v8.27.1 (#5803)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0f55838342..d711044198 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -218,7 +218,7 @@ color_picker = "io.mhssn:colorpicker:1.0.0"
 
 # Analytics
 posthog = "com.posthog:posthog-android:3.26.0"
-sentry = "io.sentry:sentry-android:8.26.0"
+sentry = "io.sentry:sentry-android:8.27.1"
 # main branch can be tested replacing the version with main-SNAPSHOT
 matrix_analytics_events = "com.github.matrix-org:matrix-analytics-events:0.29.2"
 

From b7c2c4559556b4d5ef3248e71cb3f73e2697d8f6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Nov 2025 11:27:27 +0000
Subject: [PATCH 052/113] fix(deps): update roborazzi to v1.52.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d711044198..8ba5f4112e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -33,7 +33,7 @@ accompanist = "0.37.3"
 
 # Test
 test_core = "1.7.0"
-roborazzi = "1.51.0"
+roborazzi = "1.52.0"
 
 # Jetbrain
 datetime = "0.7.1"

From 94c985aebb48e574ae2021ff958da3703ce3170b Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 25 Nov 2025 12:54:35 +0100
Subject: [PATCH 053/113] change(members): update tests to match new ui and
 logic

---
 .../impl/members/RoomMemberListPresenter.kt   |   6 +-
 .../members/RoomMemberListStateProvider.kt    | 187 ++++------
 .../members/RoomMemberListPresenterTest.kt    | 319 +++++++-----------
 3 files changed, 198 insertions(+), 314 deletions(-)

diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
index 3d59b3d922..eb4735de6e 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -25,7 +25,6 @@ import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.map
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
@@ -59,9 +58,6 @@ class RoomMemberListPresenter(
     @Composable
     override fun present(): RoomMemberListState {
         var searchQuery by rememberSaveable { mutableStateOf("") }
-        var searchResults by remember {
-            mutableStateOf<SearchBarResultState<AsyncData<RoomMembers>>>(SearchBarResultState.Initial())
-        }
         val membersState by room.membersStateFlow.collectAsState()
         val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
         val canInvite by room.canInviteAsState(syncUpdateFlow.value)
@@ -75,8 +71,8 @@ class RoomMemberListPresenter(
                 .launchIn(this)
         }
 
-        var roomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading()) }
         var selectedSection by remember { mutableStateOf(SelectedSection.MEMBERS) }
+        var roomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading()) }
         var filteredRoomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading()) }
 
         // Update the room members when the screen is loaded
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
index b03faa97cb..580db7667a 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
@@ -12,7 +12,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.architecture.map
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.RoomMember
@@ -21,108 +21,59 @@ import kotlinx.collections.immutable.persistentListOf
 
 internal class RoomMemberListStateProvider : PreviewParameterProvider<RoomMemberListState> {
     override val values: Sequence<RoomMemberListState>
-        get() = roomMemberListStates() + bannedRoomMemberListStates()
+        get() = sequenceOf(
+            aRoomMemberListState(
+                roomMembers = AsyncData.Loading(),
+                selectedSection = SelectedSection.MEMBERS,
+            ),
+            aRoomMemberListState(
+                roomMembers = AsyncData.Failure(Exception("Error details")),
+                selectedSection = SelectedSection.MEMBERS,
+            ),
+            aRoomMemberListState(
+                roomMembers = aLoadedRoomMembers(),
+                selectedSection = SelectedSection.MEMBERS,
+            ),
+            aRoomMemberListState(
+                roomMembers = aLoadedRoomMembers(),
+                selectedSection = SelectedSection.BANNED,
+                moderationState = aRoomMemberModerationState(canBan = true),
+            ),
+            aRoomMemberListState(
+                roomMembers = aLoadedRoomMembers(),
+                canInvite = true,
+                selectedSection = SelectedSection.MEMBERS,
+            ),
+            aRoomMemberListState(
+                roomMembers = aLoadedRoomMembers(),
+                searchQuery = "alice",
+                selectedSection = SelectedSection.MEMBERS,
+            ),
+            aRoomMemberListState(
+                roomMembers = aLoadedRoomMembers(),
+                searchQuery = "something-with-no-results",
+                selectedSection = SelectedSection.MEMBERS,
+            ),
+        )
 }
 
-private fun roomMemberListStates(): Sequence<RoomMemberListState> = sequenceOf(
-    aRoomMemberListState(
-        roomMembers = AsyncData.Success(
-            RoomMembers(
-                invited = persistentListOf(aVictor().withIdentity(), aWalter().withIdentity()),
-                joined = persistentListOf(anAlice().withIdentity(), aBob().withIdentity(), aWalter().withIdentity()),
-                banned = persistentListOf(),
-            ),
+private fun aLoadedRoomMembers() = AsyncData.Success(
+    RoomMembers(
+        invited = persistentListOf(
+            anInvitedVictor().withIdentity(),
+            anInvitedWalter().withIdentity(),
         ),
-        selectedSection = SelectedSection.MEMBERS,
-    ),
-    aRoomMemberListState(
-        roomMembers = AsyncData.Success(
-            RoomMembers(
-                invited = persistentListOf(aVictor().withIdentity(), aWalter().withIdentity()),
-                joined = persistentListOf(
-                    anAlice().withIdentity(identityState = IdentityState.Verified),
-                    aBob().withIdentity(identityState = IdentityState.PinViolation),
-                    aWalter().withIdentity(identityState = IdentityState.VerificationViolation)
-                ),
-                banned = persistentListOf(),
-            )
+        joined = persistentListOf(
+            anAlice().withIdentity(identityState = IdentityState.Verified),
+            aBob().withIdentity(identityState = IdentityState.PinViolation),
+            aCarol().withIdentity(),
+            aDavid().withIdentity(),
+            anEve().withIdentity(identityState = IdentityState.VerificationViolation)
         ),
-        selectedSection = SelectedSection.MEMBERS,
-        moderationState = aRoomMemberModerationState(canBan = true)
-    ),
-    aRoomMemberListState(
-        roomMembers = AsyncData.Loading(),
-        selectedSection = SelectedSection.MEMBERS,
-    ),
-    aRoomMemberListState().copy(
-        canInvite = true,
-        selectedSection = SelectedSection.MEMBERS,
-    ),
-    aRoomMemberListState().copy(
-        selectedSection = SelectedSection.MEMBERS,
-    ),
-    aRoomMemberListState().copy(
-        selectedSection = SelectedSection.MEMBERS,
-    ),
-    aRoomMemberListState().copy(
-        searchQuery = "someone",
-        selectedSection = SelectedSection.MEMBERS,
-    ),
-    aRoomMemberListState().copy(
-        searchQuery = "@someone:matrix.org",
-        selectedSection = SelectedSection.MEMBERS,
-    ),
-    aRoomMemberListState().copy(
-        searchQuery = "something-with-no-results",
-        selectedSection = SelectedSection.MEMBERS,
-    ),
-    aRoomMemberListState(
-        roomMembers = AsyncData.Failure(Exception("Error details")),
-        selectedSection = SelectedSection.MEMBERS,
-    ),
-)
-
-private fun bannedRoomMemberListStates(): Sequence<RoomMemberListState> = sequenceOf(
-    aRoomMemberListState(
-        roomMembers = AsyncData.Success(
-            RoomMembers(
-                invited = persistentListOf(),
-                joined = persistentListOf(),
-                banned = persistentListOf(
-                    aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice").withIdentity(),
-                    aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob").withIdentity(),
-                    aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie").withIdentity(),
-                ),
-            )
+        banned = persistentListOf(
+            aBannedMallory().withIdentity(),
+            aBannedSusie().withIdentity()
         ),
-        moderationState = aRoomMemberModerationState(),
-        selectedSection = SelectedSection.BANNED,
-    ),
-    aRoomMemberListState(
-        roomMembers = AsyncData.Loading(
-            RoomMembers(
-                invited = persistentListOf(),
-                joined = persistentListOf(),
-                banned = persistentListOf(
-                    aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice").withIdentity(),
-                    aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob").withIdentity(),
-                    aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie").withIdentity(),
-                ),
-            )
-        ),
-        moderationState = aRoomMemberModerationState(),
-        selectedSection = SelectedSection.BANNED,
-    ),
-    aRoomMemberListState(
-        roomMembers = AsyncData.Success(
-            RoomMembers(
-                invited = persistentListOf(),
-                joined = persistentListOf(),
-                banned = persistentListOf(),
-            )
-        ),
-        moderationState = aRoomMemberModerationState(),
-        selectedSection = SelectedSection.BANNED,
     )
 )
 
@@ -130,14 +81,17 @@ internal fun aRoomMemberListState(
     roomMembers: AsyncData<RoomMembers> = AsyncData.Loading(),
     moderationState: RoomMemberModerationState = aRoomMemberModerationState(),
     selectedSection: SelectedSection = SelectedSection.MEMBERS,
+    searchQuery: String = "",
+    canInvite: Boolean = false,
+    eventSink: (RoomMemberListEvents) -> Unit = {},
 ) = RoomMemberListState(
     roomMembers = roomMembers,
-    filteredRoomMembers = roomMembers,
-    searchQuery = "",
-    canInvite = false,
+    filteredRoomMembers = roomMembers.map { it.filter(searchQuery) },
+    searchQuery = searchQuery,
+    canInvite = canInvite,
     moderationState = moderationState,
     selectedSection = selectedSection,
-    eventSink = {}
+    eventSink = eventSink
 )
 
 fun aRoomMemberModerationState(
@@ -176,21 +130,30 @@ fun aRoomMember(
 fun aRoomMemberList() = persistentListOf(
     anAlice(),
     aBob(),
-    aRoomMember(UserId("@carol:server.org"), "Carol"),
-    aRoomMember(UserId("@david:server.org"), "David"),
-    aRoomMember(UserId("@eve:server.org"), "Eve"),
-    aRoomMember(UserId("@justin:server.org"), "Justin"),
-    aRoomMember(UserId("@mallory:server.org"), "Mallory"),
-    aRoomMember(UserId("@susie:server.org"), "Susie"),
-    aVictor(),
-    aWalter(),
+    aCarol(),
+    aDavid(),
+    anEve(),
+    anInvitedVictor(),
+    anInvitedWalter(),
+    aBannedSusie(),
+    aBannedMallory(),
 )
 
+fun anEve(): RoomMember = aRoomMember(UserId("@eve:server.org"), "Eve")
+
+fun aDavid(): RoomMember = aRoomMember(UserId("@david:server.org"), "David")
+
+fun aCarol(): RoomMember = aRoomMember(UserId("@carol:server.org"), "Carol")
+
 fun anAlice() = aRoomMember(UserId("@alice:server.org"), "Alice", role = RoomMember.Role.Admin)
 fun aBob() = aRoomMember(UserId("@bob:server.org"), "Bob", role = RoomMember.Role.Moderator)
 
-fun aVictor() = aRoomMember(UserId("@victor:server.org"), "Victor", membership = RoomMembershipState.INVITE)
+fun anInvitedVictor() = aRoomMember(UserId("@victor:server.org"), "Victor", membership = RoomMembershipState.INVITE)
 
-fun aWalter() = aRoomMember(UserId("@walter:server.org"), "Walter", membership = RoomMembershipState.INVITE)
+fun anInvitedWalter() = aRoomMember(UserId("@walter:server.org"), "Walter", membership = RoomMembershipState.INVITE)
+
+fun aBannedSusie(): RoomMember = aRoomMember(UserId("@susie:server.org"), "Susie", membership = RoomMembershipState.BAN)
+
+fun aBannedMallory(): RoomMember = aRoomMember(UserId("@mallory:server.org"), "Mallory", membership = RoomMembershipState.BAN)
 
 private fun RoomMember.withIdentity(identityState: IdentityState? = null) = RoomMemberWithIdentityState(this, identityState)
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
index 3c0fe34366..1548feae88 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
@@ -8,36 +8,27 @@
 
 package io.element.android.features.roomdetails.impl.members
 
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMembersState
+import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.tests.testutils.WarmUpRule
-import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
-import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
-import kotlinx.coroutines.time.withTimeout
-import kotlinx.coroutines.withTimeout
 import org.junit.Rule
 import org.junit.Test
-import kotlin.time.Duration.Companion.seconds
 
 @ExperimentalCoroutinesApi
 class RoomMemberListPresenterTest {
@@ -45,176 +36,132 @@ class RoomMemberListPresenterTest {
     val warmUpRule = WarmUpRule()
 
     @Test
-    fun `member loading is done automatically on start, but is async`() = runTest {
-        val room = FakeJoinedRoom(
-            baseRoom = FakeBaseRoom(
-                updateMembersResult = { Result.success(Unit) },
-                canInviteResult = { Result.success(true) }
-            ).apply {
-                // Needed to avoid discarding the loaded members as a partial and invalid result
-                givenRoomInfo(aRoomInfo(joinedMembersCount = 2))
-            }
-        )
-        val presenter = createPresenter(joinedRoom = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+    fun `initial state is loading`() = runTest {
+        val presenter = createPresenter()
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
-            assertThat(initialState.roomMembers.isLoading()).isTrue()
+            assertThat(initialState.filteredRoomMembers.isLoading()).isTrue()
             assertThat(initialState.searchQuery).isEmpty()
-            assertThat(initialState.searchResults).isInstanceOf(SearchBarResultState.Initial::class.java)
-            assertThat(initialState.isSearchActive).isFalse()
-            room.givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            // Skip item while the new members state is processed
-            skipItems(1)
-            val loadedMembersState = awaitItem()
-            assertThat(loadedMembersState.roomMembers.isLoading()).isFalse()
-            assertThat(loadedMembersState.roomMembers.dataOrNull()?.invited)
-                .isEqualTo(listOf(RoomMemberWithIdentityState(aVictor(), null), RoomMemberWithIdentityState(aWalter(), null)))
-            assertThat(loadedMembersState.roomMembers.dataOrNull()?.joined).isNotEmpty()
+            assertThat(initialState.selectedSection).isEqualTo(SelectedSection.MEMBERS)
         }
     }
 
     @Test
-    fun `member loading is done automatically when RoomInfo's activeMemberCount changes`() = runTest {
-        val reloadMembersMutex = Mutex()
-        val updateMembersLambda = lambdaRecorder<Unit> {
-            if (reloadMembersMutex.isLocked) {
-                reloadMembersMutex.unlock()
+    fun `hide banned section when there is no banned users`() = runTest {
+        val allRoomMembers = aRoomMemberList()
+        val noBannedMembers = allRoomMembers
+            .filterNot { it.membership == RoomMembershipState.BAN }
+            .toImmutableList()
+        val room = createFakeJoinedRoom()
+            .apply {
+                givenRoomMembersState(RoomMembersState.Ready(allRoomMembers))
             }
-        }
-        val room = FakeJoinedRoom(
-            baseRoom = FakeBaseRoom(
-                updateMembersResult = updateMembersLambda,
-                canInviteResult = { Result.success(true) }
-            ).apply {
-                // Needed to avoid discarding the loaded members as a partial and invalid result
-                givenRoomInfo(aRoomInfo(joinedMembersCount = 2))
-            }
-        )
-        val presenter = createPresenter(joinedRoom = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
-            val initialState = awaitItem()
-            assertThat(initialState.roomMembers.isLoading()).isTrue()
-            room.givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            // Skip item while the new members state is processed
-            skipItems(1)
-            val loadedMembersState = awaitItem()
-            assertThat(loadedMembersState.roomMembers.isLoading()).isFalse()
-            assertThat(loadedMembersState.roomMembers.dataOrNull()?.joined).isNotEmpty()
-
-            // Assert no events are emitted only with that change
-            expectNoEvents()
-
-            // This will only progress if the `Room.updateMembers()` function is called, triggered by the RoomInfo change
-            withTimeout(10.seconds) {
-                reloadMembersMutex.withLock {
-                    launch { room.givenRoomInfo(aRoomInfo(activeMembersCount = 0L)) }
-                }
-            }
-
-            // Update the room members state as `Room.updateMembers()` would have done with the actual implementation
-            room.givenRoomMembersState(RoomMembersState.Ready(persistentListOf()))
-            // Wait for another update
-            skipItems(1)
-            // The members should be reloaded now
-            assertThat(awaitItem().roomMembers.dataOrNull()?.joined).isEmpty()
-        }
-    }
-
-    @Test
-    fun `open search`() = runTest {
         val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    updateMembersResult = { Result.success(Unit) },
-                    canInviteResult = { Result.success(true) }
-                )
-            )
+            joinedRoom = room,
+            roomMemberModerationState = aRoomMemberModerationState(canBan = true),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val loadedState = awaitItem()
-            loadedState.eventSink(RoomMemberListEvents.OnSearchActiveChanged(true))
+            assertThat(loadedState.showBannedSection).isTrue()
+            loadedState.eventSink(RoomMemberListEvents.ChangeSelectedSection(SelectedSection.BANNED))
+            val bannedSectionState = awaitItem()
+            assertThat(bannedSectionState.selectedSection).isEqualTo(SelectedSection.BANNED)
+            // Now update the room members to have no banned users
+            room.givenRoomMembersState(RoomMembersState.Ready(noBannedMembers))
             skipItems(1)
-            val searchActiveState = awaitItem()
-            assertThat(searchActiveState.isSearchActive).isTrue()
+            val noBannedMembersState = awaitItem()
+            assertThat(noBannedMembersState.showBannedSection).isFalse()
+            skipItems(1)
+            val finalState = awaitItem()
+            assertThat(finalState.selectedSection).isEqualTo(SelectedSection.MEMBERS)
+        }
+
+    }
+
+    @Test
+    fun `member loading is done automatically on start, but is async`() = runTest {
+        val room = createFakeJoinedRoom()
+        val presenter = createPresenter(joinedRoom = room)
+        presenter.test {
+            skipItems(1)
+            val initialState = awaitItem()
+            assertThat(initialState.filteredRoomMembers.isLoading()).isTrue()
+            assertThat(initialState.searchQuery).isEmpty()
+            room.givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
+            // Skip items while the new members state is processed
+            skipItems(2)
+            val loadedState = awaitItem()
+            val loadedRoomMembers = loadedState.filteredRoomMembers.dataOrNull()!!
+            assertThat(loadedRoomMembers.joined).isNotEmpty()
+            assertThat(loadedRoomMembers.banned).isNotEmpty()
+            assertThat(loadedRoomMembers.invited).isNotEmpty()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.MEMBERS)).isFalse()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.BANNED)).isFalse()
         }
     }
 
     @Test
     fun `search for something which is not found`() = runTest {
-        val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    updateMembersResult = { Result.success(Unit) },
-                    canInviteResult = { Result.success(true) }
-                )
-            )
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val room = createFakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
+        }
+        val presenter = createPresenter(joinedRoom = room)
+        presenter.test {
             skipItems(1)
             val loadedState = awaitItem()
-            loadedState.eventSink(RoomMemberListEvents.OnSearchActiveChanged(true))
-            val searchActiveState = awaitItem()
-            searchActiveState.eventSink(RoomMemberListEvents.UpdateSearchQuery("something"))
-            skipItems(1)
+            val loadedRoomMembers = loadedState.filteredRoomMembers.dataOrNull()!!
+            assertThat(loadedRoomMembers.joined).isNotEmpty()
+            assertThat(loadedRoomMembers.banned).isNotEmpty()
+            assertThat(loadedRoomMembers.invited).isNotEmpty()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.MEMBERS)).isFalse()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.BANNED)).isFalse()
+            loadedState.eventSink(RoomMemberListEvents.UpdateSearchQuery("something"))
             val searchQueryUpdatedState = awaitItem()
             assertThat(searchQueryUpdatedState.searchQuery).isEqualTo("something")
             val searchSearchResultDelivered = awaitItem()
-            assertThat(searchSearchResultDelivered.searchResults).isInstanceOf(SearchBarResultState.NoResultsFound::class.java)
+            val emptyRoomMembers = searchSearchResultDelivered.filteredRoomMembers.dataOrNull()!!
+            assertThat(emptyRoomMembers.joined).isEmpty()
+            assertThat(emptyRoomMembers.banned).isEmpty()
+            assertThat(emptyRoomMembers.invited).isEmpty()
+            assertThat(emptyRoomMembers.isEmpty(SelectedSection.MEMBERS)).isTrue()
+            assertThat(emptyRoomMembers.isEmpty(SelectedSection.BANNED)).isTrue()
         }
     }
 
     @Test
     fun `search for something which is found`() = runTest {
-        val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    updateMembersResult = { Result.success(Unit) },
-                    canInviteResult = { Result.success(true) }
-                )
-            )
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val room = createFakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
+        }
+        val presenter = createPresenter(joinedRoom = room)
+        presenter.test {
             skipItems(1)
             val loadedState = awaitItem()
-            loadedState.eventSink(RoomMemberListEvents.OnSearchActiveChanged(true))
-            val searchActiveState = awaitItem()
-            searchActiveState.eventSink(RoomMemberListEvents.UpdateSearchQuery("Alice"))
-            skipItems(1)
+            val loadedRoomMembers = loadedState.filteredRoomMembers.dataOrNull()!!
+            assertThat(loadedRoomMembers.joined).isNotEmpty()
+            assertThat(loadedRoomMembers.banned).isNotEmpty()
+            assertThat(loadedRoomMembers.invited).isNotEmpty()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.MEMBERS)).isFalse()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.BANNED)).isFalse()
+            loadedState.eventSink(RoomMemberListEvents.UpdateSearchQuery("alice"))
             val searchQueryUpdatedState = awaitItem()
-            assertThat(searchQueryUpdatedState.searchQuery).isEqualTo("Alice")
+            assertThat(searchQueryUpdatedState.searchQuery).isEqualTo("alice")
             val searchSearchResultDelivered = awaitItem()
-            assertThat(searchSearchResultDelivered.searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
-            assertThat((searchSearchResultDelivered.searchResults as SearchBarResultState.Results).results.dataOrNull()!!.joined.first().roomMember.displayName)
-                .isEqualTo("Alice")
+            val emptyRoomMembers = searchSearchResultDelivered.filteredRoomMembers.dataOrNull()!!
+            assertThat(emptyRoomMembers.joined).isNotEmpty()
+            assertThat(emptyRoomMembers.banned).isEmpty()
+            assertThat(emptyRoomMembers.invited).isEmpty()
+            assertThat(emptyRoomMembers.isEmpty(SelectedSection.MEMBERS)).isFalse()
+            assertThat(emptyRoomMembers.isEmpty(SelectedSection.BANNED)).isTrue()
         }
     }
 
     @Test
     fun `present - asynchronously sets canInvite when user has correct power level`() = runTest {
-        val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    canInviteResult = { Result.success(true) },
-                    updateMembersResult = { Result.success(Unit) }
-                )
-            )
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val presenter = createPresenter()
+        presenter.test {
             skipItems(1)
             val loadedState = awaitItem()
             assertThat(loadedState.canInvite).isTrue()
@@ -224,17 +171,11 @@ class RoomMemberListPresenterTest {
     @Test
     fun `present - asynchronously sets canInvite when user does not have correct power level`() = runTest {
         val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    canInviteResult = { Result.success(false) },
-                    updateMembersResult = { Result.success(Unit) }
-                )
+            joinedRoom = createFakeJoinedRoom(
+                canInviteResult = { Result.success(false) },
             )
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        presenter.test {
             val loadedState = awaitItem()
             assertThat(loadedState.canInvite).isFalse()
         }
@@ -243,70 +184,54 @@ class RoomMemberListPresenterTest {
     @Test
     fun `present - asynchronously sets canInvite when power level check fails`() = runTest {
         val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    canInviteResult = { Result.failure(RuntimeException("Eek")) },
-                    updateMembersResult = { Result.success(Unit) }
-                )
+            joinedRoom = createFakeJoinedRoom(
+                canInviteResult = { Result.failure(RuntimeException("Eek")) },
             )
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        presenter.test {
             val loadedState = awaitItem()
             assertThat(loadedState.canInvite).isFalse()
         }
     }
 
     @Test
-    fun `present - RoomMemberSelected will open the moderation options when target user is not banned`() = runTest {
-        val roomMemberModerationPresenter = Presenter {
-            aRoomMemberModerationState(canBan = true, canKick = true)
-        }
+    fun `present - RoomMemberSelected will open the moderation options`() = runTest {
         val presenter = createPresenter(
-            roomMemberModerationPresenter = roomMemberModerationPresenter,
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    updateMembersResult = { Result.success(Unit) },
-                    canInviteResult = { Result.success(true) }
-                )
-            )
+            roomMemberModerationState = aRoomMemberModerationState(canBan = true, canKick = true)
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
-            awaitItem().eventSink(RoomMemberListEvents.RoomMemberSelected(aVictor()))
+            awaitItem().eventSink(RoomMemberListEvents.RoomMemberSelected(anInvitedVictor()))
         }
     }
 }
 
-@ExperimentalCoroutinesApi
-private fun TestScope.createDataSource(
-    room: BaseRoom = FakeBaseRoom().apply {
-        givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-    },
-    coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers()
-) = RoomMemberListDataSource(room, coroutineDispatchers)
+private fun createFakeJoinedRoom(
+    updateMembersResult: () -> Unit = { },
+    canInviteResult: (UserId) -> Result<Boolean> = { Result.success(true) },
+): FakeJoinedRoom {
+    return FakeJoinedRoom(
+        baseRoom = FakeBaseRoom(
+            updateMembersResult = updateMembersResult,
+            canInviteResult = canInviteResult,
+        ).apply {
+            // Needed to avoid discarding the loaded members as a partial and invalid result
+            givenRoomInfo(aRoomInfo(joinedMembersCount = 2))
+        }
+    )
+}
 
 @ExperimentalCoroutinesApi
 private fun TestScope.createPresenter(
     coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
-    joinedRoom: JoinedRoom = FakeJoinedRoom(
-        baseRoom = FakeBaseRoom(
-            updateMembersResult = { Result.success(Unit) }
-        )
-    ),
-    roomMemberListDataSource: RoomMemberListDataSource = createDataSource(coroutineDispatchers = coroutineDispatchers),
+    joinedRoom: JoinedRoom = createFakeJoinedRoom(),
     encryptedService: FakeEncryptionService = FakeEncryptionService(),
-    roomMemberModerationPresenter: Presenter<RoomMemberModerationState> = Presenter {
-        aRoomMemberModerationState()
-    },
+    roomMemberModerationState: RoomMemberModerationState = aRoomMemberModerationState(),
 ) = RoomMemberListPresenter(
     room = joinedRoom,
-    roomMemberListDataSource = roomMemberListDataSource,
     coroutineDispatchers = coroutineDispatchers,
-    roomMembersModerationPresenter = roomMemberModerationPresenter,
+    roomMembersModerationPresenter = Presenter {
+        roomMemberModerationState
+    },
     encryptionService = encryptedService,
 )

From 6467912c69ccc1b30af192e955d3af1e17517706 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 25 Nov 2025 14:30:59 +0100
Subject: [PATCH 054/113] quality: fix warnings

---
 .../roomdetails/impl/members/RoomMemberListEvents.kt        | 2 +-
 .../roomdetails/impl/members/RoomMemberListPresenter.kt     | 1 -
 .../features/roomdetails/impl/members/RoomMemberListView.kt | 6 ------
 .../roomdetails/impl/members/RoomMemberListPresenterTest.kt | 1 -
 .../io/element/android/tests/konsist/KonsistPreviewTest.kt  | 1 -
 5 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
index a4b7b22bf3..ec1b130b3e 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
@@ -11,7 +11,7 @@ package io.element.android.features.roomdetails.impl.members
 import io.element.android.libraries.matrix.api.room.RoomMember
 
 sealed interface RoomMemberListEvents {
-    data class ChangeSelectedSection(val section: SelectedSection): RoomMemberListEvents
+    data class ChangeSelectedSection(val section: SelectedSection) : RoomMemberListEvents
     data class UpdateSearchQuery(val query: String) : RoomMemberListEvents
     data class RoomMemberSelected(val roomMember: RoomMember) : RoomMemberListEvents
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
index 90d85fac4b..f1d3f61f7e 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -52,7 +52,6 @@ class RoomMemberListPresenter(
     private val roomMembersModerationPresenter: Presenter<RoomMemberModerationState>,
     private val encryptionService: EncryptionService,
 ) : Presenter<RoomMemberListState> {
-
     private val powerLevelRoomMemberComparator = PowerLevelRoomMemberComparator()
 
     @Composable
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
index d5a161b898..7c83f74f00 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
@@ -9,12 +9,6 @@
 package io.element.android.features.roomdetails.impl.members
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.expandHorizontally
-import androidx.compose.animation.expandVertically
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.shrinkHorizontally
-import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
index 1548feae88..8d3d0e35e3 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
@@ -77,7 +77,6 @@ class RoomMemberListPresenterTest {
             val finalState = awaitItem()
             assertThat(finalState.selectedSection).isEqualTo(SelectedSection.MEMBERS)
         }
-
     }
 
     @Test
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt
index 4fbf8773db..b4f15d8d96 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt
@@ -116,7 +116,6 @@ class KonsistPreviewTest {
         "ProgressDialogWithContentPreview",
         "ProgressDialogWithTextAndContentPreview",
         "ReadReceiptBottomSheetPreview",
-        "RoomMemberListViewBannedPreview",
         "SasEmojisPreview",
         "SecureBackupSetupViewChangePreview",
         "SelectedUserCannotRemovePreview",

From 3240dbf2a92df7a48dc80d940db781cc6c4e8cba Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Tue, 25 Nov 2025 13:45:55 +0000
Subject: [PATCH 055/113] Update screenshots

---
 ...details.impl.members_RoomMemberListViewBanned_Day_0_en.png | 3 ---
 ...details.impl.members_RoomMemberListViewBanned_Day_1_en.png | 3 ---
 ...details.impl.members_RoomMemberListViewBanned_Day_2_en.png | 3 ---
 ...tails.impl.members_RoomMemberListViewBanned_Night_0_en.png | 3 ---
 ...tails.impl.members_RoomMemberListViewBanned_Night_1_en.png | 3 ---
 ...tails.impl.members_RoomMemberListViewBanned_Night_2_en.png | 3 ---
 ...s.roomdetails.impl.members_RoomMemberListView_Day_0_en.png | 4 ++--
 ...s.roomdetails.impl.members_RoomMemberListView_Day_1_en.png | 4 ++--
 ...s.roomdetails.impl.members_RoomMemberListView_Day_2_en.png | 4 ++--
 ...s.roomdetails.impl.members_RoomMemberListView_Day_3_en.png | 4 ++--
 ...s.roomdetails.impl.members_RoomMemberListView_Day_4_en.png | 4 ++--
 ...s.roomdetails.impl.members_RoomMemberListView_Day_5_en.png | 4 ++--
 ...s.roomdetails.impl.members_RoomMemberListView_Day_6_en.png | 4 ++--
 ...s.roomdetails.impl.members_RoomMemberListView_Day_7_en.png | 3 ---
 ...s.roomdetails.impl.members_RoomMemberListView_Day_8_en.png | 3 ---
 ...s.roomdetails.impl.members_RoomMemberListView_Day_9_en.png | 3 ---
 ...roomdetails.impl.members_RoomMemberListView_Night_0_en.png | 4 ++--
 ...roomdetails.impl.members_RoomMemberListView_Night_1_en.png | 4 ++--
 ...roomdetails.impl.members_RoomMemberListView_Night_2_en.png | 4 ++--
 ...roomdetails.impl.members_RoomMemberListView_Night_3_en.png | 4 ++--
 ...roomdetails.impl.members_RoomMemberListView_Night_4_en.png | 4 ++--
 ...roomdetails.impl.members_RoomMemberListView_Night_5_en.png | 4 ++--
 ...roomdetails.impl.members_RoomMemberListView_Night_6_en.png | 4 ++--
 ...roomdetails.impl.members_RoomMemberListView_Night_7_en.png | 3 ---
 ...roomdetails.impl.members_RoomMemberListView_Night_8_en.png | 3 ---
 ...roomdetails.impl.members_RoomMemberListView_Night_9_en.png | 3 ---
 ...embermoderation.impl_RoomMemberModerationView_Day_0_en.png | 4 ++--
 ...embermoderation.impl_RoomMemberModerationView_Day_1_en.png | 4 ++--
 ...embermoderation.impl_RoomMemberModerationView_Day_2_en.png | 4 ++--
 ...embermoderation.impl_RoomMemberModerationView_Day_3_en.png | 4 ++--
 ...bermoderation.impl_RoomMemberModerationView_Night_0_en.png | 4 ++--
 ...bermoderation.impl_RoomMemberModerationView_Night_1_en.png | 4 ++--
 ...bermoderation.impl_RoomMemberModerationView_Night_2_en.png | 4 ++--
 ...bermoderation.impl_RoomMemberModerationView_Night_3_en.png | 4 ++--
 ...stem.theme.components_SearchFieldsDark_Search_views_en.png | 3 +++
 ...tem.theme.components_SearchFieldsLight_Search_views_en.png | 3 +++
 36 files changed, 50 insertions(+), 80 deletions(-)
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_8_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_9_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_8_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_9_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsDark_Search_views_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsLight_Search_views_en.png

diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en.png
deleted file mode 100644
index eeca901e19..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5070188463df330ea8f7969228f436dba0db5dd9eb9280f5b4484296176bf3e9
-size 11503
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en.png
deleted file mode 100644
index f2cf45bfff..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f544e2018c0cd221e6bba338e61af4f306809d10d37bd5b20c33e0fa67cbabb
-size 11741
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en.png
deleted file mode 100644
index eeca901e19..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5070188463df330ea8f7969228f436dba0db5dd9eb9280f5b4484296176bf3e9
-size 11503
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en.png
deleted file mode 100644
index 1a42b8c5b7..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07dc1c12e55e3eb3ce6ee01582535641a08d62d4b059bdd581af6c58063ca70c
-size 10849
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en.png
deleted file mode 100644
index 05a92bcc05..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1fe0b9379ed8bd9a3c19c7cff5eb6085657e1453e4f8d6ebe88a3338e738236c
-size 11067
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en.png
deleted file mode 100644
index 1a42b8c5b7..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07dc1c12e55e3eb3ce6ee01582535641a08d62d4b059bdd581af6c58063ca70c
-size 10849
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png
index 51c0e52a4a..0a2320e58a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08172934ef864d57cb335b738dea8ad6f96ee2df4710c4f9d7e5adc3d110ad67
-size 44215
+oid sha256:367bc0df8b1839af2b434de55ea3815af4a8c112cc96e98ee76c3b9a4949fe52
+size 12985
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png
index 92584108e8..96ed928dbd 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad1fce13a5034b6db192a0735317b6cf5f10536ac05ccf1cc4996ad029ce9513
-size 49951
+oid sha256:1700a0f9e6f9115015849c900d7faa27f70fa29752bde7666eeb36cf4eb1a6da
+size 19463
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_2_en.png
index f2cf45bfff..c4d6e129cd 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f544e2018c0cd221e6bba338e61af4f306809d10d37bd5b20c33e0fa67cbabb
-size 11741
+oid sha256:c8b5970490e96a693655df832f9c4bf83dd55a8b06da27b48881d9f61b2dfd9c
+size 55110
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png
index 129f9d3f0d..6ac0644c32 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cad1aae139861f1ba83d3b03a6d78916c2ced5f19e6e99b935b4a49c1b5d12bb
-size 12686
+oid sha256:bae192229d384047dcf5fb6744267a9e448d7f0a4f933a4984a0d1c3b9d07da2
+size 30789
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_4_en.png
index f2cf45bfff..eff729cb56 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f544e2018c0cd221e6bba338e61af4f306809d10d37bd5b20c33e0fa67cbabb
-size 11741
+oid sha256:6b7049a6865a0ea4529cc43d16a27b9107e26d6583f429affe8327840b84ac2a
+size 56050
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_5_en.png
index f653c35d7b..83c58ce783 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd50f1d35f872ee93bd6b2aff1feaffcc2314b11fae60302351f738bd86d735c
-size 7630
+oid sha256:0b4a208d39a5f6040d17da5290a8f2f81cd917aa02c8e38b092fc79497e1e563
+size 18394
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_6_en.png
index afa0af99d4..e75132eece 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c0c23f8cb90609cc1f6107f4d34efbc044de92286cb237487993953f5497e5e
-size 6521
+oid sha256:acfaec83e840845137f9c07d1325e24f106bc67ccdbf6c548e77efe1d490596b
+size 29428
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png
deleted file mode 100644
index a6d1f7bb95..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f509f0c857c9d2c0a23657d213ea49961bb900b652edd116c4dcf29853c7776
-size 24336
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_8_en.png
deleted file mode 100644
index 9df1642c6b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58d4c3e636f71ac1408189c3c14da3b0dd1e700a1be02a02f373adbcb5604b48
-size 10976
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_9_en.png
deleted file mode 100644
index 42bcea1374..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_9_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cba49da736f96c2dd8ca3822e796930f4bd6ff3497b72f394d034147178906ce
-size 18239
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png
index 2b024e7b08..aa53274f42 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd62c76e687e342f46b792958ddd3c36d44f5c603e4ddbe79f4fd2a8e41b9750
-size 44198
+oid sha256:7b01cfde0e59d64a9e6d576e22e2ac9eeab5ab1a99cb0f9f54d1c8cec80ac4bd
+size 12154
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png
index 35fbc68769..56cecab8e5 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc7dd1459c04997170247296b34b9bd7953418361c2d72840d43aa159000a806
-size 49655
+oid sha256:2cb19c23879eb9698729561fb1ef79c1e65a36eab0f24681e4cf72dfdde45d04
+size 18281
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_2_en.png
index 05a92bcc05..d4d2263960 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fe0b9379ed8bd9a3c19c7cff5eb6085657e1453e4f8d6ebe88a3338e738236c
-size 11067
+oid sha256:889734242ce96bfc206ae1421ab9c1cbccbcb11f99889445ea27833cbd057a0a
+size 55231
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png
index 31ebaceceb..c313f14d52 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34198a1ba6c0f6385eb8732d36622ee0d6f865c72085d95d378d82ed7afe9486
-size 11936
+oid sha256:dc20039c1c5d456f318f22e524360d411d4a4980b6a2a9312c0707c0fe865340
+size 29867
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_4_en.png
index 05a92bcc05..dcd18cf977 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fe0b9379ed8bd9a3c19c7cff5eb6085657e1453e4f8d6ebe88a3338e738236c
-size 11067
+oid sha256:5bb86c6fea38d0e798cffa5fee0610a32048aeb1d3427cd9b5b749dfacee0e55
+size 56063
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_5_en.png
index c002b74577..612b340865 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11c23632578610a78a6700f9d103ff6b4b3da03887cfb1918b10f2c6052e6820
-size 7549
+oid sha256:a6d55832abbcffc4d84b7139fbfb19d4c96a5ebcc9233ff139c5aae6b9f406d9
+size 17831
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_6_en.png
index 775f637648..8b06d03eed 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b838359a59cdc357f0ef80d701f6093ea45875c7915ba438901748f43ce9106b
-size 6316
+oid sha256:3802b661c6fc656f621ba3c368eeb93f004561b01926faa572c4ba5ee66d07eb
+size 28474
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png
deleted file mode 100644
index f137d5539a..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd6d96abbeda8ab8dd7804929ed205cd2c1eb8bb04d83d00a343387e93bc693b
-size 24297
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_8_en.png
deleted file mode 100644
index 8aa1b22c1d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ced65352d0aee02e92f19fc890a8fa92efabfb8255a9a58e36dc539e2d4d6009
-size 10664
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_9_en.png
deleted file mode 100644
index 083ca54d13..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_9_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9f910e14188c705d993201bdebab2f818badc71272195aa4cce31728315beea
-size 17207
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en.png
index 8c46960350..95a89c2a78 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54e526b8ab19ec121349dfc61f751b4d301c61ec47f1c1ec1c02d120b1f4faaf
-size 17064
+oid sha256:f333d59f48ec9ff036e72c727c3bfae32dbb919c35b854906fca153bfc1c84e4
+size 17375
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en.png
index 20f1127aec..a99bf703be 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1be3ac8e92243baeceeb7349ed767e4c39ebfc4880b253e7f2e46ed9fc75da01
-size 20222
+oid sha256:dd83d242f9099de1ae0c84b07cb773e08dde1ae535ee2fd2bcb002e2e0e22132
+size 20397
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en.png
index 241888f87a..ea3e995ea4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e8c820a8c4966526e7851b4f3152ccaf9072bbf8ebf21737d35d1c87325bf6f
-size 22524
+oid sha256:0f3d63a5c888eb1b951be3c46c4c51f7c622d7e7838c35b3de388ac1cd20789d
+size 22793
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en.png
index 5f0d9f5308..b23185f4fb 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:983e163f59ef03f5a7c30cf7073002105a663cec64f8a8d4fc89fa0991bfd730
-size 22646
+oid sha256:e5ce9706fbc30f9d99c35c9d1f145c7f933295fe3eb62063c640b303526649db
+size 22915
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en.png
index bdfffdde8c..608faed7c0 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6db6ff988fd128f537764e5a3fcaa94e67db3057fc7030698adabe70f962c1b4
-size 15991
+oid sha256:06aad1478e9096e5215bd3116a7bef0e98037383c835de73f57d46a9cfa86137
+size 16415
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en.png
index 0920ebc642..d1328d932a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4868e2ce56debe8b175715417190db0037d59d204a28b5c0bc0b0c81a5d91a9
-size 18925
+oid sha256:71cd9c85c33cc222836ec26f39e7209a954728d5beebadf53a784bd5a0813709
+size 19390
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en.png
index f888174764..b4c1e1cbee 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a59481d4391dd8d0cb749ff63d3bb34846b450a6713ade11a6dbbe0461bb3650
-size 21257
+oid sha256:66b527092681543f600725e508213f59524b5bdf3f3ceff2bbc47d43cc9d66e8
+size 21685
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en.png
index d2ee835a9f..1b47b493b4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:381fbeb4b57f044fb785b65d04b041c4ca5efa89138742b8480a7540ed57b4f0
-size 21335
+oid sha256:47c1592948df21f0f3d69dead320f50e47ebf8da3bb86bc8302ad392d5813c57
+size 21765
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsDark_Search_views_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsDark_Search_views_en.png
new file mode 100644
index 0000000000..c147670cee
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsDark_Search_views_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39e0775e5c569a95653ab922084c4056635bec2056441771af3c8a3739a84901
+size 8143
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsLight_Search_views_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsLight_Search_views_en.png
new file mode 100644
index 0000000000..21ed56ed1f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsLight_Search_views_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a97489a6af869148d1daadb5948f26d00e888ecf0373e6ec45eb8a5ed8b12173
+size 8383

From 40f769cabdefe60b71055f7b1be71922e511741d Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 25 Nov 2025 15:40:58 +0100
Subject: [PATCH 056/113] quality(test): fix test after AsyncData.map change

---
 .../space/impl/leave/LeaveSpacePresenterTest.kt        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt
index c99d3db361..495f0b38bd 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt
@@ -62,7 +62,7 @@ class LeaveSpacePresenterTest {
             val state = awaitItem()
             assertThat(state.selectableSpaceRooms.isLoading()).isTrue()
             assertThat(state.leaveSpaceAction).isEqualTo(AsyncAction.Uninitialized)
-            skipItems(3)
+            skipItems(2)
             val stateError = awaitItem()
             assertThat(stateError.selectableSpaceRooms.isFailure()).isTrue()
             // Retry
@@ -84,7 +84,7 @@ class LeaveSpacePresenterTest {
         presenter.test {
             val state = awaitItem()
             assertThat(state.spaceName).isNull()
-            skipItems(3)
+            skipItems(2)
             val finalState = awaitItem()
             assertThat(finalState.spaceName).isEqualTo(A_SPACE_NAME)
             assertThat(finalState.isLastAdmin).isTrue()
@@ -120,7 +120,7 @@ class LeaveSpacePresenterTest {
         presenter.test {
             val state = awaitItem()
             assertThat(state.spaceName).isNull()
-            skipItems(3)
+            skipItems(2)
             val finalState = awaitItem()
             // The current state is not in the sub room list
             assertThat(finalState.selectableSpaceRooms.dataOrNull()!!.map { it.spaceRoom.roomId }).containsExactly(A_ROOM_ID, A_ROOM_ID_3)
@@ -154,7 +154,7 @@ class LeaveSpacePresenterTest {
             )
         )
         presenter.test {
-            skipItems(4)
+            skipItems(3)
             val state = awaitItem()
             assertThat(state.spaceName).isNull()
             assertThat(state.isLastAdmin).isFalse()
@@ -218,7 +218,7 @@ class LeaveSpacePresenterTest {
             )
         )
         presenter.test {
-            skipItems(4)
+            skipItems(3)
             val state = awaitItem()
             state.eventSink(LeaveSpaceEvents.LeaveSpace)
             val stateLeaving = awaitItem()

From 9da27215704bbae8f2bc42e27ac693d30d6c2136 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 25 Nov 2025 15:33:49 +0100
Subject: [PATCH 057/113] Add unit test on `toAnalyticsMemberRole()`

---
 .../impl/roles/ChangeRolesPresenterTest.kt           | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
index 472426ff85..11b9a66319 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
@@ -534,6 +534,18 @@ class ChangeRolesPresenterTest {
         }
     }
 
+    @Test
+    fun `test analytics mapping`()= runTest {
+        val presenter = createChangeRolesPresenter()
+        with(presenter) {
+            assertThat(RoomMember.Role.User.toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.User)
+            assertThat(RoomMember.Role.Moderator.toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.Moderator)
+            assertThat(RoomMember.Role.Admin.toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.Administrator)
+            assertThat(RoomMember.Role.Owner(isCreator = false).toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.Administrator)
+            assertThat(RoomMember.Role.Owner(isCreator = true).toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.Administrator)
+        }
+    }
+
     private fun roomPowerLevelsWithRole(
         role: RoomMember.Role,
         userId: UserId = A_USER_ID,

From 8c07c011a2050cd0608c461fa40241e223041b03 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 25 Nov 2025 16:30:16 +0100
Subject: [PATCH 058/113] Creators can downgrade owners. Fixes #5632

---
 .../impl/roles/ChangeRolesPresenter.kt        | 20 +++++++-
 .../impl/roles/ChangeRolesStateProvider.kt    |  8 +---
 .../impl/roles/ChangeRolesView.kt             | 15 +-----
 .../impl/roles/ChangeRolesPresenterTest.kt    | 47 ++++++++++---------
 4 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
index fdb17d6e04..f7736cb77c 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
@@ -44,6 +44,8 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -77,7 +79,23 @@ class ChangeRolesPresenter(
         }
         val saveState: MutableState<AsyncAction<Boolean>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
         val usersWithRole = produceState<ImmutableList<MatrixUser>>(initialValue = persistentListOf()) {
-            room.usersWithRole(role).map { members -> members.map { it.toMatrixUser() } }
+            // If the role is admin, we need to include the owners as well since they implicitly have admin role
+            val owners = if (role == RoomMember.Role.Admin) {
+                combine(
+                    room.usersWithRole(RoomMember.Role.Owner(isCreator = true)),
+                    room.usersWithRole(RoomMember.Role.Owner(isCreator = false)),
+                ) { creators, superAdmins ->
+                    creators + superAdmins
+                }
+            } else {
+                emptyFlow()
+            }
+            combine(
+                owners,
+                room.usersWithRole(role),
+            ) { owners, users ->
+                owners + users
+            }.map { members -> members.map { it.toMatrixUser() } }
                 .onEach { users ->
                     val previous = value
                     value = users.toImmutableList()
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
index 2594681850..654259c02a 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
@@ -50,13 +50,7 @@ class ChangeRolesStateProvider : PreviewParameterProvider<ChangeRolesState> {
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Loading),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Success(true)),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Failure(Exception("boom"))),
-            aChangeRolesStateWithOwners(
-                role = RoomMember.Role.Admin,
-                // Do not include the owners in the selectedUsers (the presenter will not do it), the View will add them
-                selectedUsers = listOf(
-                    aMatrixUser(id = "@carol:server.org", displayName = "Carol"),
-                )
-            ),
+            aChangeRolesStateWithOwners(role = RoomMember.Role.Admin),
             aChangeRolesStateWithOwners(role = RoomMember.Role.Owner(isCreator = false)),
             aChangeRolesStateWithOwners(role = RoomMember.Role.Owner(isCreator = false))
                 .copy(savingState = ConfirmingModifyingOwners),
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
index bd9969dec4..bab24d3f42 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
@@ -30,7 +30,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -72,7 +71,6 @@ import io.element.android.libraries.matrix.ui.components.SelectedUsersRowList
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -222,18 +220,7 @@ private fun SearchResultsList(
         state = lazyListState,
     ) {
         item {
-            val usersInHorizontalRow = remember(searchResults.owners, selectedUsers) {
-                if (currentRole == RoomMember.Role.Admin) {
-                    // Also include the owners in the horizontal list
-                    val owners = searchResults.owners.map {
-                        it.toMatrixUser()
-                    }
-                    (owners + selectedUsers).toImmutableList()
-                } else {
-                    selectedUsers
-                }
-            }
-            selectedUsersList(usersInHorizontalRow)
+            selectedUsersList(selectedUsers)
         }
         if (searchResults.owners.isNotEmpty()) {
             stickyHeader { ListSectionHeader(text = stringResource(R.string.screen_room_roles_and_permissions_owners)) }
diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
index 11b9a66319..4bc39fd971 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
@@ -106,6 +106,7 @@ class ChangeRolesPresenterTest {
             awaitItem().run {
                 assertThat(canChangeMemberRole(A_USER_ID_2)).isTrue() // Admin
                 assertThat(canChangeMemberRole(A_USER_ID_3)).isTrue() // Moderator
+                assertThat(canChangeMemberRole(superAdminUserId)).isTrue() // Super admin
                 assertThat(canChangeMemberRole(creatorUserId)).isFalse() // Owner
             }
         }
@@ -170,7 +171,7 @@ class ChangeRolesPresenterTest {
         }
         val presenter = createChangeRolesPresenter(room = room)
         presenter.test {
-            skipItems(1)
+            skipItems(2)
             awaitItem().searchResults.run {
                 assertThat(this).isInstanceOf(SearchBarResultState.Results::class.java)
                 val results = (this as SearchBarResultState.Results).results
@@ -424,11 +425,14 @@ class ChangeRolesPresenterTest {
             analyticsService = analyticsService
         )
         presenter.test {
-            skipItems(2)
+            skipItems(1)
             val initialState = awaitItem()
-            assertThat(initialState.selectedUsers).hasSize(1)
+            assertThat(initialState.selectedUsers).isEmpty()
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
-            awaitItem().eventSink(ChangeRolesEvent.Save)
+            awaitItem().also {
+                assertThat(it.selectedUsers).hasSize(1)
+                it.eventSink(ChangeRolesEvent.Save)
+            }
             assertThat(awaitItem().savingState).isInstanceOf(AsyncAction.Loading::class.java)
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(true))
             assertThat(analyticsService.capturedEvents.last()).isEqualTo(RoomModeration(RoomModeration.Action.ChangeMemberRole, RoomModeration.Role.Moderator))
@@ -459,14 +463,13 @@ class ChangeRolesPresenterTest {
             analyticsService = analyticsService
         )
         presenter.test {
-            skipItems(1)
             val initialState = awaitItem()
-            assertThat(initialState.selectedUsers).hasSize(1)
-
+            assertThat(initialState.selectedUsers).isEmpty()
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
-
-            awaitItem().eventSink(ChangeRolesEvent.Save)
-
+            awaitItem().also {
+                assertThat(it.selectedUsers).hasSize(1)
+                it.eventSink(ChangeRolesEvent.Save)
+            }
             assertThat(awaitItem().savingState.isConfirming()).isTrue()
         }
     }
@@ -494,12 +497,12 @@ class ChangeRolesPresenterTest {
         presenter.test {
             skipItems(2)
             val initialState = awaitItem()
-            assertThat(initialState.selectedUsers).hasSize(1)
-
+            assertThat(initialState.selectedUsers).hasSize(2)
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
-
-            awaitItem().eventSink(ChangeRolesEvent.Save)
-
+            awaitItem().also {
+                assertThat(it.selectedUsers).hasSize(1)
+                it.eventSink(ChangeRolesEvent.Save)
+            }
             val loadingState = awaitItem()
             assertThat(loadingState.savingState).isInstanceOf(AsyncAction.Loading::class.java)
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(true))
@@ -517,25 +520,25 @@ class ChangeRolesPresenterTest {
         }
         val presenter = createChangeRolesPresenter(role = RoomMember.Role.Moderator, room = room)
         presenter.test {
-            skipItems(2)
+            skipItems(1)
             val initialState = awaitItem()
-            assertThat(initialState.selectedUsers).hasSize(1)
-
+            assertThat(initialState.selectedUsers).isEmpty()
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
-
-            awaitItem().eventSink(ChangeRolesEvent.Save)
+            awaitItem().also {
+                assertThat(it.selectedUsers).hasSize(1)
+                it.eventSink(ChangeRolesEvent.Save)
+            }
             val loadingState = awaitItem()
             assertThat(loadingState.savingState).isInstanceOf(AsyncAction.Loading::class.java)
             val failedState = awaitItem()
             assertThat(failedState.savingState).isInstanceOf(AsyncAction.Failure::class.java)
-
             failedState.eventSink(ChangeRolesEvent.CloseDialog)
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Uninitialized)
         }
     }
 
     @Test
-    fun `test analytics mapping`()= runTest {
+    fun `test analytics mapping`() = runTest {
         val presenter = createChangeRolesPresenter()
         with(presenter) {
             assertThat(RoomMember.Role.User.toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.User)

From 672a6fe6b03b652db18f06d822865b2970773c3a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 25 Nov 2025 17:03:00 +0100
Subject: [PATCH 059/113] hasSize(0) -> isEmpty()

---
 .../voicemessages/composer/VoiceMessageComposerPresenterTest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt
index f3bc720792..73688d2db4 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt
@@ -408,7 +408,7 @@ class VoiceMessageComposerPresenterTest {
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(aPreviewState(isSending = true))
             sendVoiceMessageResult.assertions().isNeverCalled()
-            assertThat(analyticsService.trackedErrors).hasSize(0)
+            assertThat(analyticsService.trackedErrors).isEmpty()
             voiceRecorder.assertCalls(started = 1, stopped = 1, deleted = 0)
 
             testPauseAndDestroy(finalState)

From 5c0c5e394a6967fbff0d29ef978f8db316a1185e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 10:27:08 +0100
Subject: [PATCH 060/113] fix(deps): update dependency
 org.maplibre.gl:android-sdk to v12.2.0 (#5814)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 25c76cb3fb..ae78b78632 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -207,7 +207,7 @@ vanniktech_blurhash = "com.vanniktech:blurhash:0.3.0"
 telephoto_zoomableimage = { module = "me.saket.telephoto:zoomable-image-coil", version.ref = "telephoto" }
 telephoto_flick = { module = "me.saket.telephoto:flick-android", version.ref = "telephoto" }
 statemachine = "com.freeletics.flowredux:compose:1.2.2"
-maplibre = "org.maplibre.gl:android-sdk:12.1.3"
+maplibre = "org.maplibre.gl:android-sdk:12.2.0"
 maplibre_ktx = "org.maplibre.gl:android-sdk-ktx-v7:3.0.2"
 maplibre_annotation = "org.maplibre.gl:android-plugin-annotation-v9:3.0.2"
 opusencoder = "io.element.android:opusencoder:1.2.0"

From 7159b7003a52da78c6d7b7a613b6dab57796b668 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 10:28:38 +0100
Subject: [PATCH 061/113] chore(deps): update actions/checkout action to v6
 (#5805)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/build.yml                 |  2 +-
 .github/workflows/build_enterprise.yml      |  2 +-
 .github/workflows/danger.yml                |  2 +-
 .github/workflows/gradle-wrapper-update.yml |  2 +-
 .github/workflows/maestro-local.yml         |  4 ++--
 .github/workflows/nightly.yml               |  2 +-
 .github/workflows/nightlyReports.yml        |  2 +-
 .github/workflows/quality.yml               | 22 ++++++++++-----------
 .github/workflows/release.yml               |  6 +++---
 .github/workflows/sonar.yml                 |  2 +-
 .github/workflows/sync-localazy.yml         |  2 +-
 .github/workflows/sync-sas-strings.yml      |  2 +-
 12 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c77cb3770..ef6b3773cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/develop' && format('build-develop-{0}-{1}', matrix.variant, github.sha) || format('build-{0}-{1}', matrix.variant, github.ref)  }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
diff --git a/.github/workflows/build_enterprise.yml b/.github/workflows/build_enterprise.yml
index bce9d923f3..81e17d6189 100644
--- a/.github/workflows/build_enterprise.yml
+++ b/.github/workflows/build_enterprise.yml
@@ -27,7 +27,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/develop' && format('build-develop-enterprise-{0}-{1}', matrix.variant, github.sha) || format('build-enterprise-{0}-{1}', matrix.variant, github.ref)  }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index e4300b3321..f7c8fccc62 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -9,7 +9,7 @@ jobs:
     # Skip in forks, it doesn't work even with the fallback token
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Add SSH private keys for submodule repositories
         uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         with:
diff --git a/.github/workflows/gradle-wrapper-update.yml b/.github/workflows/gradle-wrapper-update.yml
index f826bb8205..3b0fac5309 100644
--- a/.github/workflows/gradle-wrapper-update.yml
+++ b/.github/workflows/gradle-wrapper-update.yml
@@ -11,7 +11,7 @@ jobs:
     # Skip in forks
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         name: Use JDK 21
         if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
diff --git a/.github/workflows/maestro-local.yml b/.github/workflows/maestro-local.yml
index ff0ac49f5c..460fdcf6c2 100644
--- a/.github/workflows/maestro-local.yml
+++ b/.github/workflows/maestro-local.yml
@@ -23,7 +23,7 @@ jobs:
       group: ${{ format('maestro-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -62,7 +62,7 @@ jobs:
       group: ${{ format('maestro-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index b494d9fe8c..71a2d0a595 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'element-hq/element-x-android' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
diff --git a/.github/workflows/nightlyReports.yml b/.github/workflows/nightlyReports.yml
index 080cf99b05..46818a1749 100644
--- a/.github/workflows/nightlyReports.yml
+++ b/.github/workflows/nightlyReports.yml
@@ -60,7 +60,7 @@ jobs:
     name: Dependency analysis
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 7600d8965c..cc4b9db7e1 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -17,7 +17,7 @@ jobs:
     name: Search for forbidden patterns
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Add SSH private keys for submodule repositories
         uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
@@ -33,7 +33,7 @@ jobs:
     name: Search for invalid screenshot files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python 3.12
         uses: actions/setup-python@v6
         with:
@@ -45,7 +45,7 @@ jobs:
     name: Search for invalid dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
@@ -71,7 +71,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-konsist-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-konsist-develop-{0}', github.sha) || format('check-konsist-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -111,7 +111,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-compose-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-compose-develop-{0}', github.sha) || format('check-compose-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -144,7 +144,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-lint-develop-{0}', github.sha) || format('check-lint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -188,7 +188,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-detekt-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-detekt-develop-{0}', github.sha) || format('check-detekt-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -228,7 +228,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-ktlint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-ktlint-develop-{0}', github.sha) || format('check-ktlint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -268,7 +268,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-knit-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-knit-develop-{0}', github.sha) || format('check-knit-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -299,7 +299,7 @@ jobs:
     name: Check shell scripts
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Run shellcheck
         uses: ludeeus/action-shellcheck@2.0.0
         with:
@@ -311,7 +311,7 @@ jobs:
     needs: [konsist, lint, ktlint, detekt]
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 29ff4a5373..919897deed 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
       group: ${{ format('build-release-main-gplay-{0}', github.sha) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
@@ -52,7 +52,7 @@ jobs:
       group: ${{ format('build-release-main-enterprise-{0}', github.sha) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Add SSH private keys for submodule repositories
         uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
@@ -87,7 +87,7 @@ jobs:
       group: ${{ format('build-release-main-fdroid-{0}', github.sha) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index acfe6ba87f..c289102116 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -22,7 +22,7 @@ jobs:
       group: ${{ format('sonar-{0}', github.ref) }}
       cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
diff --git a/.github/workflows/sync-localazy.yml b/.github/workflows/sync-localazy.yml
index 404af92f30..073c075502 100644
--- a/.github/workflows/sync-localazy.yml
+++ b/.github/workflows/sync-localazy.yml
@@ -11,7 +11,7 @@ jobs:
     # Skip in forks
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
diff --git a/.github/workflows/sync-sas-strings.yml b/.github/workflows/sync-sas-strings.yml
index e461845c9c..ca42b8fbe6 100644
--- a/.github/workflows/sync-sas-strings.yml
+++ b/.github/workflows/sync-sas-strings.yml
@@ -12,7 +12,7 @@ jobs:
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     # No concurrency required, runs every time on a schedule.
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python 3.12
         uses: actions/setup-python@v6
         with:

From 1067591d9ad847b75e248d5a6a65ab12f13689f0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 10:52:12 +0100
Subject: [PATCH 062/113] fix(deps): update dependency
 com.google.testparameterinjector:test-parameter-injector to v1.20 (#5800)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ae78b78632..585220fb8d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -165,7 +165,7 @@ test_mockk = "io.mockk:mockk:1.14.6"
 test_konsist = "com.lemonappdev:konsist:0.17.3"
 test_turbine = "app.cash.turbine:turbine:1.2.1"
 test_truth = "com.google.truth:truth:1.4.5"
-test_parameter_injector = "com.google.testparameterinjector:test-parameter-injector:1.19"
+test_parameter_injector = "com.google.testparameterinjector:test-parameter-injector:1.20"
 test_robolectric = "org.robolectric:robolectric:4.15.1"
 test_appyx_junit = { module = "com.bumble.appyx:testing-junit4", version.ref = "appyx" }
 test_composable_preview_scanner = "io.github.sergio-sastre.ComposablePreviewScanner:android:0.7.2"

From b04524e56673710cc0ab479d9a8e8ddadec6bb77 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 17 Nov 2025 20:53:55 +0100
Subject: [PATCH 063/113] misc : use new_latest_event api (+ some renaming)

---
 .../home/impl/components/RoomSummaryRow.kt    |   2 +-
 .../datasource/RoomListRoomSummaryFactory.kt  |  10 +-
 .../home/impl/model/RoomListRoomSummary.kt    |   2 +-
 .../impl/model/RoomListRoomSummaryProvider.kt |   2 +-
 .../RoomListRoomSummaryFactoryTest.kt         |   6 +-
 .../impl/model/RoomListBaseRoomSummaryTest.kt |   2 +-
 .../impl/roomlist/RoomListPresenterTest.kt    |   8 +-
 .../home/impl/roomlist/RoomListViewTest.kt    |   6 +-
 .../search/RoomListSearchPresenterTest.kt     |   4 +-
 .../components/TimelineItemEventRow.kt        |   8 +-
 .../event/TimelineItemContentFactory.kt       |   4 +-
 .../impl/timeline/model/TimelineItem.kt       |   4 +-
 .../RedactedVoiceMessageManagerTest.kt        |   4 +-
 ...rmatter.kt => RoomLatestEventFormatter.kt} |   6 +-
 ....kt => DefaultRoomLatestEventFormatter.kt} |  46 +++-
 ...efaultPinnedMessagesBannerFormatterTest.kt |   4 +-
 ...=> DefaultRoomLatestEventFormatterTest.kt} | 204 +++++++++---------
 ...ter.kt => FakeRoomLatestEventFormatter.kt} |   8 +-
 .../matrix/api/room/message/RoomMessage.kt    |  20 --
 .../matrix/api/roomlist/LatestEventValue.kt   |  31 +++
 .../matrix/api/roomlist/RoomSummary.kt        |   9 +-
 .../matrix/api/timeline/item/ThreadSummary.kt |   4 +-
 .../timeline/item/event/EventTimelineItem.kt  |   2 +-
 .../api/timeline/item/event/InReplyTo.kt      |   2 +-
 ...leTimelineDetails.kt => ProfileDetails.kt} |  22 +-
 .../item/event/ProfileTimelineDetailsTest.kt  |  12 +-
 .../impl/room/message/RoomMessageFactory.kt   |  28 ---
 .../matrix/impl/roomlist/RoomListFactory.kt   |   4 +-
 .../impl/roomlist/RoomSummaryFactory.kt       |  30 ++-
 .../impl/roomlist/RoomSummaryListProcessor.kt |   4 +-
 .../item/event/EventTimelineItemMapper.kt     |  12 +-
 .../roomlist/RoomSummaryListProcessorTest.kt  |   2 +-
 .../test/room/LatestEventValueFixture.kt      |  48 +++++
 .../matrix/test/room/RoomSummaryFixture.kt    |  26 +--
 .../matrix/test/timeline/TimelineFixture.kt   |   8 +-
 .../ui/messages/reply/InReplyToDetails.kt     |   4 +-
 .../reply/InReplyToDetailsProvider.kt         |   4 +-
 .../matrix/ui/messages/reply/InReplyToView.kt |   4 +-
 .../matrix/ui/messages/sender/SenderName.kt   |  14 +-
 .../messages/sender/SenderNameDataProvider.kt |   8 +-
 .../ui/messages/reply/InReplyToDetailTest.kt  |   8 +-
 .../messages/reply/InReplyToMetadataKtTest.kt |   6 +-
 42 files changed, 352 insertions(+), 290 deletions(-)
 rename libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/{RoomLastMessageFormatter.kt => RoomLatestEventFormatter.kt} (59%)
 rename libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/{DefaultRoomLastMessageFormatter.kt => DefaultRoomLatestEventFormatter.kt} (82%)
 rename libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/{DefaultBaseRoomLastMessageFormatterTest.kt => DefaultRoomLatestEventFormatterTest.kt} (79%)
 rename libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/{FakeRoomLastMessageFormatter.kt => FakeRoomLatestEventFormatter.kt} (59%)
 delete mode 100644 libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/message/RoomMessage.kt
 create mode 100644 libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/LatestEventValue.kt
 rename libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/{ProfileTimelineDetails.kt => ProfileDetails.kt} (68%)
 delete mode 100644 libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt
 create mode 100644 libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/LatestEventValueFixture.kt

diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
index a9a1745b85..c43f7dcdd2 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
@@ -277,7 +277,7 @@ private fun MessagePreviewAndIndicatorRow(
         val messagePreview = if (room.isTombstoned) {
             stringResource(R.string.screen_roomlist_tombstoned_room_description)
         } else {
-            room.lastMessage.orEmpty()
+            room.latestEvent.orEmpty()
         }
         val annotatedMessagePreview = messagePreview as? AnnotatedString ?: AnnotatedString(text = messagePreview.toString())
         Text(
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
index 62b34ba8de..935410e572 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
@@ -15,7 +15,7 @@ import io.element.android.libraries.core.extensions.orEmpty
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
@@ -26,7 +26,7 @@ import kotlinx.collections.immutable.toImmutableList
 @Inject
 class RoomListRoomSummaryFactory(
     private val dateFormatter: DateFormatter,
-    private val roomLastMessageFormatter: RoomLastMessageFormatter,
+    private val roomLatestEventFormatter: RoomLatestEventFormatter,
 ) {
     fun create(roomSummary: RoomSummary): RoomListRoomSummary {
         val roomInfo = roomSummary.info
@@ -40,13 +40,11 @@ class RoomListRoomSummaryFactory(
             numberOfUnreadNotifications = roomInfo.numUnreadNotifications,
             isMarkedUnread = roomInfo.isMarkedUnread,
             timestamp = dateFormatter.format(
-                timestamp = roomSummary.lastMessageTimestamp,
+                timestamp = roomSummary.latestEventTimestamp,
                 mode = DateFormatterMode.TimeOrDate,
                 useRelative = true,
             ),
-            lastMessage = roomSummary.lastMessage?.let { message ->
-                roomLastMessageFormatter.format(message.event, roomInfo.isDm)
-            }.orEmpty(),
+            latestEvent = roomLatestEventFormatter.format(roomSummary.latestEvent, roomInfo.isDm).orEmpty(),
             avatarData = avatarData,
             userDefinedNotificationMode = roomInfo.userDefinedNotificationMode,
             hasRoomCall = roomInfo.hasRoomCall,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt
index 215ded2081..aa983baf56 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt
@@ -29,7 +29,7 @@ data class RoomListRoomSummary(
     val numberOfUnreadNotifications: Long,
     val isMarkedUnread: Boolean,
     val timestamp: String?,
-    val lastMessage: CharSequence?,
+    val latestEvent: CharSequence?,
     val avatarData: AvatarData,
     val userDefinedNotificationMode: RoomNotificationMode?,
     val hasRoomCall: Boolean,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
index e00d7564ba..e88d6d0972 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
@@ -171,7 +171,7 @@ internal fun aRoomListRoomSummary(
     numberOfUnreadNotifications = numberOfUnreadNotifications,
     isMarkedUnread = isMarkedUnread,
     timestamp = timestamp,
-    lastMessage = lastMessage,
+    latestEvent = lastMessage,
     avatarData = avatarData,
     userDefinedNotificationMode = notificationMode,
     hasRoomCall = hasRoomCall,
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt
index fd51c3b53e..941f889f69 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt
@@ -10,12 +10,12 @@ package io.element.android.features.home.impl.datasource
 
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
-import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
 
 fun aRoomListRoomSummaryFactory(
     dateFormatter: DateFormatter = FakeDateFormatter { _, _, _ -> "Today" },
-    roomLastMessageFormatter: RoomLastMessageFormatter = RoomLastMessageFormatter { _, _ -> "Hey" }
+    roomLatestEventFormatter: RoomLatestEventFormatter = RoomLatestEventFormatter { _, _ -> "Hey" }
 ) = RoomListRoomSummaryFactory(
     dateFormatter = dateFormatter,
-    roomLastMessageFormatter = roomLastMessageFormatter
+    roomLatestEventFormatter = roomLatestEventFormatter
 )
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
index 72465e15fd..cbf6c145ad 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
@@ -96,7 +96,7 @@ internal fun createRoomListRoomSummary(
     numberOfUnreadNotifications = numberOfUnreadNotifications,
     isMarkedUnread = isMarkedUnread,
     timestamp = timestamp,
-    lastMessage = "",
+    latestEvent = "",
     avatarData = AvatarData(id = A_ROOM_ID.value, name = A_ROOM_NAME, size = AvatarSize.RoomListItem),
     displayType = displayType,
     userDefinedNotificationMode = userDefinedNotificationMode,
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
index cf535e187d..cf636e26ca 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
@@ -35,8 +35,8 @@ import io.element.android.features.rageshake.test.logs.FakeAnnouncementService
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
-import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
-import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
+import io.element.android.libraries.eventformatter.test.FakeRoomLatestEventFormatter
 import io.element.android.libraries.fullscreenintent.api.aFullScreenIntentPermissionsState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -638,7 +638,7 @@ class RoomListPresenterTest {
         client: MatrixClient = FakeMatrixClient(),
         leaveRoomState: LeaveRoomState = aLeaveRoomState(),
         dateFormatter: DateFormatter = FakeDateFormatter(),
-        roomLastMessageFormatter: RoomLastMessageFormatter = FakeRoomLastMessageFormatter(),
+        roomLatestEventFormatter: RoomLatestEventFormatter = FakeRoomLatestEventFormatter(),
         sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(),
         analyticsService: AnalyticsService = FakeAnalyticsService(),
         filtersPresenter: Presenter<RoomListFiltersState> = Presenter { aRoomListFiltersState() },
@@ -655,7 +655,7 @@ class RoomListPresenterTest {
             roomListService = client.roomListService,
             roomListRoomSummaryFactory = aRoomListRoomSummaryFactory(
                 dateFormatter = dateFormatter,
-                roomLastMessageFormatter = roomLastMessageFormatter,
+                roomLatestEventFormatter = roomLatestEventFormatter,
             ),
             coroutineDispatchers = testCoroutineDispatchers(),
             notificationSettingsService = client.notificationSettingsService,
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt
index 5c3bef26c4..7855180926 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt
@@ -170,7 +170,7 @@ class RoomListViewTest {
             // Remove automatic initial events
             eventsRecorder.clear()
 
-            rule.onNodeWithText(room0.lastMessage!!.toString()).performClick()
+            rule.onNodeWithText(room0.latestEvent!!.toString()).performClick()
         }
 
         eventsRecorder.assertEmpty()
@@ -192,7 +192,7 @@ class RoomListViewTest {
             )
             // Remove automatic initial events
             eventsRecorder.clear()
-            rule.onNodeWithText(room0.lastMessage!!.toString())
+            rule.onNodeWithText(room0.latestEvent!!.toString())
                 .performClick()
                 .performClick()
         }
@@ -214,7 +214,7 @@ class RoomListViewTest {
         // Remove automatic initial events
         eventsRecorder.clear()
 
-        rule.onNodeWithText(room0.lastMessage!!.toString()).performTouchInput { longClick() }
+        rule.onNodeWithText(room0.latestEvent!!.toString()).performTouchInput { longClick() }
         eventsRecorder.assertSingle(RoomListEvents.ShowContextMenu(room0))
     }
 
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt
index d21f3a09a8..dee0601915 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt
@@ -14,7 +14,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.home.impl.datasource.aRoomListRoomSummaryFactory
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
-import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter
+import io.element.android.libraries.eventformatter.test.FakeRoomLatestEventFormatter
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.test.room.aRoomSummary
@@ -126,7 +126,7 @@ fun TestScope.createRoomListSearchPresenter(
             roomListService = roomListService,
             roomSummaryFactory = aRoomListRoomSummaryFactory(
                 dateFormatter = FakeDateFormatter(),
-                roomLastMessageFormatter = FakeRoomLastMessageFormatter(),
+                roomLatestEventFormatter = FakeRoomLatestEventFormatter(),
             ),
             coroutineDispatchers = testCoroutineDispatchers(),
         ),
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
index 2e2ea2b3e8..1f40e94a9b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
@@ -103,7 +103,7 @@ import io.element.android.libraries.matrix.api.timeline.item.EmbeddedEventInfo
 import io.element.android.libraries.matrix.api.timeline.item.ThreadSummary
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.getAvatarUrl
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
@@ -542,7 +542,7 @@ private fun TimelineItemEventRowContent(
 @Composable
 private fun MessageSenderInformation(
     senderId: UserId,
-    senderProfile: ProfileTimelineDetails,
+    senderProfile: ProfileDetails,
     senderAvatar: AvatarData,
     onClick: () -> Unit,
     modifier: Modifier = Modifier
@@ -844,7 +844,7 @@ internal fun TimelineItemEventRowWithThreadSummaryPreview() = ElementPreview {
                                     type = TextMessageType("This is the latest message in the thread", null)
                                 ),
                                 senderId = UserId("@user:id"),
-                                senderProfile = ProfileTimelineDetails.Ready(
+                                senderProfile = ProfileDetails.Ready(
                                     displayName = "Alice",
                                     avatarUrl = null,
                                     displayNameAmbiguous = false,
@@ -877,7 +877,7 @@ internal fun ThreadSummaryViewPreview() {
                         type = TextMessageType(body, null)
                     ),
                     senderId = UserId("@user:id"),
-                    senderProfile = ProfileTimelineDetails.Ready(
+                    senderProfile = ProfileDetails.Ready(
                         displayName = "Alice",
                         avatarUrl = null,
                         displayNameAmbiguous = true,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt
index ef69c0d6a1..31cf689ef8 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt
@@ -25,7 +25,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.LegacyCallInv
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
 import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
@@ -63,7 +63,7 @@ class TimelineItemContentFactory(
         eventId: EventId?,
         isEditable: Boolean,
         sender: UserId,
-        senderProfile: ProfileTimelineDetails,
+        senderProfile: ProfileDetails,
     ): TimelineItemEventContent {
         val isOutgoing = sessionId == sender
         return when (itemContent) {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt
index 590090b6ed..1f01b16012 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt
@@ -28,7 +28,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransa
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageShieldProvider
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.SendHandleProvider
 import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemDebugInfoProvider
 import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
@@ -69,7 +69,7 @@ sealed interface TimelineItem {
         val eventId: EventId? = null,
         val transactionId: TransactionId? = null,
         val senderId: UserId,
-        val senderProfile: ProfileTimelineDetails,
+        val senderProfile: ProfileDetails,
         val senderAvatar: AvatarData,
         val content: TimelineItemEventContent,
         val sentTimeMillis: Long = 0L,
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt
index e69e83ad04..8bced93023 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt
@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.AN_EVENT_ID_2
@@ -86,7 +86,7 @@ fun aRedactedMatrixTimeline(eventId: EventId) = listOf<MatrixTimelineItem>(
             reactions = persistentListOf(),
             receipts = persistentListOf(),
             sender = A_USER_ID,
-            senderProfile = ProfileTimelineDetails.Unavailable,
+            senderProfile = ProfileDetails.Unavailable,
             timestamp = 9442,
             content = RedactedContent,
             origin = null,
diff --git a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLastMessageFormatter.kt b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLatestEventFormatter.kt
similarity index 59%
rename from libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLastMessageFormatter.kt
rename to libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLatestEventFormatter.kt
index dfdf15cc24..5eb7713b54 100644
--- a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLastMessageFormatter.kt
+++ b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLatestEventFormatter.kt
@@ -8,8 +8,8 @@
 
 package io.element.android.libraries.eventformatter.api
 
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 
-fun interface RoomLastMessageFormatter {
-    fun format(event: EventTimelineItem, isDmRoom: Boolean): CharSequence?
+fun interface RoomLatestEventFormatter {
+    fun format(latestEvent: LatestEventValue, isDmRoom: Boolean): CharSequence?
 }
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
similarity index 82%
rename from libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
rename to libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
index 4373977ec8..48b8c83bc6 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
@@ -10,13 +10,15 @@ package io.element.android.libraries.eventformatter.impl
 
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
 import io.element.android.libraries.eventformatter.impl.mode.RenderingMode
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyContent
 import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
@@ -45,22 +47,46 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.toolbox.api.strings.StringProvider
 
 @ContributesBinding(SessionScope::class)
-class DefaultRoomLastMessageFormatter(
+class DefaultRoomLatestEventFormatter(
     private val sp: StringProvider,
     private val roomMembershipContentFormatter: RoomMembershipContentFormatter,
     private val profileChangeContentFormatter: ProfileChangeContentFormatter,
     private val stateContentFormatter: StateContentFormatter,
-    private val permalinkParser: PermalinkParser
-) : RoomLastMessageFormatter {
+    private val permalinkParser: PermalinkParser,
+) : RoomLatestEventFormatter {
     companion object {
         // Max characters to display in the last message. This works around https://github.com/element-hq/element-x-android/issues/2105
         private const val MAX_SAFE_LENGTH = 500
     }
 
-    override fun format(event: EventTimelineItem, isDmRoom: Boolean): CharSequence? {
-        val isOutgoing = event.isOwn
-        val senderDisambiguatedDisplayName = event.senderProfile.getDisambiguatedDisplayName(event.sender)
-        return when (val content = event.content) {
+    override fun format(latestEvent: LatestEventValue, isDmRoom: Boolean): CharSequence? {
+        return when (latestEvent) {
+            LatestEventValue.None -> null
+            is LatestEventValue.Local -> formatContent(
+                content = latestEvent.content,
+                isDmRoom = isDmRoom,
+                isOutgoing = true,
+                senderId = latestEvent.senderId,
+                senderDisambiguatedDisplayName = latestEvent.senderProfile.getDisambiguatedDisplayName(latestEvent.senderId)
+            )
+            is LatestEventValue.Remote -> formatContent(
+                content = latestEvent.content,
+                isDmRoom = isDmRoom,
+                isOutgoing = latestEvent.isOwn,
+                senderId = latestEvent.senderId,
+                senderDisambiguatedDisplayName = latestEvent.senderProfile.getDisambiguatedDisplayName(latestEvent.senderId)
+            )
+        }
+    }
+
+    private fun formatContent(
+        content: EventContent,
+        isDmRoom: Boolean,
+        isOutgoing: Boolean,
+        senderId: UserId,
+        senderDisambiguatedDisplayName: String
+    ): CharSequence? {
+        return when (content) {
             is MessageContent -> content.process(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
             RedactedContent -> {
                 val message = sp.getString(CommonStrings.common_message_removed)
@@ -78,7 +104,7 @@ class DefaultRoomLastMessageFormatter(
                 roomMembershipContentFormatter.format(content, senderDisambiguatedDisplayName, isOutgoing)
             }
             is ProfileChangeContent -> {
-                profileChangeContentFormatter.format(content, event.sender, senderDisambiguatedDisplayName, isOutgoing)
+                profileChangeContentFormatter.format(content, senderId, senderDisambiguatedDisplayName, isOutgoing)
             }
             is StateContent -> {
                 stateContentFormatter.format(content, senderDisambiguatedDisplayName, isOutgoing, RenderingMode.RoomList)
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt
index c067113b2d..10c09ad41d 100644
--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt
@@ -44,7 +44,7 @@ import io.element.android.libraries.matrix.test.media.aMediaSource
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.matrix.test.timeline.aPollContent
 import io.element.android.libraries.matrix.test.timeline.aProfileChangeMessageContent
-import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
+import io.element.android.libraries.matrix.test.timeline.aProfileDetails
 import io.element.android.libraries.matrix.test.timeline.aStickerContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
@@ -778,7 +778,7 @@ class DefaultPinnedMessagesBannerFormatterTest {
         content: EventContent,
     ): EventTimelineItem {
         val sender = if (sentByYou) A_USER_ID else someoneElseId
-        val profile = aProfileTimelineDetails(senderDisplayName)
+        val profile = aProfileDetails(senderDisplayName)
         return anEventTimelineItem(
             content = content,
             senderProfile = profile,
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultBaseRoomLastMessageFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
similarity index 79%
rename from libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultBaseRoomLastMessageFormatterTest.kt
rename to libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
index 5b8c2c86df..96d341f447 100644
--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultBaseRoomLastMessageFormatterTest.kt
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
@@ -15,10 +15,10 @@ import com.google.common.truth.Truth.assertWithMessage
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
@@ -43,11 +43,11 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.media.aMediaSource
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
+import io.element.android.libraries.matrix.test.room.aRemoteLatestEvent
 import io.element.android.libraries.matrix.test.timeline.aPollContent
 import io.element.android.libraries.matrix.test.timeline.aProfileChangeMessageContent
-import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
+import io.element.android.libraries.matrix.test.timeline.aProfileDetails
 import io.element.android.libraries.matrix.test.timeline.aStickerContent
-import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
 import org.junit.Before
@@ -59,17 +59,17 @@ import org.robolectric.annotation.Config
 
 @Suppress("LargeClass")
 @RunWith(RobolectricTestRunner::class)
-class DefaultBaseRoomLastMessageFormatterTest {
+class DefaultRoomLatestEventFormatterTest {
     private lateinit var context: Context
     private lateinit var fakeMatrixClient: FakeMatrixClient
-    private lateinit var formatter: DefaultRoomLastMessageFormatter
+    private lateinit var formatter: DefaultRoomLatestEventFormatter
 
     @Before
     fun setup() {
         context = RuntimeEnvironment.getApplication() as Context
         fakeMatrixClient = FakeMatrixClient()
         val stringProvider = AndroidStringProvider(context.resources)
-        formatter = DefaultRoomLastMessageFormatter(
+        formatter = DefaultRoomLatestEventFormatter(
             sp = AndroidStringProvider(context.resources),
             roomMembershipContentFormatter = RoomMembershipContentFormatter(fakeMatrixClient, stringProvider),
             profileChangeContentFormatter = ProfileChangeContentFormatter(stringProvider),
@@ -84,7 +84,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val expected = "Message removed"
         val senderName = "Someone"
         sequenceOf(false, true).forEach { isDm ->
-            val message = createRoomEvent(false, senderName, RedactedContent)
+            val message = createLatestEvent(false, senderName, RedactedContent)
             val result = formatter.format(message, isDm)
             if (isDm) {
                 assertThat(result).isEqualTo(expected)
@@ -100,7 +100,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
     fun `Sticker content`() {
         val body = "a sticker body"
         val info = ImageInfo(null, null, null, null, null, null, null)
-        val message = createRoomEvent(false, null, aStickerContent(body, info, aMediaSource(url = "url")))
+        val message = createLatestEvent(false, null, aStickerContent(body, info, aMediaSource(url = "url")))
         val result = formatter.format(message, false)
         val expectedBody = someoneElseId.value + ": Sticker (a sticker body)"
         assertThat(result.toString()).isEqualTo(expectedBody)
@@ -112,7 +112,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val expected = "Waiting for this message"
         val senderName = "Someone"
         sequenceOf(false, true).forEach { isDm ->
-            val message = createRoomEvent(false, senderName, UnableToDecryptContent(UnableToDecryptContent.Data.Unknown))
+            val message = createLatestEvent(false, senderName, UnableToDecryptContent(UnableToDecryptContent.Data.Unknown))
             val result = formatter.format(message, isDm)
             if (isDm) {
                 assertThat(result).isEqualTo(expected)
@@ -134,7 +134,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
                 FailedToParseStateContent("", "", ""),
                 UnknownContent,
             ).forEach { type ->
-                val message = createRoomEvent(false, senderName, type)
+                val message = createLatestEvent(false, senderName, type)
                 val result = formatter.format(message, isDm)
                 if (isDm) {
                     assertWithMessage("$type was not properly handled").that(result).isEqualTo(expected)
@@ -198,7 +198,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
         sequenceOf(false, true).forEach { isDm ->
             sharedContentMessagesTypes.forEach { type ->
                 val content = createMessageContent(type)
-                val message = createRoomEvent(sentByYou = sentByYou, senderDisplayName = senderName, content = content)
+                val message = createLatestEvent(sentByYou = sentByYou, senderDisplayName = senderName, content = content)
                 val result = formatter.format(message, isDmRoom = isDm)
                 if (isDm) {
                     resultsInDm.add(type to result)
@@ -294,11 +294,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.JOINED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.JOINED)
 
-        val youJoinedRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youJoinedRoomEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youJoinedRoom = formatter.format(youJoinedRoomEvent, false)
         assertThat(youJoinedRoom).isEqualTo("You joined the room")
 
-        val someoneJoinedRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneJoinedRoomEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneJoinedRoom = formatter.format(someoneJoinedRoomEvent, false)
         assertThat(someoneJoinedRoom).isEqualTo("$otherName joined the room")
     }
@@ -310,11 +310,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.LEFT)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.LEFT)
 
-        val youLeftRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youLeftRoomEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youLeftRoom = formatter.format(youLeftRoomEvent, false)
         assertThat(youLeftRoom).isEqualTo("You left the room")
 
-        val someoneLeftRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneLeftRoomEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneLeftRoom = formatter.format(someoneLeftRoomEvent, false)
         assertThat(someoneLeftRoom).isEqualTo("$otherName left the room")
     }
@@ -329,19 +329,19 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED)
         val someoneKickedContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED)
 
-        val youBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youBannedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youBanned = formatter.format(youBannedEvent, false)
         assertThat(youBanned).isEqualTo("You banned $third")
 
-        val youKickBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youKickedContent)
+        val youKickBannedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youKickedContent)
         val youKickedBanned = formatter.format(youKickBannedEvent, false)
         assertThat(youKickedBanned).isEqualTo("You banned $third")
 
-        val someoneBannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneBannedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneBanned = formatter.format(someoneBannedEvent, false)
         assertThat(someoneBanned).isEqualTo("$otherName banned $third")
 
-        val someoneKickBannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneKickedContent)
+        val someoneKickBannedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneKickedContent)
         val someoneKickBanned = formatter.format(someoneKickBannedEvent, false)
         assertThat(someoneKickBanned).isEqualTo("$otherName banned $third")
     }
@@ -356,19 +356,19 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED, A_REASON)
         val someoneKickedContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED, A_REASON)
 
-        val youBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youBannedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youBanned = formatter.format(youBannedEvent, false)
         assertThat(youBanned).isEqualTo("You banned $third: $A_REASON")
 
-        val youKickBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youKickedContent)
+        val youKickBannedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youKickedContent)
         val youKickedBanned = formatter.format(youKickBannedEvent, false)
         assertThat(youKickedBanned).isEqualTo("You banned $third: $A_REASON")
 
-        val someoneBannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneBannedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneBanned = formatter.format(someoneBannedEvent, false)
         assertThat(someoneBanned).isEqualTo("$otherName banned $third: $A_REASON")
 
-        val someoneKickBannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneKickedContent)
+        val someoneKickBannedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneKickedContent)
         val someoneKickBanned = formatter.format(someoneKickBannedEvent, false)
         assertThat(someoneKickBanned).isEqualTo("$otherName banned $third: $A_REASON")
     }
@@ -381,11 +381,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
 
-        val youUnbannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youUnbannedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youUnbanned = formatter.format(youUnbannedEvent, false)
         assertThat(youUnbanned).isEqualTo("You unbanned $third")
 
-        val someoneUnbannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneUnbannedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneUnbanned = formatter.format(someoneUnbannedEvent, false)
         assertThat(someoneUnbanned).isEqualTo("$otherName unbanned $third")
     }
@@ -398,11 +398,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
 
-        val youKickedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youKickedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youKicked = formatter.format(youKickedEvent, false)
         assertThat(youKicked).isEqualTo("You removed $third")
 
-        val someoneKickedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneKickedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneKicked = formatter.format(someoneKickedEvent, false)
         assertThat(someoneKicked).isEqualTo("$otherName removed $third")
     }
@@ -415,11 +415,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED, A_REASON)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED, A_REASON)
 
-        val youKickedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youKickedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youKicked = formatter.format(youKickedEvent, false)
         assertThat(youKicked).isEqualTo("You removed $third: $A_REASON")
 
-        val someoneKickedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneKickedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneKicked = formatter.format(someoneKickedEvent, false)
         assertThat(someoneKicked).isEqualTo("$otherName removed $third: $A_REASON")
     }
@@ -432,15 +432,15 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITED)
 
-        val youWereInvitedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = youContent)
+        val youWereInvitedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = youContent)
         val youWereInvited = formatter.format(youWereInvitedEvent, false)
         assertThat(youWereInvited).isEqualTo("$otherName invited you")
 
-        val youInvitedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
+        val youInvitedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youInvited = formatter.format(youInvitedEvent, false)
         assertThat(youInvited).isEqualTo("You invited $third")
 
-        val someoneInvitedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneInvitedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneInvited = formatter.format(someoneInvitedEvent, false)
         assertThat(someoneInvited).isEqualTo("$otherName invited $third")
     }
@@ -452,11 +452,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_ACCEPTED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_ACCEPTED)
 
-        val youAcceptedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youAcceptedInviteEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youAcceptedInvite = formatter.format(youAcceptedInviteEvent, false)
         assertThat(youAcceptedInvite).isEqualTo("You accepted the invite")
 
-        val someoneAcceptedInviteEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneAcceptedInviteEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneAcceptedInvite = formatter.format(someoneAcceptedInviteEvent, false)
         assertThat(someoneAcceptedInvite).isEqualTo("$otherName accepted the invite")
     }
@@ -468,11 +468,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_REJECTED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_REJECTED)
 
-        val youRejectedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youRejectedInviteEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youRejectedInvite = formatter.format(youRejectedInviteEvent, false)
         assertThat(youRejectedInvite).isEqualTo("You rejected the invitation")
 
-        val someoneRejectedInviteEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneRejectedInviteEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneRejectedInvite = formatter.format(someoneRejectedInviteEvent, false)
         assertThat(someoneRejectedInvite).isEqualTo("$otherName rejected the invitation")
     }
@@ -484,11 +484,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val third = "Someone"
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITATION_REVOKED)
 
-        val youRevokedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
+        val youRevokedInviteEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youRevokedInvite = formatter.format(youRevokedInviteEvent, false)
         assertThat(youRevokedInvite).isEqualTo("You revoked the invitation for $third to join the room")
 
-        val someoneRevokedInviteEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneRevokedInviteEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneRevokedInvite = formatter.format(someoneRevokedInviteEvent, false)
         assertThat(someoneRevokedInvite).isEqualTo("$otherName revoked the invitation for $third to join the room")
     }
@@ -500,11 +500,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCKED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.KNOCKED)
 
-        val youKnockedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youKnockedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youKnocked = formatter.format(youKnockedEvent, false)
         assertThat(youKnocked).isEqualTo("You requested to join")
 
-        val someoneKnockedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneKnockedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneKnocked = formatter.format(someoneKnockedEvent, false)
         assertThat(someoneKnocked).isEqualTo("$otherName is requesting to join")
     }
@@ -516,11 +516,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val third = "Someone"
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_ACCEPTED)
 
-        val youAcceptedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
+        val youAcceptedKnockEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youAcceptedKnock = formatter.format(youAcceptedKnockEvent, false)
         assertThat(youAcceptedKnock).isEqualTo("You allowed $third to join")
 
-        val someoneAcceptedKnockEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneAcceptedKnockEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneAcceptedKnock = formatter.format(someoneAcceptedKnockEvent, false)
         assertThat(someoneAcceptedKnock).isEqualTo("$otherName granted access to $third")
     }
@@ -532,11 +532,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCK_RETRACTED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), null, MembershipChange.KNOCK_RETRACTED)
 
-        val youRetractedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youRetractedKnockEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youRetractedKnock = formatter.format(youRetractedKnockEvent, false)
         assertThat(youRetractedKnock).isEqualTo("You cancelled your request to join")
 
-        val someoneRetractedKnockEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneRetractedKnockEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneRetractedKnock = formatter.format(someoneRetractedKnockEvent, false)
         assertThat(someoneRetractedKnock).isEqualTo("$otherName is no longer interested in joining")
     }
@@ -549,15 +549,15 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, third, MembershipChange.KNOCK_DENIED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_DENIED)
 
-        val youDeniedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
+        val youDeniedKnockEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youDeniedKnock = formatter.format(youDeniedKnockEvent, false)
         assertThat(youDeniedKnock).isEqualTo("You rejected $third's request to join")
 
-        val someoneDeniedKnockEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneDeniedKnockEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneDeniedKnock = formatter.format(someoneDeniedKnockEvent, false)
         assertThat(someoneDeniedKnock).isEqualTo("$otherName rejected $third's request to join")
 
-        val someoneDeniedYourKnockEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = youContent)
+        val someoneDeniedYourKnockEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = youContent)
         val someoneDeniedYourKnock = formatter.format(someoneDeniedYourKnockEvent, false)
         assertThat(someoneDeniedYourKnock).isEqualTo("$otherName rejected your request to join")
     }
@@ -569,11 +569,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.NONE)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.NONE)
 
-        val youNoneRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youNoneRoomEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youNoneRoom = formatter.format(youNoneRoomEvent, false)
         assertThat(youNoneRoom).isEqualTo("You made no changes")
 
-        val someoneNoneRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneNoneRoomEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneNoneRoom = formatter.format(someoneNoneRoomEvent, false)
         assertThat(someoneNoneRoom).isEqualTo("$otherName made no changes")
     }
@@ -585,7 +585,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
 
         val results = otherChanges.map { change ->
             val content = aRoomMembershipContent(A_USER_ID, null, change)
-            val event = createRoomEvent(sentByYou = false, senderDisplayName = "Someone", content = content)
+            val event = createLatestEvent(sentByYou = false, senderDisplayName = "Someone", content = content)
             val result = formatter.format(event, false)
             change to result
         }
@@ -604,19 +604,19 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val changedContent = StateContent("", OtherState.RoomAvatar("new_avatar"))
         val removedContent = StateContent("", OtherState.RoomAvatar(null))
 
-        val youChangedRoomAvatarEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedRoomAvatarEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedRoomAvatar = formatter.format(youChangedRoomAvatarEvent, false)
         assertThat(youChangedRoomAvatar).isEqualTo("You changed the room avatar")
 
-        val someoneChangedRoomAvatarEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneChangedRoomAvatarEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneChangedRoomAvatar = formatter.format(someoneChangedRoomAvatarEvent, false)
         assertThat(someoneChangedRoomAvatar).isEqualTo("$otherName changed the room avatar")
 
-        val youRemovedRoomAvatarEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youRemovedRoomAvatarEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youRemovedRoomAvatar = formatter.format(youRemovedRoomAvatarEvent, false)
         assertThat(youRemovedRoomAvatar).isEqualTo("You removed the room avatar")
 
-        val someoneRemovedRoomAvatarEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneRemovedRoomAvatarEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneRemovedRoomAvatar = formatter.format(someoneRemovedRoomAvatarEvent, false)
         assertThat(someoneRemovedRoomAvatar).isEqualTo("$otherName removed the room avatar")
     }
@@ -627,11 +627,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val otherName = "Other"
         val content = StateContent("", OtherState.RoomCreate)
 
-        val youCreatedRoomMessage = createRoomEvent(sentByYou = true, senderDisplayName = null, content = content)
+        val youCreatedRoomMessage = createLatestEvent(sentByYou = true, senderDisplayName = null, content = content)
         val youCreatedRoom = formatter.format(youCreatedRoomMessage, false)
         assertThat(youCreatedRoom).isEqualTo("You created the room")
 
-        val someoneCreatedRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = content)
+        val someoneCreatedRoomEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = content)
         val someoneCreatedRoom = formatter.format(someoneCreatedRoomEvent, false)
         assertThat(someoneCreatedRoom).isEqualTo("$otherName created the room")
     }
@@ -642,11 +642,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val otherName = "Other"
         val content = StateContent("", OtherState.RoomEncryption)
 
-        val youCreatedRoomMessage = createRoomEvent(sentByYou = true, senderDisplayName = null, content = content)
+        val youCreatedRoomMessage = createLatestEvent(sentByYou = true, senderDisplayName = null, content = content)
         val youCreatedRoom = formatter.format(youCreatedRoomMessage, false)
         assertThat(youCreatedRoom).isEqualTo("Encryption enabled")
 
-        val someoneCreatedRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = content)
+        val someoneCreatedRoomEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = content)
         val someoneCreatedRoom = formatter.format(someoneCreatedRoomEvent, false)
         assertThat(someoneCreatedRoom).isEqualTo("Encryption enabled")
     }
@@ -659,19 +659,19 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val changedContent = StateContent("", OtherState.RoomName(newName))
         val removedContent = StateContent("", OtherState.RoomName(null))
 
-        val youChangedRoomNameEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedRoomNameEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedRoomName = formatter.format(youChangedRoomNameEvent, false)
         assertThat(youChangedRoomName).isEqualTo("You changed the room name to: $newName")
 
-        val someoneChangedRoomNameEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneChangedRoomNameEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneChangedRoomName = formatter.format(someoneChangedRoomNameEvent, false)
         assertThat(someoneChangedRoomName).isEqualTo("$otherName changed the room name to: $newName")
 
-        val youRemovedRoomNameEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youRemovedRoomNameEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youRemovedRoomName = formatter.format(youRemovedRoomNameEvent, false)
         assertThat(youRemovedRoomName).isEqualTo("You removed the room name")
 
-        val someoneRemovedRoomNameEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneRemovedRoomNameEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneRemovedRoomName = formatter.format(someoneRemovedRoomNameEvent, false)
         assertThat(someoneRemovedRoomName).isEqualTo("$otherName removed the room name")
     }
@@ -684,19 +684,19 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val changedContent = StateContent("", OtherState.RoomThirdPartyInvite(inviteeName))
         val removedContent = StateContent("", OtherState.RoomThirdPartyInvite(null))
 
-        val youInvitedSomeoneEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youInvitedSomeoneEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youInvitedSomeone = formatter.format(youInvitedSomeoneEvent, false)
         assertThat(youInvitedSomeone).isEqualTo("You sent an invitation to $inviteeName to join the room")
 
-        val someoneInvitedSomeoneEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneInvitedSomeoneEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneInvitedSomeone = formatter.format(someoneInvitedSomeoneEvent, false)
         assertThat(someoneInvitedSomeone).isEqualTo("$otherName sent an invitation to $inviteeName to join the room")
 
-        val youInvitedNoOneEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youInvitedNoOneEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youInvitedNoOne = formatter.format(youInvitedNoOneEvent, false)
         assertThat(youInvitedNoOne).isNull()
 
-        val someoneInvitedNoOneEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneInvitedNoOneEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneInvitedNoOne = formatter.format(someoneInvitedNoOneEvent, false)
         assertThat(someoneInvitedNoOne).isNull()
     }
@@ -710,27 +710,27 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val removedContent = StateContent("", OtherState.RoomTopic(null))
         val blankContent = StateContent("", OtherState.RoomTopic(""))
 
-        val youChangedRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedRoomTopicEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedRoomTopic = formatter.format(youChangedRoomTopicEvent, false)
         assertThat(youChangedRoomTopic).isEqualTo("You changed the topic to: $roomTopic")
 
-        val someoneChangedRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneChangedRoomTopicEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneChangedRoomTopic = formatter.format(someoneChangedRoomTopicEvent, false)
         assertThat(someoneChangedRoomTopic).isEqualTo("$otherName changed the topic to: $roomTopic")
 
-        val youRemovedRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youRemovedRoomTopicEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youRemovedRoomTopic = formatter.format(youRemovedRoomTopicEvent, false)
         assertThat(youRemovedRoomTopic).isEqualTo("You removed the room topic")
 
-        val someoneRemovedRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneRemovedRoomTopicEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneRemovedRoomTopic = formatter.format(someoneRemovedRoomTopicEvent, false)
         assertThat(someoneRemovedRoomTopic).isEqualTo("$otherName removed the room topic")
 
-        val youSetBlankRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = blankContent)
+        val youSetBlankRoomTopicEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = blankContent)
         val youSetBlankRoomTopic = formatter.format(youSetBlankRoomTopicEvent, false)
         assertThat(youSetBlankRoomTopic).isEqualTo("You removed the room topic")
 
-        val someoneSetBlankRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = blankContent)
+        val someoneSetBlankRoomTopicEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = blankContent)
         val someoneSetBlankRoomTopic = formatter.format(someoneSetBlankRoomTopicEvent, false)
         assertThat(someoneSetBlankRoomTopic).isEqualTo("$otherName removed the room topic")
     }
@@ -758,7 +758,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
 
         val results = otherStates.map { state ->
             val content = StateContent("", state)
-            val event = createRoomEvent(sentByYou = false, senderDisplayName = "Someone", content = content)
+            val event = createLatestEvent(sentByYou = false, senderDisplayName = "Someone", content = content)
             val result = formatter.format(event, false)
             state to result
         }
@@ -780,35 +780,35 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val invalidContent = aProfileChangeMessageContent(avatarUrl = null, prevAvatarUrl = null)
         val sameContent = aProfileChangeMessageContent(avatarUrl = "same_avatar_url", prevAvatarUrl = "same_avatar_url")
 
-        val youChangedAvatarEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedAvatarEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedAvatar = formatter.format(youChangedAvatarEvent, false)
         assertThat(youChangedAvatar).isEqualTo("You changed your avatar")
 
-        val someoneChangeAvatarEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneChangeAvatarEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneChangeAvatar = formatter.format(someoneChangeAvatarEvent, false)
         assertThat(someoneChangeAvatar).isEqualTo("$otherName changed their avatar")
 
-        val youSetAvatarEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = setContent)
+        val youSetAvatarEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = setContent)
         val youSetAvatar = formatter.format(youSetAvatarEvent, false)
         assertThat(youSetAvatar).isEqualTo("You changed your avatar")
 
-        val someoneSetAvatarEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = setContent)
+        val someoneSetAvatarEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = setContent)
         val someoneSetAvatar = formatter.format(someoneSetAvatarEvent, false)
         assertThat(someoneSetAvatar).isEqualTo("$otherName changed their avatar")
 
-        val youRemovedAvatarEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youRemovedAvatarEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youRemovedAvatar = formatter.format(youRemovedAvatarEvent, false)
         assertThat(youRemovedAvatar).isEqualTo("You changed your avatar")
 
-        val someoneRemovedAvatarEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneRemovedAvatarEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneRemovedAvatar = formatter.format(someoneRemovedAvatarEvent, false)
         assertThat(someoneRemovedAvatar).isEqualTo("$otherName changed their avatar")
 
-        val unchangedEvent = createRoomEvent(sentByYou = true, senderDisplayName = otherName, content = sameContent)
+        val unchangedEvent = createLatestEvent(sentByYou = true, senderDisplayName = otherName, content = sameContent)
         val unchangedResult = formatter.format(unchangedEvent, false)
         assertThat(unchangedResult).isNull()
 
-        val invalidEvent = createRoomEvent(sentByYou = true, senderDisplayName = otherName, content = invalidContent)
+        val invalidEvent = createLatestEvent(sentByYou = true, senderDisplayName = otherName, content = invalidContent)
         val invalidResult = formatter.format(invalidEvent, false)
         assertThat(invalidResult).isNull()
     }
@@ -825,35 +825,35 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val sameContent = aProfileChangeMessageContent(displayName = newDisplayName, prevDisplayName = newDisplayName)
         val invalidContent = aProfileChangeMessageContent(displayName = null, prevDisplayName = null)
 
-        val youChangedDisplayNameEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedDisplayNameEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedDisplayName = formatter.format(youChangedDisplayNameEvent, false)
         assertThat(youChangedDisplayName).isEqualTo("You changed your display name from $oldDisplayName to $newDisplayName")
 
-        val someoneChangedDisplayNameEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneChangedDisplayNameEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneChangedDisplayName = formatter.format(someoneChangedDisplayNameEvent, false)
         assertThat(someoneChangedDisplayName).isEqualTo("$someoneElseId changed their display name from $oldDisplayName to $newDisplayName")
 
-        val youSetDisplayNameEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = setContent)
+        val youSetDisplayNameEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = setContent)
         val youSetDisplayName = formatter.format(youSetDisplayNameEvent, false)
         assertThat(youSetDisplayName).isEqualTo("You set your display name to $newDisplayName")
 
-        val someoneSetDisplayNameEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = setContent)
+        val someoneSetDisplayNameEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = setContent)
         val someoneSetDisplayName = formatter.format(someoneSetDisplayNameEvent, false)
         assertThat(someoneSetDisplayName).isEqualTo("$someoneElseId set their display name to $newDisplayName")
 
-        val youRemovedDisplayNameEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youRemovedDisplayNameEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youRemovedDisplayName = formatter.format(youRemovedDisplayNameEvent, false)
         assertThat(youRemovedDisplayName).isEqualTo("You removed your display name (it was $oldDisplayName)")
 
-        val someoneRemovedDisplayNameEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneRemovedDisplayNameEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneRemovedDisplayName = formatter.format(someoneRemovedDisplayNameEvent, false)
         assertThat(someoneRemovedDisplayName).isEqualTo("$someoneElseId removed their display name (it was $oldDisplayName)")
 
-        val unchangedEvent = createRoomEvent(sentByYou = true, senderDisplayName = otherName, content = sameContent)
+        val unchangedEvent = createLatestEvent(sentByYou = true, senderDisplayName = otherName, content = sameContent)
         val unchangedResult = formatter.format(unchangedEvent, false)
         assertThat(unchangedResult).isNull()
 
-        val invalidEvent = createRoomEvent(sentByYou = true, senderDisplayName = otherName, content = invalidContent)
+        val invalidEvent = createLatestEvent(sentByYou = true, senderDisplayName = otherName, content = invalidContent)
         val invalidResult = formatter.format(invalidEvent, false)
         assertThat(invalidResult).isNull()
     }
@@ -882,15 +882,15 @@ class DefaultBaseRoomLastMessageFormatterTest {
             prevAvatarUrl = "same_avatar_url",
         )
 
-        val youChangedBothEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedBothEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedBoth = formatter.format(youChangedBothEvent, false)
         assertThat(youChangedBoth).isEqualTo("You changed your display name from $oldDisplayName to $newDisplayName\n(avatar was changed too)")
 
-        val invalidContentEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = invalidContent)
+        val invalidContentEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = invalidContent)
         val invalidMessage = formatter.format(invalidContentEvent, false)
         assertThat(invalidMessage).isNull()
 
-        val sameContentEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = sameContent)
+        val sameContentEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = sameContent)
         val sameMessage = formatter.format(sameContentEvent, false)
         assertThat(sameMessage).isNull()
     }
@@ -904,10 +904,10 @@ class DefaultBaseRoomLastMessageFormatterTest {
     fun `Computes last message for poll in DM`() {
         val pollContent = aPollContent()
 
-        val mineContentEvent = createRoomEvent(sentByYou = true, senderDisplayName = "Alice", content = pollContent)
+        val mineContentEvent = createLatestEvent(sentByYou = true, senderDisplayName = "Alice", content = pollContent)
         assertThat(formatter.format(mineContentEvent, true)).isEqualTo("Poll: Do you like polls?")
 
-        val contentEvent = createRoomEvent(sentByYou = false, senderDisplayName = "Bob", content = pollContent)
+        val contentEvent = createLatestEvent(sentByYou = false, senderDisplayName = "Bob", content = pollContent)
         assertThat(formatter.format(contentEvent, true)).isEqualTo("Poll: Do you like polls?")
     }
 
@@ -916,26 +916,26 @@ class DefaultBaseRoomLastMessageFormatterTest {
     fun `Computes last message for poll in room`() {
         val pollContent = aPollContent()
 
-        val mineContentEvent = createRoomEvent(sentByYou = true, senderDisplayName = "Alice", content = pollContent)
+        val mineContentEvent = createLatestEvent(sentByYou = true, senderDisplayName = "Alice", content = pollContent)
         assertThat(formatter.format(mineContentEvent, false).toString()).isEqualTo("You: Poll: Do you like polls?")
 
-        val contentEvent = createRoomEvent(sentByYou = false, senderDisplayName = "Bob", content = pollContent)
+        val contentEvent = createLatestEvent(sentByYou = false, senderDisplayName = "Bob", content = pollContent)
         assertThat(formatter.format(contentEvent, false).toString()).isEqualTo("Bob: Poll: Do you like polls?")
     }
 
     // endregion
 
-    private fun createRoomEvent(
+    private fun createLatestEvent(
         sentByYou: Boolean,
         senderDisplayName: String?,
         content: EventContent,
-    ): EventTimelineItem {
+    ): LatestEventValue {
         val sender = if (sentByYou) A_USER_ID else someoneElseId
-        val profile = aProfileTimelineDetails(senderDisplayName)
-        return anEventTimelineItem(
-            content = content,
+        val profile = aProfileDetails(senderDisplayName)
+        return aRemoteLatestEvent(
+            senderId = sender,
             senderProfile = profile,
-            sender = sender,
+            content = content,
             isOwn = sentByYou,
         )
     }
diff --git a/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLastMessageFormatter.kt b/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLatestEventFormatter.kt
similarity index 59%
rename from libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLastMessageFormatter.kt
rename to libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLatestEventFormatter.kt
index b5c069cff1..d82128b2d3 100644
--- a/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLastMessageFormatter.kt
+++ b/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLatestEventFormatter.kt
@@ -8,13 +8,13 @@
 
 package io.element.android.libraries.eventformatter.test
 
-import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 
-class FakeRoomLastMessageFormatter : RoomLastMessageFormatter {
+class FakeRoomLatestEventFormatter : RoomLatestEventFormatter {
     private var result: CharSequence? = null
 
-    override fun format(event: EventTimelineItem, isDmRoom: Boolean): CharSequence? {
+    override fun format(latestEvent: LatestEventValue, isDmRoom: Boolean): CharSequence? {
         return result
     }
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/message/RoomMessage.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/message/RoomMessage.kt
deleted file mode 100644
index 02aafb2e98..0000000000
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/message/RoomMessage.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.api.room.message
-
-import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
-
-data class RoomMessage(
-    val eventId: EventId,
-    val event: EventTimelineItem,
-    val sender: UserId,
-    val originServerTs: Long,
-)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/LatestEventValue.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/LatestEventValue.kt
new file mode 100644
index 0000000000..5482a67875
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/LatestEventValue.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.roomlist
+
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+
+sealed interface LatestEventValue {
+    data object None : LatestEventValue
+    data class Remote(
+        val timestamp: Long,
+        val content: EventContent,
+        val senderId: UserId,
+        val senderProfile: ProfileDetails,
+        val isOwn: Boolean,
+    ) : LatestEventValue
+
+    data class Local(
+        val timestamp: Long,
+        val content: EventContent,
+        val senderId: UserId,
+        val senderProfile: ProfileDetails,
+        val isSending: Boolean,
+    ) : LatestEventValue
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
index 50af91a36c..89a4acfec1 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
@@ -9,13 +9,16 @@
 package io.element.android.libraries.matrix.api.roomlist
 
 import io.element.android.libraries.matrix.api.room.RoomInfo
-import io.element.android.libraries.matrix.api.room.message.RoomMessage
 
 data class RoomSummary(
     val info: RoomInfo,
-    val lastMessage: RoomMessage?,
+    val latestEvent: LatestEventValue,
 ) {
     val roomId = info.id
-    val lastMessageTimestamp = lastMessage?.originServerTs
+    val latestEventTimestamp = when (latestEvent) {
+        is LatestEventValue.None -> null
+        is LatestEventValue.Local -> latestEvent.timestamp
+        is LatestEventValue.Remote -> latestEvent.timestamp
+    }
     val isOneToOne get() = info.activeMembersCount == 2L
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/ThreadSummary.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/ThreadSummary.kt
index 8b2b0d101e..97923995a0 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/ThreadSummary.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/ThreadSummary.kt
@@ -13,7 +13,7 @@ import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 
 sealed interface EventThreadInfo {
     data class ThreadRoot(val summary: ThreadSummary) : EventThreadInfo
@@ -29,6 +29,6 @@ data class EmbeddedEventInfo(
     val eventOrTransactionId: EventOrTransactionId,
     val content: EventContent,
     val senderId: UserId,
-    val senderProfile: ProfileTimelineDetails,
+    val senderProfile: ProfileDetails,
     val timestamp: Long,
 )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventTimelineItem.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventTimelineItem.kt
index ba63a11c4c..8294b78c24 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventTimelineItem.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventTimelineItem.kt
@@ -27,7 +27,7 @@ data class EventTimelineItem(
     val reactions: ImmutableList<EventReaction>,
     val receipts: ImmutableList<Receipt>,
     val sender: UserId,
-    val senderProfile: ProfileTimelineDetails,
+    val senderProfile: ProfileDetails,
     val timestamp: Long,
     val content: EventContent,
     val origin: TimelineItemEventOrigin?,
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/InReplyTo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/InReplyTo.kt
index e9a12d82a3..43a54602ca 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/InReplyTo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/InReplyTo.kt
@@ -25,7 +25,7 @@ sealed interface InReplyTo {
         val eventId: EventId,
         val content: EventContent,
         val senderId: UserId,
-        val senderProfile: ProfileTimelineDetails,
+        val senderProfile: ProfileDetails,
     ) : InReplyTo
 
     /**
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetails.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt
similarity index 68%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetails.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt
index dee7290c98..6393a27bb2 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetails.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt
@@ -12,20 +12,20 @@ import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
 
 @Immutable
-sealed interface ProfileTimelineDetails {
-    data object Unavailable : ProfileTimelineDetails
+sealed interface ProfileDetails {
+    data object Unavailable : ProfileDetails
 
-    data object Pending : ProfileTimelineDetails
+    data object Pending : ProfileDetails
 
     data class Ready(
         val displayName: String?,
         val displayNameAmbiguous: Boolean,
         val avatarUrl: String?
-    ) : ProfileTimelineDetails
+    ) : ProfileDetails
 
     data class Error(
         val message: String
-    ) : ProfileTimelineDetails
+    ) : ProfileDetails
 }
 
 /**
@@ -34,9 +34,9 @@ sealed interface ProfileTimelineDetails {
  * If the display name is ambiguous, the user ID is appended in parentheses.
  * Otherwise, the display name is returned.
  */
-fun ProfileTimelineDetails.getDisambiguatedDisplayName(userId: UserId): String {
+fun ProfileDetails.getDisambiguatedDisplayName(userId: UserId): String {
     return when (this) {
-        is ProfileTimelineDetails.Ready -> when {
+        is ProfileDetails.Ready -> when {
             displayName == null -> userId.value
             displayNameAmbiguous -> "$displayName ($userId)"
             else -> displayName
@@ -45,16 +45,16 @@ fun ProfileTimelineDetails.getDisambiguatedDisplayName(userId: UserId): String {
     }
 }
 
-fun ProfileTimelineDetails.getDisplayName(): String? {
+fun ProfileDetails.getDisplayName(): String? {
     return when (this) {
-        is ProfileTimelineDetails.Ready -> displayName
+        is ProfileDetails.Ready -> displayName
         else -> null
     }
 }
 
-fun ProfileTimelineDetails.getAvatarUrl(): String? {
+fun ProfileDetails.getAvatarUrl(): String? {
     return when (this) {
-        is ProfileTimelineDetails.Ready -> avatarUrl
+        is ProfileDetails.Ready -> avatarUrl
         else -> null
     }
 }
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetailsTest.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetailsTest.kt
index 4fa764adce..ffb59ba7d1 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetailsTest.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetailsTest.kt
@@ -18,23 +18,23 @@ private val aUserId = UserId(A_USER_ID)
 class ProfileTimelineDetailsTest {
     @Test
     fun `getDisambiguatedDisplayName of Unavailable should be equal to userId`() {
-        assertThat(ProfileTimelineDetails.Unavailable.getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
+        assertThat(ProfileDetails.Unavailable.getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
     }
 
     @Test
     fun `getDisambiguatedDisplayName of Error should be equal to userId`() {
-        assertThat(ProfileTimelineDetails.Error("An error").getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
+        assertThat(ProfileDetails.Error("An error").getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
     }
 
     @Test
     fun `getDisambiguatedDisplayName of Pending should be equal to userId`() {
-        assertThat(ProfileTimelineDetails.Pending.getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
+        assertThat(ProfileDetails.Pending.getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
     }
 
     @Test
     fun `getDisambiguatedDisplayName of Ready without display name should be equal to userId`() {
         assertThat(
-            ProfileTimelineDetails.Ready(
+            ProfileDetails.Ready(
                 displayName = null,
                 displayNameAmbiguous = false,
                 avatarUrl = null,
@@ -45,7 +45,7 @@ class ProfileTimelineDetailsTest {
     @Test
     fun `getDisambiguatedDisplayName of Ready with display name should be equal to display name`() {
         assertThat(
-            ProfileTimelineDetails.Ready(
+            ProfileDetails.Ready(
                 displayName = "Alice",
                 displayNameAmbiguous = false,
                 avatarUrl = null,
@@ -56,7 +56,7 @@ class ProfileTimelineDetailsTest {
     @Test
     fun `getDisambiguatedDisplayName of Ready with display name and ambiguous should be equal to display name with user id`() {
         assertThat(
-            ProfileTimelineDetails.Ready(
+            ProfileDetails.Ready(
                 displayName = "Alice",
                 displayNameAmbiguous = true,
                 avatarUrl = null,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt
deleted file mode 100644
index d03cf013a4..0000000000
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.room.message
-
-import io.element.android.libraries.matrix.api.room.message.RoomMessage
-import io.element.android.libraries.matrix.impl.timeline.item.event.EventTimelineItemMapper
-import org.matrix.rustcomponents.sdk.EventTimelineItem as RustEventTimelineItem
-
-class RoomMessageFactory(
-    private val eventTimelineItemMapper: EventTimelineItemMapper = EventTimelineItemMapper(),
-) {
-    fun create(eventTimelineItem: RustEventTimelineItem?): RoomMessage? {
-        eventTimelineItem ?: return null
-        val mappedTimelineItem = eventTimelineItemMapper.map(eventTimelineItem)
-        return RoomMessage(
-            eventId = mappedTimelineItem.eventId ?: return null,
-            event = mappedTimelineItem,
-            sender = mappedTimelineItem.sender,
-            originServerTs = mappedTimelineItem.timestamp,
-        )
-    }
-}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
index b0d545e2a1..4e342f3a48 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
@@ -40,7 +40,7 @@ internal class RoomListFactory(
     private val sessionCoroutineScope: CoroutineScope,
     private val analyticsService: AnalyticsService,
 ) {
-    private val roomSummaryDetailsFactory: RoomSummaryFactory = RoomSummaryFactory()
+    private val roomSummaryFactory: RoomSummaryFactory = RoomSummaryFactory()
 
     /**
      * Creates a room list that can be used to load more rooms and filter them dynamically.
@@ -55,7 +55,7 @@ internal class RoomListFactory(
         val loadingStateFlow: MutableStateFlow<RoomList.LoadingState> = MutableStateFlow(RoomList.LoadingState.NotLoaded)
         val filteredSummariesFlow = MutableSharedFlow<List<RoomSummary>>(replay = 1, extraBufferCapacity = 1)
         val summariesFlow = MutableSharedFlow<List<RoomSummary>>(replay = 1, extraBufferCapacity = 1)
-        val processor = RoomSummaryListProcessor(summariesFlow, innerRoomListService, coroutineContext, roomSummaryDetailsFactory)
+        val processor = RoomSummaryListProcessor(summariesFlow, innerRoomListService, coroutineContext, roomSummaryFactory)
         // Makes sure we don't miss any events
         val dynamicEvents = MutableSharedFlow<RoomListDynamicEvents>(replay = 100)
         val currentFilter = MutableStateFlow(initialFilter)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
index de4f09ada6..3d5efedd54 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
@@ -8,24 +8,44 @@
 
 package io.element.android.libraries.matrix.impl.roomlist
 
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.impl.room.RoomInfoMapper
-import io.element.android.libraries.matrix.impl.room.message.RoomMessageFactory
+import io.element.android.libraries.matrix.impl.timeline.item.event.TimelineEventContentMapper
+import io.element.android.libraries.matrix.impl.timeline.item.event.map
 import org.matrix.rustcomponents.sdk.Room
 import org.matrix.rustcomponents.sdk.use
+import org.matrix.rustcomponents.sdk.LatestEventValue as RustLatestEventValue
 
 class RoomSummaryFactory(
-    private val roomMessageFactory: RoomMessageFactory = RoomMessageFactory(),
+    private val contentMapper: TimelineEventContentMapper = TimelineEventContentMapper(),
     private val roomInfoMapper: RoomInfoMapper = RoomInfoMapper(),
 ) {
     suspend fun create(room: Room): RoomSummary {
         val roomInfo = room.roomInfo().let(roomInfoMapper::map)
-        val latestRoomMessage = room.latestEvent().use { event ->
-            roomMessageFactory.create(event)
+        val latestEvent = room.newLatestEvent().use { event ->
+            when (event) {
+                is RustLatestEventValue.None -> LatestEventValue.None
+                is RustLatestEventValue.Local -> LatestEventValue.Local(
+                    timestamp = event.timestamp.toLong(),
+                    content = contentMapper.map(event.content),
+                    isSending = event.isSending,
+                    senderId = UserId(event.sender),
+                    senderProfile = event.profile.map(),
+                )
+                is RustLatestEventValue.Remote -> LatestEventValue.Remote(
+                    timestamp = event.timestamp.toLong(),
+                    content = contentMapper.map(event.content),
+                    senderId = UserId(event.sender),
+                    senderProfile = event.profile.map(),
+                    isOwn = event.isOwn,
+                )
+            }
         }
         return RoomSummary(
             info = roomInfo,
-            lastMessage = latestRoomMessage,
+            latestEvent = latestEvent,
         )
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
index c99e2b5448..3f5a919139 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
@@ -24,7 +24,7 @@ class RoomSummaryListProcessor(
     private val roomSummaries: MutableSharedFlow<List<RoomSummary>>,
     private val roomListService: RoomListServiceInterface,
     private val coroutineContext: CoroutineContext,
-    private val roomSummaryDetailsFactory: RoomSummaryFactory = RoomSummaryFactory(),
+    private val roomSummaryFactory: RoomSummaryFactory,
 ) {
     private val mutex = Mutex()
 
@@ -103,7 +103,7 @@ class RoomSummaryListProcessor(
     }
 
     private suspend fun buildSummaryForRoomListEntry(entry: Room): RoomSummary {
-        return entry.use { roomSummaryDetailsFactory.create(room = it) }
+        return entry.use { roomSummaryFactory.create(room = it) }
     }
 
     private suspend fun buildRoomSummaryForIdentifier(identifier: String): RoomSummary? {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
index 68b8c7a8bb..6715169899 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
@@ -17,7 +17,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventReaction
 import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.ReactionSender
 import io.element.android.libraries.matrix.api.timeline.item.event.Receipt
 import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
@@ -64,12 +64,12 @@ class EventTimelineItemMapper(
     }
 }
 
-fun RustProfileDetails.map(): ProfileTimelineDetails {
+fun RustProfileDetails.map(): ProfileDetails {
     return when (this) {
-        RustProfileDetails.Pending -> ProfileTimelineDetails.Pending
-        RustProfileDetails.Unavailable -> ProfileTimelineDetails.Unavailable
-        is RustProfileDetails.Error -> ProfileTimelineDetails.Error(message)
-        is RustProfileDetails.Ready -> ProfileTimelineDetails.Ready(
+        RustProfileDetails.Pending -> ProfileDetails.Pending
+        RustProfileDetails.Unavailable -> ProfileDetails.Unavailable
+        is RustProfileDetails.Error -> ProfileDetails.Error(message)
+        is RustProfileDetails.Ready -> ProfileDetails.Ready(
             displayName = displayName,
             displayNameAmbiguous = displayNameAmbiguous,
             avatarUrl = avatarUrl
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt
index 9c84ccc559..eaa62abb65 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt
@@ -192,6 +192,6 @@ class RoomSummaryListProcessorTest {
         summaries,
         FakeFfiRoomListService(),
         coroutineContext = StandardTestDispatcher(testScheduler),
-        roomSummaryDetailsFactory = RoomSummaryFactory(),
+        roomSummaryFactory = RoomSummaryFactory(),
     )
 }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/LatestEventValueFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/LatestEventValueFixture.kt
new file mode 100644
index 0000000000..32d6cc927c
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/LatestEventValueFixture.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.test.room
+
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.timeline.aMessageContent
+import io.element.android.libraries.matrix.test.timeline.aProfileDetails
+
+fun aRemoteLatestEvent(
+    content: EventContent = aMessageContent(),
+    timestamp: Long = 0L,
+    isOwn: Boolean = false,
+    senderId: UserId = A_USER_ID,
+    senderProfile: ProfileDetails = aProfileDetails(),
+): LatestEventValue.Remote {
+    return LatestEventValue.Remote(
+        timestamp = timestamp,
+        content = content,
+        senderId = senderId,
+        senderProfile = senderProfile,
+        isOwn = isOwn,
+    )
+}
+
+fun aLocalLatestEvent(
+    content: EventContent = aMessageContent(),
+    timestamp: Long = 0L,
+    isSending: Boolean = false,
+    senderId: UserId = A_USER_ID,
+    senderProfile: ProfileDetails = aProfileDetails(),
+): LatestEventValue.Local {
+    return LatestEventValue.Local(
+        timestamp = timestamp,
+        content = content,
+        senderId = senderId,
+        senderProfile = senderProfile,
+        isSending = isSending,
+    )
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
index 45715cbd27..8568e3c916 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
@@ -18,28 +18,24 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.room.join.JoinRule
-import io.element.android.libraries.matrix.api.room.message.RoomMessage
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.libraries.matrix.api.room.tombstone.SuccessorRoom
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 import io.element.android.libraries.matrix.api.user.MatrixUser
-import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_ROOM_RAW_NAME
 import io.element.android.libraries.matrix.test.A_ROOM_TOPIC
-import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
 
 fun aRoomSummary(
     info: RoomInfo = aRoomInfo(),
-    lastMessage: RoomMessage? = aRoomMessage(),
+    latestEventValue: LatestEventValue = aRemoteLatestEvent(),
 ) = RoomSummary(
     info = info,
-    lastMessage = lastMessage,
+    latestEvent = latestEventValue,
 )
 
 fun aRoomSummary(
@@ -79,7 +75,7 @@ fun aRoomSummary(
     numUnreadNotifications: Long = 0,
     numUnreadMentions: Long = 0,
     historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
-    lastMessage: RoomMessage? = aRoomMessage(),
+    latestEvent: LatestEventValue = aRemoteLatestEvent(),
     roomVersion: String? = "11",
     privilegedCreatorRole: Boolean = false,
 ) = RoomSummary(
@@ -120,17 +116,5 @@ fun aRoomSummary(
         roomVersion = roomVersion,
         privilegedCreatorRole = privilegedCreatorRole,
     ),
-    lastMessage = lastMessage,
-)
-
-fun aRoomMessage(
-    eventId: EventId = AN_EVENT_ID,
-    event: EventTimelineItem = anEventTimelineItem(),
-    userId: UserId = A_USER_ID,
-    timestamp: Long = 0L,
-) = RoomMessage(
-    eventId = eventId,
-    event = event,
-    sender = userId,
-    originServerTs = timestamp,
+    latestEvent = latestEvent,
 )
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/TimelineFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/TimelineFixture.kt
index e2e6192363..c8d8ff6015 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/TimelineFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/TimelineFixture.kt
@@ -27,7 +27,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.Receipt
 import io.element.android.libraries.matrix.api.timeline.item.event.SendHandleProvider
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerContent
@@ -53,7 +53,7 @@ fun anEventTimelineItem(
     reactions: ImmutableList<EventReaction> = persistentListOf(),
     receipts: ImmutableList<Receipt> = persistentListOf(),
     sender: UserId = A_USER_ID,
-    senderProfile: ProfileTimelineDetails = aProfileTimelineDetails(),
+    senderProfile: ProfileDetails = aProfileDetails(),
     timestamp: Long = 0L,
     content: EventContent = aProfileChangeMessageContent(),
     debugInfoProvider: TimelineItemDebugInfoProvider = TimelineItemDebugInfoProvider { aTimelineItemDebugInfo() },
@@ -79,11 +79,11 @@ fun anEventTimelineItem(
     sendHandleProvider = sendHandleProvider,
 )
 
-fun aProfileTimelineDetails(
+fun aProfileDetails(
     displayName: String? = A_USER_NAME,
     displayNameAmbiguous: Boolean = false,
     avatarUrl: String? = null
-): ProfileTimelineDetails = ProfileTimelineDetails.Ready(
+): ProfileDetails = ProfileDetails.Ready(
     displayName = displayName,
     displayNameAmbiguous = displayNameAmbiguous,
     avatarUrl = avatarUrl,
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetails.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetails.kt
index 0d12866e8c..3179c748ea 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetails.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetails.kt
@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerContent
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.ui.messages.toPlainText
@@ -25,7 +25,7 @@ sealed interface InReplyToDetails {
     data class Ready(
         val eventId: EventId,
         val senderId: UserId,
-        val senderProfile: ProfileTimelineDetails,
+        val senderProfile: ProfileDetails,
         val eventContent: EventContent?,
         val textContent: String?,
     ) : InReplyToDetails
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsProvider.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsProvider.kt
index 20fb717d7d..ac545ed8ea 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsProvider.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsProvider.kt
@@ -24,7 +24,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageConten
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
@@ -161,7 +161,7 @@ fun aProfileTimelineDetailsReady(
     displayName: String? = "Sender",
     displayNameAmbiguous: Boolean = false,
     avatarUrl: String? = null,
-) = ProfileTimelineDetails.Ready(
+) = ProfileDetails.Ready(
     displayName = displayName,
     displayNameAmbiguous = displayNameAmbiguous,
     avatarUrl = avatarUrl,
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToView.kt
index 6746c8ffdb..fc5d6577c7 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToView.kt
@@ -42,7 +42,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnail
 import io.element.android.libraries.matrix.ui.messages.sender.SenderName
@@ -74,7 +74,7 @@ fun InReplyToView(
 @Composable
 private fun ReplyToReadyContent(
     senderId: UserId,
-    senderProfile: ProfileTimelineDetails,
+    senderProfile: ProfileDetails,
     metadata: InReplyToMetadata?,
     modifier: Modifier = Modifier,
 ) {
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderName.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderName.kt
index 582223fee6..cdca0937c1 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderName.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderName.kt
@@ -23,13 +23,13 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 
 // https://www.figma.com/file/Ni6Ii8YKtmXCKYNE90cC67/Timeline-(new)?type=design&node-id=917-80169&mode=design&t=A0CJCBbMqR8NOwUQ-0
 @Composable
 fun SenderName(
     senderId: UserId,
-    senderProfile: ProfileTimelineDetails,
+    senderProfile: ProfileDetails,
     senderNameMode: SenderNameMode,
     modifier: Modifier = Modifier,
 ) {
@@ -39,12 +39,12 @@ fun SenderName(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         when (senderProfile) {
-            is ProfileTimelineDetails.Error,
-            ProfileTimelineDetails.Pending,
-            ProfileTimelineDetails.Unavailable -> {
+            is ProfileDetails.Error,
+            ProfileDetails.Pending,
+            ProfileDetails.Unavailable -> {
                 MainText(text = senderId.value, mode = senderNameMode)
             }
-            is ProfileTimelineDetails.Ready -> {
+            is ProfileDetails.Ready -> {
                 val displayName = senderProfile.displayName
                 if (displayName.isNullOrEmpty()) {
                     MainText(text = senderId.value, mode = senderNameMode)
@@ -121,7 +121,7 @@ internal fun SenderNamePreview(
 ) = ElementPreview {
     SenderName(
         senderId = senderNameData.userId,
-        senderProfile = senderNameData.profileTimelineDetails,
+        senderProfile = senderNameData.profileDetails,
         senderNameMode = senderNameData.senderNameMode,
     )
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataProvider.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataProvider.kt
index af9366c474..96ad91b869 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataProvider.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataProvider.kt
@@ -11,11 +11,11 @@ package io.element.android.libraries.matrix.ui.messages.sender
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 
 data class SenderNameData(
     val userId: UserId,
-    val profileTimelineDetails: ProfileTimelineDetails,
+    val profileDetails: ProfileDetails,
     val senderNameMode: SenderNameMode,
 )
 
@@ -38,7 +38,7 @@ open class SenderNameDataProvider : PreviewParameterProvider<SenderNameData> {
                     SenderNameData(
                         senderNameMode = senderNameMode,
                         userId = UserId("@alice:${senderNameMode.javaClass.simpleName.lowercase()}"),
-                        profileTimelineDetails = ProfileTimelineDetails.Unavailable,
+                        profileDetails = ProfileDetails.Unavailable,
                     ),
                 )
             }
@@ -49,7 +49,7 @@ private fun aSenderNameData(
     displayNameAmbiguous: Boolean = false,
 ) = SenderNameData(
     userId = UserId("@alice:${senderNameMode.javaClass.simpleName.lowercase()}"),
-    profileTimelineDetails = ProfileTimelineDetails.Ready(
+    profileDetails = ProfileDetails.Ready(
         displayName = "Alice ${senderNameMode.javaClass.simpleName}",
         displayNameAmbiguous = displayNameAmbiguous,
         avatarUrl = null
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt
index 6bbcf9127c..9507a30763 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt
@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageTy
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
-import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
+import io.element.android.libraries.matrix.test.timeline.aProfileDetails
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import org.junit.Test
 
@@ -47,7 +47,7 @@ class InReplyToDetailTest {
         val inReplyTo = InReplyTo.Ready(
             eventId = AN_EVENT_ID,
             senderId = A_USER_ID,
-            senderProfile = aProfileTimelineDetails(),
+            senderProfile = aProfileDetails(),
             content = aRoomMembershipContent(
                 userId = A_USER_ID,
                 change = MembershipChange.INVITED,
@@ -65,7 +65,7 @@ class InReplyToDetailTest {
         val inReplyTo = InReplyTo.Ready(
             eventId = AN_EVENT_ID,
             senderId = A_USER_ID,
-            senderProfile = aProfileTimelineDetails(),
+            senderProfile = aProfileDetails(),
             content = MessageContent(
                 body = "**Hello!**",
                 inReplyTo = null,
@@ -90,7 +90,7 @@ class InReplyToDetailTest {
         val inReplyTo = InReplyTo.Ready(
             eventId = AN_EVENT_ID,
             senderId = A_USER_ID,
-            senderProfile = aProfileTimelineDetails(),
+            senderProfile = aProfileDetails(),
             content = MessageContent(
                 body = "**Hello!**",
                 inReplyTo = null,
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt
index 67c3596af3..e7cae1151b 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt
@@ -29,7 +29,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherState
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerContent
@@ -42,7 +42,7 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.media.aMediaSource
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
 import io.element.android.libraries.matrix.test.timeline.aPollContent
-import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
+import io.element.android.libraries.matrix.test.timeline.aProfileDetails
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
@@ -549,7 +549,7 @@ class InReplyToMetadataKtTest {
 private fun anInReplyToDetailsReady(
     eventId: EventId = AN_EVENT_ID,
     senderId: UserId = A_USER_ID,
-    senderProfile: ProfileTimelineDetails = aProfileTimelineDetails(),
+    senderProfile: ProfileDetails = aProfileDetails(),
     eventContent: EventContent? = aMessageContent(),
     textContent: String? = "textContent",
 ) = InReplyToDetails.Ready(

From 539aa35eeb496e5698a89dfc7dd2583fb6837265 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 11:57:22 +0100
Subject: [PATCH 064/113] fix(deps): update android.gradle.plugin to v8.13.1
 (#5260)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(deps): update android.gradle.plugin to v8.13.1

* Remove warning about AGP 8.12.x+

* Fix proguard-related code deprecations, use the new `optimization` API

* Workaround issues related to Android lint not being able to check these complex methods with kotlin contracts

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
---
 app/build.gradle.kts                          | 18 ++++++---------
 app/proguard-rules.pro                        | 23 +++++++++++++++++--
 gradle.properties                             |  3 +++
 gradle/libs.versions.toml                     |  3 +--
 .../libraries/architecture/AsyncAction.kt     |  8 +++----
 .../libraries/architecture/AsyncData.kt       | 11 ++++-----
 6 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4026888ee2..2464155cb4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -129,12 +129,12 @@ android {
             )
             signingConfig = signingConfigs.getByName("debug")
 
-            postprocessing {
-                isRemoveUnusedCode = true
-                isObfuscate = false
-                isOptimizeCode = true
-                isRemoveUnusedResources = true
-                proguardFiles("proguard-rules.pro")
+            optimization {
+                enable = true
+                keepRules {
+                    files.add(File(projectDir, "proguard-rules.pro"))
+                    files.add(getDefaultProguardFile("proguard-android-optimize.txt"))
+                }
             }
         }
 
@@ -152,10 +152,6 @@ android {
             matchingFallbacks += listOf("release")
             signingConfig = signingConfigs.getByName("nightly")
 
-            postprocessing {
-                initWith(release.postprocessing)
-            }
-
             firebaseAppDistribution {
                 artifactType = "APK"
                 // We upload the universal APK to fix this error:
@@ -341,7 +337,7 @@ fun Project.configureLicensesTasks(reportingExtension: ReportingExtension) {
                     it.toString()
                 }
             }
-            val artifactsFile = reportingExtension.file("licensee/android$capitalizedVariantName/artifacts.json")
+            val artifactsFile = reportingExtension.baseDirectory.file("licensee/android$capitalizedVariantName/artifacts.json")
 
             val copyArtifactsTask =
                 project.tasks.register<AssetCopyTask>("copy${capitalizedVariantName}LicenseeReportToAssets") {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index c55b1bf1c2..96109425fa 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -41,8 +41,6 @@
     static int windowAttachCount(android.view.View);
 }
 
--keep class io.element.android.x.di.** { *; }
-
 
 # Keep LogSessionId class and related classes (https://github.com/androidx/media/issues/2535)
 -keep class android.media.metrics.LogSessionId { *; }
@@ -51,3 +49,24 @@
 # Keep Media3 classes that use reflection (https://github.com/androidx/media/issues/2535)
 -keep class androidx.media3.** { *; }
 -dontwarn android.media.metrics.**
+
+# New rules after AGP 8.13.1 upgrade
+-dontwarn androidx.window.extensions.WindowExtensions
+-dontwarn androidx.window.extensions.WindowExtensionsProvider
+-dontwarn androidx.window.extensions.area.ExtensionWindowAreaPresentation
+-dontwarn androidx.window.extensions.layout.DisplayFeature
+-dontwarn androidx.window.extensions.layout.FoldingFeature
+-dontwarn androidx.window.extensions.layout.WindowLayoutComponent
+-dontwarn androidx.window.extensions.layout.WindowLayoutInfo
+-dontwarn androidx.window.sidecar.SidecarDeviceState
+-dontwarn androidx.window.sidecar.SidecarDisplayFeature
+-dontwarn androidx.window.sidecar.SidecarInterface$SidecarCallback
+-dontwarn androidx.window.sidecar.SidecarInterface
+-dontwarn androidx.window.sidecar.SidecarProvider
+-dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
+
+# Also needed after AGP 8.13.1 upgrade, it seems like proguard is now more aggressive on removing unused code
+-keep class org.matrix.rustcomponents.sdk.** { *;}
+-keep class uniffi.** { *;}
+-keep class io.element.android.x.di.** { *; }
+-keepnames class io.element.android.x.**
diff --git a/gradle.properties b/gradle.properties
index 5a73e519ad..ce03899940 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -59,3 +59,6 @@ detekt.use.worker.api=true
 # Let test include roborazzi verification
 # https://github.com/takahirom/roborazzi?tab=readme-ov-file#roborazzitest
 roborazzi.test.verify=true
+
+# Needed after enabling proguard on AGP 8.13.1
+android.r8.gradual.support=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 585220fb8d..c0bb446e87 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,8 +3,7 @@
 
 [versions]
 # Project
-# We cannot use 8.12.+ since it breaks F-Droid build (see https://github.com/element-hq/element-x-android/issues/3420#issuecomment-3199571010)
-android_gradle_plugin = "8.11.1"
+android_gradle_plugin = "8.13.1"
 # When updateing this, please also update the version in the file ./idea/kotlinc.xml
 kotlin = "2.2.20"
 kotlinpoet = "2.2.0"
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt
index db91316905..bb833162e3 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt
@@ -155,16 +155,16 @@ inline fun <T> MutableState<AsyncAction<T>>.runUpdatingStateNoSuccess(
  * @param resultBlock a suspending function that returns a [Result].
  * @return the [Result] returned by [resultBlock].
  */
-@OptIn(ExperimentalContracts::class)
 @Suppress("REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE")
 suspend inline fun <T> runUpdatingState(
     state: MutableState<AsyncAction<T>>,
     errorTransform: (Throwable) -> Throwable = { it },
     resultBlock: suspend () -> Result<T>,
 ): Result<T> {
-    contract {
-        callsInPlace(resultBlock, InvocationKind.EXACTLY_ONCE)
-    }
+    // Restore when the issue with contracts and AGP 8.13.x is fixed
+//    contract {
+//        callsInPlace(resultBlock, InvocationKind.EXACTLY_ONCE)
+//    }
     state.value = AsyncAction.Loading
     return try {
         resultBlock()
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt
index 118addf1fe..734ff16692 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt
@@ -11,9 +11,6 @@ package io.element.android.libraries.architecture
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
 import io.element.android.libraries.core.extensions.runCatchingExceptions
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
 
 /**
  * Sealed type that allows to model an asynchronous operation.
@@ -134,16 +131,16 @@ suspend inline fun <T> MutableState<AsyncData<T>>.runUpdatingState(
  * @param resultBlock a suspending function that returns a [Result].
  * @return the [Result] returned by [resultBlock].
  */
-@OptIn(ExperimentalContracts::class)
 @Suppress("REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE")
 suspend inline fun <T> runUpdatingState(
     state: MutableState<AsyncData<T>>,
     errorTransform: (Throwable) -> Throwable = { it },
     resultBlock: suspend () -> Result<T>,
 ): Result<T> {
-    contract {
-        callsInPlace(resultBlock, InvocationKind.EXACTLY_ONCE)
-    }
+    // Restore when the issue with contracts and AGP 8.13.x is fixed
+//    contract {
+//        callsInPlace(resultBlock, InvocationKind.EXACTLY_ONCE)
+//    }
     val prevData = state.value.dataOrNull()
     state.value = AsyncData.Loading(prevData = prevData)
     return resultBlock().fold(

From c6ba2f5d10e87ea611d0678e1f2ddbd2eee7aafb Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 18 Nov 2025 21:19:08 +0100
Subject: [PATCH 065/113] change(security and privacy) : extract code to a
 separate module

---
 features/roomdetails/impl/build.gradle.kts    |  2 +
 .../roomdetails/impl/RoomDetailsFlowNode.kt   |  5 +-
 .../roomdetails/impl/RoomDetailsPresenter.kt  |  2 +-
 .../impl/DefaultRoomDetailsEntryPointTest.kt  |  2 +
 .../securityandprivacy/api/build.gradle.kts   | 21 ++++++++
 .../api/SecurityAndPrivacyEntryPoint.kt       | 13 +++++
 .../api}/SecurityAndPrivacyPermissions.kt     |  4 +-
 .../securityandprivacy/impl/build.gradle.kts  | 48 +++++++++++++++++++
 .../DefaultSecurityAndPrivacyEntryPoint.kt    | 23 +++++++++
 .../impl}/SecurityAndPrivacyFlowNode.kt       |  5 +-
 .../impl}/SecurityAndPrivacyNavigator.kt      |  2 +-
 .../editroomaddress/EditRoomAddressEvents.kt  |  2 +-
 .../editroomaddress/EditRoomAddressNode.kt    |  4 +-
 .../EditRoomAddressPresenter.kt               |  4 +-
 .../editroomaddress/EditRoomAddressState.kt   |  2 +-
 .../EditRoomAddressStateProvider.kt           |  2 +-
 .../editroomaddress/EditRoomAddressView.kt    |  4 +-
 .../impl}/editroomaddress/RoomAlias.kt        |  2 +-
 .../impl/root}/SecurityAndPrivacyEvents.kt    |  2 +-
 .../impl/root}/SecurityAndPrivacyNode.kt      |  3 +-
 .../impl/root}/SecurityAndPrivacyPresenter.kt |  7 +--
 .../impl/root}/SecurityAndPrivacyState.kt     |  4 +-
 .../root}/SecurityAndPrivacyStateProvider.kt  |  4 +-
 .../impl/root}/SecurityAndPrivacyView.kt      |  6 +--
 .../src/main/res/values-be/translations.xml   |  5 ++
 .../src/main/res/values-bg/translations.xml   | 23 +++++++++
 .../src/main/res/values-cs/translations.xml   | 38 +++++++++++++++
 .../src/main/res/values-cy/translations.xml   | 38 +++++++++++++++
 .../src/main/res/values-da/translations.xml   | 36 ++++++++++++++
 .../src/main/res/values-de/translations.xml   | 38 +++++++++++++++
 .../src/main/res/values-el/translations.xml   | 37 ++++++++++++++
 .../src/main/res/values-es/translations.xml   | 36 ++++++++++++++
 .../src/main/res/values-et/translations.xml   | 40 ++++++++++++++++
 .../src/main/res/values-eu/translations.xml   | 22 +++++++++
 .../src/main/res/values-fa/translations.xml   | 22 +++++++++
 .../src/main/res/values-fi/translations.xml   | 38 +++++++++++++++
 .../src/main/res/values-fr/translations.xml   | 38 +++++++++++++++
 .../src/main/res/values-hu/translations.xml   | 40 ++++++++++++++++
 .../src/main/res/values-in/translations.xml   | 35 ++++++++++++++
 .../src/main/res/values-it/translations.xml   | 37 ++++++++++++++
 .../src/main/res/values-ko/translations.xml   | 36 ++++++++++++++
 .../src/main/res/values-nb/translations.xml   | 36 ++++++++++++++
 .../src/main/res/values-nl/translations.xml   |  5 ++
 .../src/main/res/values-pl/translations.xml   | 38 +++++++++++++++
 .../main/res/values-pt-rBR/translations.xml   | 36 ++++++++++++++
 .../src/main/res/values-pt/translations.xml   | 38 +++++++++++++++
 .../src/main/res/values-ro/translations.xml   | 36 ++++++++++++++
 .../src/main/res/values-ru/translations.xml   | 40 ++++++++++++++++
 .../src/main/res/values-sk/translations.xml   | 38 +++++++++++++++
 .../src/main/res/values-sv/translations.xml   | 37 ++++++++++++++
 .../src/main/res/values-tr/translations.xml   | 38 +++++++++++++++
 .../src/main/res/values-uk/translations.xml   | 38 +++++++++++++++
 .../src/main/res/values-uz/translations.xml   |  7 +++
 .../main/res/values-zh-rTW/translations.xml   | 38 +++++++++++++++
 .../src/main/res/values-zh/translations.xml   | 38 +++++++++++++++
 .../impl/src/main/res/values/localazy.xml     | 40 ++++++++++++++++
 .../impl}/FakeSecurityAndPrivacyNavigator.kt  |  2 +-
 .../impl}/SecurityAndPrivacyPresenterTest.kt  |  6 ++-
 .../impl}/SecurityAndPrivacyViewTest.kt       | 10 +++-
 .../EditRoomAddressPresenterTest.kt}          | 46 ++++++++++--------
 .../EditRoomAddressViewTest.kt}               |  4 +-
 .../securityandprivacy/test/build.gradle.kts  | 22 +++++++++
 .../test/FakeSecurityAndPrivacyEntryPoint.kt  | 19 ++++++++
 tools/localazy/config.json                    |  7 +++
 64 files changed, 1296 insertions(+), 55 deletions(-)
 create mode 100644 features/securityandprivacy/api/build.gradle.kts
 create mode 100644 features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyEntryPoint.kt
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions => securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api}/SecurityAndPrivacyPermissions.kt (89%)
 create mode 100644 features/securityandprivacy/impl/build.gradle.kts
 create mode 100644 features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/DefaultSecurityAndPrivacyEntryPoint.kt
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl}/SecurityAndPrivacyFlowNode.kt (89%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl}/SecurityAndPrivacyNavigator.kt (92%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl}/editroomaddress/EditRoomAddressEvents.kt (83%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl}/editroomaddress/EditRoomAddressNode.kt (87%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl}/editroomaddress/EditRoomAddressPresenter.kt (97%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl}/editroomaddress/EditRoomAddressState.kt (88%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl}/editroomaddress/EditRoomAddressStateProvider.kt (94%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl}/editroomaddress/EditRoomAddressView.kt (96%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl}/editroomaddress/RoomAlias.kt (87%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root}/SecurityAndPrivacyEvents.kt (92%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root}/SecurityAndPrivacyNode.kt (89%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root}/SecurityAndPrivacyPresenter.kt (97%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root}/SecurityAndPrivacyState.kt (93%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root}/SecurityAndPrivacyStateProvider.kt (95%)
 rename features/{roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root}/SecurityAndPrivacyView.kt (98%)
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-be/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-bg/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-cs/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-cy/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-da/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-de/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-el/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-es/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-et/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-eu/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-fa/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-fi/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-fr/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-hu/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-in/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-it/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-ko/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-nb/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-nl/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-pl/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-pt/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-ro/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-sk/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-sv/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-tr/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-uk/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-uz/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values-zh/translations.xml
 create mode 100644 features/securityandprivacy/impl/src/main/res/values/localazy.xml
 rename features/{roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl}/FakeSecurityAndPrivacyNavigator.kt (90%)
 rename features/{roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl}/SecurityAndPrivacyPresenterTest.kt (97%)
 rename features/{roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy => securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl}/SecurityAndPrivacyViewTest.kt (90%)
 rename features/{roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt => securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenterTest.kt} (93%)
 rename features/{roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressViewTest.kt => securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt} (97%)
 create mode 100644 features/securityandprivacy/test/build.gradle.kts
 create mode 100644 features/securityandprivacy/test/src/main/kotlin/io/element/android/features/securityandprivacy/test/FakeSecurityAndPrivacyEntryPoint.kt

diff --git a/features/roomdetails/impl/build.gradle.kts b/features/roomdetails/impl/build.gradle.kts
index acf80c0eca..4ca260be16 100644
--- a/features/roomdetails/impl/build.gradle.kts
+++ b/features/roomdetails/impl/build.gradle.kts
@@ -58,6 +58,7 @@ dependencies {
     implementation(projects.features.reportroom.api)
     implementation(projects.features.roommembermoderation.api)
     implementation(projects.features.rolesandpermissions.api)
+    implementation(projects.features.securityandprivacy.api)
     implementation(projects.features.invitepeople.api)
 
     testCommonDependencies(libs, true)
@@ -71,6 +72,7 @@ dependencies {
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.features.call.test)
     testImplementation(projects.features.rolesandpermissions.test)
+    testImplementation(projects.features.securityandprivacy.test)
     testImplementation(projects.features.knockrequests.test)
     testImplementation(projects.features.messages.test)
     testImplementation(projects.features.poll.test)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
index fe6c3646d9..c8ef60513c 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
@@ -40,7 +40,7 @@ import io.element.android.features.roomdetails.impl.invite.RoomInviteMembersNode
 import io.element.android.features.roomdetails.impl.members.RoomMemberListNode
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsNode
 import io.element.android.features.roomdetails.impl.notificationsettings.RoomNotificationSettingsNode
-import io.element.android.features.roomdetails.impl.securityandprivacy.SecurityAndPrivacyFlowNode
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
 import io.element.android.features.userprofile.shared.UserProfileNodeHelper
 import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
 import io.element.android.libraries.architecture.BackstackWithOverlayBox
@@ -84,6 +84,7 @@ class RoomDetailsFlowNode(
     private val reportRoomEntryPoint: ReportRoomEntryPoint,
     private val changeRoomMemberRolesEntryPoint: ChangeRoomMemberRolesEntryPoint,
     private val rolesAndPermissionsEntryPoint: RolesAndPermissionsEntryPoint,
+    private val securityAndPrivacyEntryPoint: SecurityAndPrivacyEntryPoint,
 ) : BaseFlowNode<RoomDetailsFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = plugins.filterIsInstance<RoomDetailsEntryPoint.Params>().first().initialElement.toNavTarget(),
@@ -381,7 +382,7 @@ class RoomDetailsFlowNode(
                 knockRequestsListEntryPoint.createNode(this, buildContext)
             }
             NavTarget.SecurityAndPrivacy -> {
-                createNode<SecurityAndPrivacyFlowNode>(buildContext)
+                securityAndPrivacyEntryPoint.createNode(this, buildContext)
             }
             is NavTarget.VerifyUser -> {
                 val params = OutgoingVerificationEntryPoint.Params(
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
index 232f4d626c..95c4f1e9e2 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
@@ -22,7 +22,7 @@ import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.roomcall.api.RoomCallState
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsPresenter
-import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.securityAndPrivacyPermissionsAsState
+import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissionsAsState
 import io.element.android.libraries.androidutils.clipboard.ClipboardHelper
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt
index 2b336121da..cd2af112a7 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt
@@ -20,6 +20,7 @@ import io.element.android.features.messages.test.FakeMessagesEntryPoint
 import io.element.android.features.poll.test.history.FakePollHistoryEntryPoint
 import io.element.android.features.reportroom.test.FakeReportRoomEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
+import io.element.android.features.securityandprivacy.test.FakeSecurityAndPrivacyEntryPoint
 import io.element.android.features.verifysession.test.FakeOutgoingVerificationEntryPoint
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -61,6 +62,7 @@ class DefaultRoomDetailsEntryPointTest {
                 reportRoomEntryPoint = FakeReportRoomEntryPoint(),
                 changeRoomMemberRolesEntryPoint = FakeChangeRoomMemberRolesEntryPoint(),
                 rolesAndPermissionsEntryPoint = FakeRolesAndPermissionsEntryPoint(),
+                securityAndPrivacyEntryPoint = FakeSecurityAndPrivacyEntryPoint(),
             )
         }
         val callback = object : RoomDetailsEntryPoint.Callback {
diff --git a/features/securityandprivacy/api/build.gradle.kts b/features/securityandprivacy/api/build.gradle.kts
new file mode 100644
index 0000000000..4260bea661
--- /dev/null
+++ b/features/securityandprivacy/api/build.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.securityandprivacy.api"
+}
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.matrix.api)
+}
diff --git a/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyEntryPoint.kt b/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyEntryPoint.kt
new file mode 100644
index 0000000000..2c7c1cfd41
--- /dev/null
+++ b/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyEntryPoint.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securityandprivacy.api
+
+import io.element.android.libraries.architecture.SimpleFeatureEntryPoint
+
+fun interface SecurityAndPrivacyEntryPoint : SimpleFeatureEntryPoint
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions/SecurityAndPrivacyPermissions.kt b/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyPermissions.kt
similarity index 89%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions/SecurityAndPrivacyPermissions.kt
rename to features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyPermissions.kt
index e4b14c923a..82ab30581e 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions/SecurityAndPrivacyPermissions.kt
+++ b/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyPermissions.kt
@@ -6,12 +6,12 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy.permissions
+package io.element.android.features.securityandprivacy.api
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.produceState
-import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.SecurityAndPrivacyPermissions.Companion.DEFAULT
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyPermissions.Companion.DEFAULT
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.powerlevels.canSendState
diff --git a/features/securityandprivacy/impl/build.gradle.kts b/features/securityandprivacy/impl/build.gradle.kts
new file mode 100644
index 0000000000..5a83cebd8c
--- /dev/null
+++ b/features/securityandprivacy/impl/build.gradle.kts
@@ -0,0 +1,48 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.securityandprivacy.impl"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
+
+setupDependencyInjection()
+
+dependencies {
+    api(projects.features.securityandprivacy.api)
+    implementation(projects.appnav)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.matrix.api)
+    // For test fixtures used in previews
+    implementation(projects.libraries.previewutils)
+    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.uiStrings)
+    implementation(projects.services.analytics.api)
+    implementation(projects.libraries.featureflag.api)
+
+    testCommonDependencies(libs, true)
+    testImplementation(projects.services.analytics.test)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.libraries.testtags)
+}
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/DefaultSecurityAndPrivacyEntryPoint.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/DefaultSecurityAndPrivacyEntryPoint.kt
new file mode 100644
index 0000000000..2d01ed4a83
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/DefaultSecurityAndPrivacyEntryPoint.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securityandprivacy.impl
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.di.RoomScope
+
+@ContributesBinding(RoomScope::class)
+class DefaultSecurityAndPrivacyEntryPoint : SecurityAndPrivacyEntryPoint {
+    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+        return parentNode.createNode<SecurityAndPrivacyFlowNode>(buildContext)
+    }
+}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyFlowNode.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNode.kt
similarity index 89%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyFlowNode.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNode.kt
index 751ef01403..5dbc8dbb45 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyFlowNode.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNode.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl
 
 import android.os.Parcelable
 import androidx.compose.runtime.Composable
@@ -18,7 +18,8 @@ import com.bumble.appyx.navmodel.backstack.BackStack
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
-import io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress.EditRoomAddressNode
+import io.element.android.features.securityandprivacy.impl.editroomaddress.EditRoomAddressNode
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.createNode
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNavigator.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyNavigator.kt
similarity index 92%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNavigator.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyNavigator.kt
index 5a3857ee5b..3b71868bbf 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNavigator.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyNavigator.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl
 
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.navmodel.backstack.BackStack
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressEvents.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressEvents.kt
similarity index 83%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressEvents.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressEvents.kt
index a21eaa1db3..e42236d31c 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressEvents.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressEvents.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 sealed interface EditRoomAddressEvents {
     data object Save : EditRoomAddressEvents
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressNode.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressNode.kt
similarity index 87%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressNode.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressNode.kt
index 415654aa35..ba92cfb6d0 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressNode.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressNode.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -17,7 +17,7 @@ import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
-import io.element.android.features.roomdetails.impl.securityandprivacy.SecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
 import io.element.android.libraries.di.RoomScope
 
 @ContributesNode(RoomScope::class)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenter.kt
similarity index 97%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenter.kt
index 79f9d21b13..8dcea0d880 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenter.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
@@ -20,7 +20,7 @@ import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
-import io.element.android.features.roomdetails.impl.securityandprivacy.SecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressState.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressState.kt
similarity index 88%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressState.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressState.kt
index 3aabf06f0c..89315ab8ce 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressState.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressState.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidity
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressStateProvider.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressStateProvider.kt
similarity index 94%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressStateProvider.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressStateProvider.kt
index 22b0021416..7b82175bb7 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressStateProvider.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressStateProvider.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressView.kt
similarity index 96%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressView.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressView.kt
index 5a893c60da..da18b963fa 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressView.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.consumeWindowInsets
@@ -21,7 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import io.element.android.features.roomdetails.impl.R
+import io.element.android.features.securityandprivacy.impl.R
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 import io.element.android.libraries.designsystem.components.button.BackButton
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/RoomAlias.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/RoomAlias.kt
similarity index 87%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/RoomAlias.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/RoomAlias.kt
index 0624939177..f9ae4bf958 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/RoomAlias.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/RoomAlias.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import io.element.android.libraries.matrix.api.core.RoomAlias
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyEvents.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt
similarity index 92%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyEvents.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt
index f5afb0c335..8119ddb0c4 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyEvents.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl.root
 
 sealed interface SecurityAndPrivacyEvents {
     data object EditRoomAddress : SecurityAndPrivacyEvents
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNode.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyNode.kt
similarity index 89%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNode.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyNode.kt
index 219e4b092f..87ba27cb02 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNode.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyNode.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl.root
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -17,6 +17,7 @@ import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
 import io.element.android.libraries.di.RoomScope
 
 @ContributesNode(RoomScope::class)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
similarity index 97%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenter.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
index ae093c6bc8..7c0c04f8c3 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl.root
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -21,8 +21,9 @@ import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
-import io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress.matchesServer
-import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.securityAndPrivacyPermissionsAsState
+import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.editroomaddress.matchesServer
+import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissionsAsState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyState.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
similarity index 93%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyState.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
index cfba61341e..be9c24dc65 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyState.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
@@ -6,9 +6,9 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl.root
 
-import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.SecurityAndPrivacyPermissions
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyPermissions
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import kotlinx.collections.immutable.toImmutableSet
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyStateProvider.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
similarity index 95%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyStateProvider.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
index 135d6c48d6..c13fc36d34 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyStateProvider.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
@@ -6,10 +6,10 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl.root
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.SecurityAndPrivacyPermissions
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyPermissions
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
similarity index 98%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyView.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
index b32654ccb1..7eeabba3c0 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl.root
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -30,7 +30,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
-import io.element.android.features.roomdetails.impl.R
+import io.element.android.features.securityandprivacy.impl.R
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
@@ -143,7 +143,7 @@ private fun SecurityAndPrivacyToolbar(
 ) {
     TopAppBar(
         modifier = modifier,
-        titleStr = stringResource(R.string.screen_room_details_security_and_privacy_title),
+        titleStr = stringResource(R.string.screen_security_and_privacy_title),
         navigationIcon = { BackButton(onClick = onBackClick) },
         actions = {
             TextButton(
diff --git a/features/securityandprivacy/impl/src/main/res/values-be/translations.xml b/features/securityandprivacy/impl/src/main/res/values-be/translations.xml
new file mode 100644
index 0000000000..166afb9568
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-be/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Папрасіце далучыцца"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Хто заўгодна"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-bg/translations.xml b/features/securityandprivacy/impl/src/main/res/values-bg/translations.xml
new file mode 100644
index 0000000000..7ae4ba25cf
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-bg/translations.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_security_and_privacy_add_room_address_action">"Добавяне на адрес на стаята"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Да, включване на шифроването"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Да се включи ли шифроването?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Веднъж включено, шифроването не може да бъде изключено."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Включване на шифроване от край до край"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Всеки може да намери и да се присъедини"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Хората могат да се присъединят само ако са поканени"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Само с покана"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Достъп до стаята"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Пространствата в момента не се поддържат"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Членове на пространството"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Ще ви е необходим адрес на стаята, за да я направите видима в директорията на стаите."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Видима в директорията на обществените стаи"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Кой може да чете историята"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Само за членове откакто са поканени"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Само за членове от избирането на тази опция"</string>
+  <string name="screen_security_and_privacy_title">"Защита и поверителност"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Шифроване"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Всеки"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Видимост на стаята"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-cs/translations.xml b/features/securityandprivacy/impl/src/main/res/values-cs/translations.xml
new file mode 100644
index 0000000000..299ac2b643
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-cs/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Aby byla místnost v adresáři viditelná, je třeba zadat její adresu."</string>
+  <string name="screen_edit_room_address_title">"Adresa místnosti"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Přidat adresu místnosti"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kdokoli může požádat o vstup do místnosti, ale správce nebo moderátor bude muset žádost přijmout."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ano, povolit šifrování"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po aktivaci nelze šifrování místnosti deaktivovat. Historie zpráv bude viditelná pouze pro členy místnosti od doby, kdy byli pozváni nebo od té doby, co do místnosti vstoupili.
+Nikdo kromě členů místnosti nebude moci číst zprávy. To může bránit správnému fungování robotů a propojení.
+Nedoporučujeme povolovat šifrování pro místnosti, které může kdokoli najít a vstoupit do nich."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Povolit šifrování?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Jakmile je povoleno, šifrování nelze zakázat."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Povolit koncové šifrování"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Každý může najít a vstoupit"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kdokoliv"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Lidé mohou vstoupit, pouze pokud jsou pozváni"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Pouze pro zvané"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Přístup do místnosti"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Prostory nejsou aktuálně podporovány"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Členové prostoru"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Budete potřebovat adresu místnosti, aby byla viditelná v adresáři místností."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresa místnosti"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Umožněte nalezení této místnosti prohledáním adresáře veřejných místností na %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditelné v adresáři veřejných místností"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Kdo může číst historii"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Pouze členové od té doby, co byli pozváni"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Pouze členové od výběru této možnosti"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy místností představují způsoby, jak najít místnosti a získat k nim přístup. Díky tomu můžete svoji místnost snadno sdílet s ostatními.
+Můžete se rozhodnout publikovat svou místnost ve veřejném adresáři místnosti vašeho domovského serveru."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publikování místnosti"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy místností představují způsoby, jak najít místnosti a získat k nim přístup. Díky tomu můžete svoji místnost snadno sdílet s ostatními.
+Adresa je také vyžadována pro zobrazení místnosti v adresáři veřejných místností %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Zabezpečení a soukromí"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Požádat o připojení"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Šifrování"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kdokoliv"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditelnost místnosti"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-cy/translations.xml b/features/securityandprivacy/impl/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..249fa6a1da
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-cy/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch i\'w wneud yn weladwy yn y cyfeiriadur."</string>
+  <string name="screen_edit_room_address_title">"Cyfeiriad yr ystafell"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Ychwanegu cyfeiriad ystafell"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Gall unrhyw un ofyn am gael ymuno â\'r ystafell ond bydd rhaid i weinyddwr neu gymedrolwr dderbyn y cais."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Iawn, galluogi amgryptio"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Unwaith y bydd wedi\'i alluogi, does dim modd analluogi amgryptio ar gyfer ystafell, dim ond ar gyfer aelodau\'r ystafell y bydd hanes neges yn weladwy ers iddyn nhw gael eu gwahodd neu ers iddyn nhw ymuno â\'r ystafell.
+Fydd neb ar wahân i aelodau\'r ystafell yn gallu darllen negeseuon. Gall hyn atal botiau a phontydd i weithio\'n gywir.
+Nid ydym yn argymell galluogi amgryptio ar gyfer ystafelloedd y gall unrhyw un ddod o hyd iddynt ac ymuno â nhw."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Galluogi amgryptio?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Unwaith y bydd wedi\'i alluogi, does dim modd analluogi amgryptio."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Galluogi amgryptio o\'r dechrau i\'r diwedd"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Gall unrhyw un ddod o hyd iddo ac ymuno"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Unrhyw un"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Dim ond os cawn nhw wahoddiad gall pobl ymuno"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Gwahoddiad yn unig"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Mynediad ystafell"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Nid yw gofodau\'n cael eu cefnogi ar hyn o bryd"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Aelodau gofod"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch er mwyn ei wneud yn weladwy yn y cyfeiriadur ystafelloedd."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Cyfeiriad yr ystafell"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Caniatáu i\'r ystafell hon gael ei chanfod trwy chwilio cyfeiriadur ystafelloedd cyhoeddus %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Gweladwy yn y cyfeiriadur ystafelloedd cyhoeddus"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Pwy all ddarllen hanes"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Yn aelodau ond dim ond ers cael eu gwahodd"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Yn aelodau dim ond ers dewis y dewis hwn"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill.
+Gallwch ddewis cyhoeddi eich ystafell yng ngweinydd cartref eich cyfeiriadur ystafelloedd cyhoeddus."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Cyhoeddi ystafell"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill.
+Mae angen y cyfeiriad hefyd i wneud yr ystafell yn weladwy yng nghyfeiriadur ystafell gyhoeddus %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Diogelwch a phreifatrwydd"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Gofyn i gael ymuno"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Amgryptiad"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Unrhyw un"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Gwelededd yr ystafell"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-da/translations.xml b/features/securityandprivacy/impl/src/main/res/values-da/translations.xml
new file mode 100644
index 0000000000..1a8a9046b6
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-da/translations.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Du skal bruge en rum-adresse for at gøre den synlig i kataloget."</string>
+  <string name="screen_edit_room_address_title">"Rummets adresse"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Tilføj adresse på rum"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle kan bede om at deltage i lokalet, men en administrator eller moderator skal acceptere anmodningen."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktivér kryptering"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Når det først er aktiveret, kan kryptering for et rum ikke deaktiveres igen. Beskedhistorik vil kun være synlig for rummedlemmer, siden de blev inviteret, eller siden de blev medlem af rummet.
+Ingen udover medlemmer af rummet vil være i stand til at læse beskeder. Dette kan forhindre bots og broer i at fungere korrekt.
+Vi anbefaler ikke at aktivere kryptering for rum, som alle kan finde og deltage i."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Aktivér kryptering?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Når kryptering først er aktiveret, kan den ikke deaktiveres igen."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Aktivér end-to-end-kryptering"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Alle kan finde og deltage"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Andre kan kun deltage, hvis de bliver inviteret"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun med invitation"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Adgang til rummet"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Grupper understøttes ikke i øjeblikket"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer af gruppen"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du skal bruge en adresse til rummet, for at gøre den synlig i rum-registeret."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillad, at dette rum kan findes ved at søge i %1$s fortegnelse over offentlige rum"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i det offentlige register over rum"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Hvem kan læse historikken?"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Kun medlemmer, efter de blev inviteret"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kun medlemmer siden valg af denne mulighed"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Rum-adresser er en måde at finde og få adgang til værelser på. Dette sikrer også, at du nemt kan dele dit rum med andre.
+Du kan vælge at offentliggøre dit rum i din hjemmeservers offentlige katalog over rum."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Udgivelse af rum"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Rum-adresser er måder at finde og få adgang til rum på. Dette sikrer også, at du nemt kan dele dit rum med andre.
+Adressen er også påkrævet for at gøre rummet synligt i det %1$s offentlige register."</string>
+  <string name="screen_security_and_privacy_title">"Sikkerhed og privatliv"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Spørg om at deltage"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Enhver"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Rummets synlighed"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-de/translations.xml b/features/securityandprivacy/impl/src/main/res/values-de/translations.xml
new file mode 100644
index 0000000000..cc311a70f4
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-de/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Du benötigst eine Chat-Adresse, um den Chat im Verzeichnis sichtbar zu machen."</string>
+  <string name="screen_edit_room_address_title">"Chat-Adresse"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Chat-Adresse hinzufügen"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Jeder kann den Beitritt zum Chat anfragen, aber ein Admin oder Moderator müssen die Anfrage akzeptieren."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, Verschlüsselung aktivieren"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Einmal angeschaltet kann die Verschlüsselung für einen Chat nicht mehr deaktiviert werden. Der Nachrichtenverlauf ist für Mitglieder nur sichtbar, seit sie eingeladen wurden oder dem Chat beigetreten sind.
+Niemand außer den Chat Mitgliedern kann Nachrichten lesen. Dies kann verhindern, dass Bots und Bridges richtig funktionieren.
+Wir empfehlen keine Verschlüsselung für Chats zu aktivieren, die jeder finden und denen jeder beitreten darf."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Verschlüsselung aktivieren?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Einmal angeschaltet kann die Verschlüsselung nicht mehr deaktiviert werden."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Ende-zu-Ende-Verschlüsselung aktivieren"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Jeder kann diesen Chat finden und ihm beitreten"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Alle"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Personen können nur beitreten, wenn sie eingeladen werden."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Nur auf Einladung"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Chat Zugang"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spaces werden zur Zeit nicht unterstützt."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Spacemitglieder"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du benötigst eine Chat-Adresse, um den Chat im Verzeichnis sichtbar zu machen."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Chatroomadresse"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Erlaube das Auffinden dieses Chats durch Suche im öffentlichen Verzeichnis von %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Sichtbar im öffentlichen Verzeichnis"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Wer hat Zugriff auf den Nachrichtenverlauf"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Nur Mitglieder, aber erst seit deren Einladung"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Nur Mitglieder seit Auswahl dieser Option"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Chat-Adressen machen es möglich, Chats zu finden und ihnen beizutreten. Dies erleichtert es, Chats mit anderen zu teilen.
+Auf Wunsch kannst du deinen Chat im öffentlichen Verzeichnis deines Homeservers veröffentlichen."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Veröffentlichung von Chats"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Chat-Adressen machen es möglich, Chats zu finden und ihnen beizutreten. Dies erleichtert es, Chats mit anderen zu teilen.
+Die Adresse ist auch erforderlich, um den Chat im öffentlichen Verzeichnis von %1$s zu veröffentlichen."</string>
+  <string name="screen_security_and_privacy_title">"Sicherheit &amp; Datenschutz"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Beitritt beantragen"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Verschlüsselung"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Jeder"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">" Sichtbarkeit des Chats"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-el/translations.xml b/features/securityandprivacy/impl/src/main/res/values-el/translations.xml
new file mode 100644
index 0000000000..8e2f0ad361
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-el/translations.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Θα χρειαστείτε μια διεύθυνση αίθουσας για να την κάνετε ορατή στον κατάλογο."</string>
+  <string name="screen_edit_room_address_title">"Διεύθυνση αίθουσας"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Προσθήκη διεύθυνσης αίθουσας"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Οποιοσδήποτε μπορεί να ζητήσει να συμμετάσχει στην αίθουσα, αλλά ένας διαχειριστής ή συντονιστής θα πρέπει να αποδεχτεί το αίτημα."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ναι, ενεργοποιήστε την κρυπτογράφηση"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Μόλις ενεργοποιηθεί, η κρυπτογράφηση για μια αίθουσα δεν μπορεί να απενεργοποιηθεί, το ιστορικό μηνυμάτων θα είναι ορατό μόνο για τα μέλη της αίθουσας από τότε που προσκλήθηκαν ή από τότε που συμμετείχαν στην αίθουσα.
+Κανείς άλλος εκτός από τα μέλη της αίθουσας δεν θα μπορεί να διαβάσει τα μηνύματα. Αυτό μπορεί να εμποδίσει τη σωστή λειτουργία των bots και των γεφυρών.
+Δεν συνιστούμε την ενεργοποίηση της κρυπτογράφησης για αίθουσες που μπορεί να βρει και να συμμετάσχει ο καθένας."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Ενεργοποίηση κρυπτογράφησης;"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Μόλις ενεργοποιηθεί, η κρυπτογράφηση δεν μπορεί να απενεργοποιηθεί."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Ενεργοποίηση κρυπτογράφησης από άκρο σε άκρο"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Οποιοσδήποτε μπορεί να βρει και να συμμετάσχει"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Οποιοσδήποτε"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Τα άτομα μπορούν να συμμετάσχουν μόνο εάν έχουν προσκληθεί"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Μόνο πρόσκληση"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Πρόσβαση στην αίθουσα"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Οι χώροι δεν υποστηρίζονται προς το παρόν"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Μέλη χώρου"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Θα χρειαστείτε μια διεύθυνση αίθουσας για να την κάνετε ορατή στον κατάλογο αιθουσών."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Επιστρέψτε την εύρεση αυτής της αίθουσας με αναζήτηση στον κατάλογο %1$s δημοσίων αιθουσών"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Ορατή στον κατάλογο δημόσιων αιθουσών"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Ποιος μπορεί να διαβάσει το ιστορικό"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Μόνο μέλη από τη στιγμή που προσκλήθηκαν"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Μόνο για μέλη μετά από αυτήν την επιλογή"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Οι διευθύνσεις αιθουσών είναι τρόποι εύρεσης και πρόσβασης σε αίθουσες. Αυτό διασφαλίζει επίσης ότι μπορείτε εύκολα να μοιραστείτε την αίθουσα με άλλους.
+Μπορείτε να επιλέξετε να δημοσιεύσετε την αίθουσά σας στον δημόσιο κατάλογο αιθουσών του αρχικού διακομιστή σας."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Δημοσίευση αίθουσας"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Οι διευθύνσεις αιθουσών είναι τρόποι εύρεσης και πρόσβασης σε αίθουσες. Αυτό εξασφαλίζει επίσης ότι μπορείτε εύκολα να μοιραστείτε την αίθουσα με άλλους.
+Η διεύθυνση απαιτείται επίσης για να γίνει η αίθουσα ορατή στον δημόσιο κατάλογο αιθουσών %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Ασφάλεια &amp; απόρρητο"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Αίτημα συμμετοχής"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Κρυπτογράφηση"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Οποιοσδήποτε"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Ορατότητα αίθουσας"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-es/translations.xml b/features/securityandprivacy/impl/src/main/res/values-es/translations.xml
new file mode 100644
index 0000000000..912ab9db68
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-es/translations.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Necesitarás una dirección de sala para que sea visible en el directorio."</string>
+  <string name="screen_edit_room_address_title">"Dirección de la sala"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Agregar dirección de sala"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Cualquiera puede solicitar unirse a la sala, pero un administrador o moderador tendrá que aceptar la solicitud."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sí, activar cifrado"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Una vez activado, el cifrado de una sala no se puede desactivar. El historial de mensajes solo será visible para los miembros de la sala desde que fueron invitados o desde que se unieron a la sala.
+Nadie más que los miembros de la sala podrán leer los mensajes. Esto puede impedir que los bots y los puentes funcionen correctamente.
+No recomendamos habilitar el cifrado para las salas que cualquiera pueda encontrar y unirse."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"¿Activar cifrado?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Una vez activado, el cifrado no se puede desactivar."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Activar el cifrado de extremo a extremo"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Cualquiera puede encontrarla y unirse"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Las personas solo pueden unirse si están invitadas"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Solo por invitación"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Acceso a la sala"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"No se admiten los espacios por el momento."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Miembros del espacio"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Necesitarás una dirección de sala para que esta sea visible en el directorio de salas."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permite encontrar esta sala buscando en el directorio de salas públicas de %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible en el directorio de salas públicas"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Quién puede leer el historial"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Solo participantes desde que fueron invitados"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Solo participantes desde que se selecciona esta opción"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Las direcciones de sala son formas de buscar salas y acceder a ellas. Esto también garantiza que puedas compartir fácilmente tu sala con otras personas.
+Puedes optar por publicar tu sala en el directorio de salas públicas de tu servidor base."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publicación de la sala"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Las direcciones de sala son un medio para buscar y acceder a salas. También te permiten compartir fácilmente tu sala con otras personas.
+La dirección también es necesaria para hacer visible la sala en el directorio de salas públicas de %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Seguridad y privacidad"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Solicitud para unirse"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Cifrado"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Cualquiera"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidad de la sala"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-et/translations.xml b/features/securityandprivacy/impl/src/main/res/values-et/translations.xml
new file mode 100644
index 0000000000..77dd390f52
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-et/translations.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade avalikus kataloogis, vajab ta aadressi."</string>
+  <string name="screen_edit_room_address_title">"Muuda aadressi"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Lisa jututoa aadress"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kõik võivad paluda jututoaga liitumist, kuid peakasutaja peab sellega nõustuma."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Jah, lülita krüptimine sisse"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Kui jututoa krüptimine on kord sisse lülitatud, siis seda välja lülitada ei saa. Sõnumite ajalugu on nähtav vaid jututoa liikmetele alates kutse saamise või liitumise hetkest.
+Keegi teine peale jututoa liikmete ei saa sõnumeid lugeda. See võib takistada suhtlusrobotite ja/või võrgusildade toimimist.
+Me ei soovita krüptimise kasutamist selliste avalike jututubade puhul, millega kõik võivad liituda."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Kas võtame krüptimise kasutusele?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Kui krüptimine on kasutusel, siis seda enam väljalülitada ei saa."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Võta läbiv krüptimine kasutusele"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kõik võivad jututoaga liituda"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Avalik"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Liituda saab vaid kutse olemasolul"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Privaatne"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Ligipääs"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Kogukondade tugi veel puudub"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Kogukonna liikmed"</string>
+  <string name="screen_security_and_privacy_room_address_description">"Et jututuba oleks nähtav avalikus kataloogis, peab tal olema aadress."</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade kataloogis, vajab ta aadressi."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Avaldatud aadress"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Võimalda leida seda jututuba avalikust kataloogist otsides „%1$s“"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Luba leitavus avaliku kataloogi otsingust."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Nähtav avalikus kataloogis"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Kes võivad lugeda jututoa ajalugu"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Liikmed peale kutse saamist"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Liikmed peale selle valiku sisselülitamist"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Jututoa aadressid annavad võimaluse neid leida ning saada neile ligi. Samuti võimaldab see jututuba teistele huvilistele jagada.
+Lisaks võid sa jututoa avaldada oma koduserveri avalikus jututubade kataloogis."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Jututoa avaldamine"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Jututoa aadressid annavad võimaluse neid leida ning saada neile ligi. Samuti võimaldab see jututuba teistele huvilistele jagada.
+Lisaks on aadress vajalik, et jututuba oleks %1$s serveri avalikus jututubade kataloogis nähtav."</string>
+  <string name="screen_security_and_privacy_title">"Turvalisus ja privaatsus"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Küsi võimalust liitumiseks"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Krüptimine"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kõik"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Jututoa nähtavus"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-eu/translations.xml b/features/securityandprivacy/impl/src/main/res/values-eu/translations.xml
new file mode 100644
index 0000000000..d7758c1f81
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-eu/translations.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_title">"Gelaren helbidea"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Gehitu gelaren helbidea"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Bai, gaitu zifratzea"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Edonork aurkitu eta bat egin dezake"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Gonbidatutako pertsonak bakarrik sartu ahal izango dira"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Gonbidapen bidez"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Gelarako sarbidea"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Gaur-gaurkoz ez da guneekin bateragarria"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Guneko kideak"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Gelarako helbideren bat beharko duzu gelen direktorioan ikusgai egon dadila nahi baduzu."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Gelaren helbidea"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Gela publikoen direktorioan ikusgai"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Nork irakur dezake historia"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Kideek bakarrik, gonbidatu zituztenetik"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kideek bakarrik, aukera hau hautatu zenetik"</string>
+  <string name="screen_security_and_privacy_title">"Segurtasuna eta pribatutasuna"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Zifratzea"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Edonork"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Gelaren ikusgarritasuna"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-fa/translations.xml b/features/securityandprivacy/impl/src/main/res/values-fa/translations.xml
new file mode 100644
index 0000000000..d3e96712de
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-fa/translations.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_title">"نشانی اتاق"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"افزودن نشانی اتاق"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"بله. به کار انداختن رمزنگاری"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"رمزگذاری فعال شود؟"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"پس از به کار افتادن، رمزنگاری قابل از کار انداختن نیست."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"هرکسی می‌تواند یافته و بپیوندد"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"هرکسی"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"افراد فقط در صورت دعوت می‌توانند بپیوندند"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"فقط دعوتی"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"دسترسی اتاق"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"در حال حاضر فضاها پشتیبانی نمی‌شوند"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"اعضای فضا"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"نشانی اتاق"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"انتشار اتاق"</string>
+  <string name="screen_security_and_privacy_title">"امنیت و محرمانگی"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"درخواست دعوت"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"رمزنگاری"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"هرکسی"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"نمایانی اتاق"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-fi/translations.xml b/features/securityandprivacy/impl/src/main/res/values-fi/translations.xml
new file mode 100644
index 0000000000..87440b626a
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-fi/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Tarvitset huoneen osoitteen, jotta se näkyy hakemistossa."</string>
+  <string name="screen_edit_room_address_title">"Huoneen osoite"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Lisää huoneen osoite"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kuka tahansa voi pyytää saada liittyä huoneeseen, mutta ylläpitäjän tai valvojan on hyväksyttävä pyyntö."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Kyllä, ota salaus käyttöön"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä. Viestihistoria näkyy vain huoneen jäsenille kutsusta tai liittymisestä lähtien.
+Kukaan muu kuin huoneen jäsenet eivät pysty lukemaan viestejä. Tämä voi estää botteja tai siltoja toimimasta oikein.
+Emme suosittele salauksen ottamista käyttöön huoneissa, jotka kuka tahansa voi löytää ja joihin kuka tahansa voi liittyä."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Otetaanko salaus käyttöön?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Ota päästä päähän -salaus käyttöön"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kuka tahansa voi löytää ja liittyä."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kuka tahansa"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vain kutsutut henkilöt voivat liittyä"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vain kutsutut"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Huoneeseen pääsy"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Tiloja ei tällä hetkellä tueta"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Tilan jäsenet"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Tarvitset huoneen osoitteen, jotta se näkyy huonehakemistossa."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Huoneen osoite"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Salli tämän huoneen löytäminen hakemalla %1$s -palvelimen julkisesta huonehakemistosta."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Näkyy julkisessa huonehakemistossa"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Kuka voi lukea viestihistoriaa"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Jäsenet vasta kutsusta lähtien"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Jäsenet tämän vaihtoehdon valinnan jälkeen"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Huoneosoitteet ovat tapoja löytää ja käyttää huoneita. Näin voit myös helposti jakaa huoneesi muiden kanssa.
+Voit halutessasi julkaista huoneesi kotipalvelimesi julkisessa huonehakemistossa."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Huoneen julkaiseminen"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Huoneosoitteet ovat tapoja löytää ja käyttää huoneita. Näin voit myös helposti jakaa huoneesi muiden kanssa.
+Osoitetta tarvitaan myös, jotta huone näkyy %1$s -palvelimen julkisessa huonehakemistossa."</string>
+  <string name="screen_security_and_privacy_title">"Turvallisuus ja yksityisyys"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pyydä liittymistä"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Salaus"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kuka tahansa"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Huoneen näkyvyys"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-fr/translations.xml b/features/securityandprivacy/impl/src/main/res/values-fr/translations.xml
new file mode 100644
index 0000000000..7a4be5d37a
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-fr/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Vous aurez besoin d\'une adresse de salon pour le rendre visible dans le répertoire."</string>
+  <string name="screen_edit_room_address_title">"Adresse du salon"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Ajouter l\'adresse du salon"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"N\'importe qui peut demander à rejoindre le salon, mais un administrateur ou un modérateur devra accepter la demande."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Oui, activer le chiffrement"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Une fois activé, le chiffrement d\'un salon ne peut pas être désactivé. L\'historique des messages ne sera visible que pour les membres depuis qu\'ils ont été invités ou depuis qu\'ils ont rejoint le salon.
+Personne d\'autre que les membres du salon ne pourra lire les messages. Cela peut empêcher les bots et les bridges de fonctionner correctement.
+Nous ne recommandons pas d\'activer le chiffrement pour les salons que tout le monde peut trouver et rejoindre."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Activer le chiffrement ?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Une fois activé, le chiffrement ne peut pas être désactivé."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Activer le chiffrement de bout en bout"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Tout le monde peut le trouver et le rejoindre"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Tout le monde"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Le salon ne peut être joint que par les personnes invitées"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Sur invitation uniquement"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Accès au salon"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Les Espaces ne sont pas encore supportés"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membres de l\'espace"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Vous aurez besoin de l\'adresse du salon pour le rendre visible dans le répertoire des salons."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresse du salon"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Autoriser le salon à apparaître dans les résultats de recherche dans le répertoire %1$s des salons publics"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible dans le répertoire des salons publics"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Qui peux lire l\'historique"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Les membres uniquement depuis qu\'ils ont été invités"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Les membres uniquement depuis la sélection de cette option"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Les adresses de salon sont un moyen de trouver et d\'accéder aux salons. Cela vous permet également de partager facilement votre salon avec d\'autres personnes.
+Vous pouvez choisir de publier votre salon dans l\'annuaire des salons publics de votre serveur d’accueil."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publication du salon"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Les adresses de salon sont un moyen de trouver et d\'accéder aux salons. Cela vous permet également de partager facilement votre salon avec d\'autres personnes.
+L\'adresse est également requise pour que le salon soit visible dans le répertoire %1$s des salons publics."</string>
+  <string name="screen_security_and_privacy_title">"Sécurité &amp; confidentialité"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Demander à rejoindre"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Chiffrement"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Tout le monde"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilité du salon"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-hu/translations.xml b/features/securityandprivacy/impl/src/main/res/values-hu/translations.xml
new file mode 100644
index 0000000000..b32923dba6
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-hu/translations.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
+  <string name="screen_edit_room_address_title">"Cím szerkesztése"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Szobacím hozzáadása"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Bárki kérhet hozzáférést, de a kérést egy adminisztrátornak kell jóváhagynia."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Igen, engedélyezze a titkosítást"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Az engedélyezés után a szoba titkosítása nem tiltható le. Az üzenetek előzményei csak a szobatagok számára láthatók, amikor meghívást kaptak, vagy mióta csatlakoztak a szobához.
+A szobatagokon kívül senki sem tudja olvasni az üzeneteket. Ez megakadályozhatja a botok és a hidak megfelelő működését.
+Nem javasoljuk a titkosítás engedélyezését az olyan szobákban, amelyeket bárki megtalálhat és csatlakozhat."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Engedélyezi a titkosítást?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Engedélyezés után a titkosítás nem tiltható le."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Végpontok közötti titkosítás engedélyezése"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Bárki csatlakozhat."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Nyilvános"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Csak a meghívott emberek léphetnek be."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Privát"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Hozzáférés"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"A terek jelenleg nem támogatottak"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"A tér tagjai"</string>
+  <string name="screen_security_and_privacy_room_address_description">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Szüksége lesz egy szobacímre, hogy láthatóvá váljon a szobakatalógusban."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Közzétett cím"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"A szoba megtalálhatóvá tétele a(z) %1$s nyilvános szobakatalógusában való kereséssel."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Lehetővé teszi, hogy a nyilvános szobakatalógusban megtalálható legyen."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Látható a nyilvános szobakatalógusban"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Ki olvashatja az előzményeket"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Csak a tagok, a meghívásuktól kezdődően"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Csak a tagok, a beállítás választásától kezdődően"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"A szobacímek a szobák megtalálásának és elérésnek módjai. Ez azt is biztosítja, hogy könnyen megoszthatja a szobáját másokkal.
+Kiválaszthatja, hogy szobáját közzéteszi-e a Matrix-kiszolgáló nyilvános szobakatalógusában."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Szoba közzététele"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"A szobacímek a szobák megtalálásának és elérésnek módjai. Ez azt is biztosítja, hogy könnyen megoszthatja a szobáját másokkal.
+A cím szükséges ahhoz is, hogy a nyilvános szoba láthatóvá váljon a(z) %1$s kiszolgáló nyilvános szobakatalógusában."</string>
+  <string name="screen_security_and_privacy_title">"Biztonság és adatvédelem"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Csatlakozás kérése"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Titkosítás"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Bárki"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Szoba láthatósága"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-in/translations.xml b/features/securityandprivacy/impl/src/main/res/values-in/translations.xml
new file mode 100644
index 0000000000..836ad66302
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-in/translations.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Anda akan memerlukan alamat ruangan untuk membuatnya terlihat dalam direktori."</string>
+  <string name="screen_edit_room_address_title">"Alamat ruangan"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Tambahkan alamat ruangan"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Siapa pun dapat meminta untuk bergabung dengan ruangan tetapi administrator atau moderator harus menerima permintaan tersebut."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ya, aktifkan enkripsi"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Setelah diaktifkan, encryption untuk sebuah ruangan tidak dapat dinonaktifkan, Riwayat pesan hanya akan terlihat oleh anggota ruangan sejak mereka diundang atau sejak mereka bergabung dengan ruangan tersebut.
+Tidak ada orang lain selain anggota ruangan yang dapat membaca pesan. Hal ini dapat mencegah bot dan jembatan bekerja dengan benar.
+Kami tidak menyarankan untuk mengaktifkan enkripsi untuk ruangan yang dapat ditemukan dan diikuti oleh siapa pun."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Aktifkan enkripsi?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Setelah diaktifkan, enkripsi tidak dapat dinonaktifkan."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Aktifkan enkripsi ujung ke ujung"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Siapa pun dapat menemukan dan bergabung"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Orang hanya dapat bergabung jika mereka diundang"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Hanya undangan"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Akses ruangan"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Space saat ini tidak didukung"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Anggota space"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Anda memerlukan alamat ruangan agar dapat membuatnya terlihat di direktori ruangan."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Izinkan ruangan ini ditemukan dengan mencari direktori ruangan %1$s publik"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Terlihat di direktori ruangan publik"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Siapa yang bisa membaca riwayat"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Hanya anggota sejak mereka diundang"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Hanya anggota sejak memilih opsi ini"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Alamat ruangan adalah cara untuk menemukan dan mengakses ruangan. Ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain. Anda dapat memilih untuk menerbitkan ruangan Anda di direktori ruangan publik homeserver Anda."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Penerbitan ruangan"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Alamat ruangan adalah cara untuk menemukan dan mengakses ruangan. Hal ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain.
+Alamat ini juga diperlukan untuk membuat ruangan terlihat di %1$s direktori ruangan publik."</string>
+  <string name="screen_security_and_privacy_title">"Keamanan &amp; privasi"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Minta untuk bergabung"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Enkripsi"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Siapa pun"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Keterlihatan ruangan"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-it/translations.xml b/features/securityandprivacy/impl/src/main/res/values-it/translations.xml
new file mode 100644
index 0000000000..2148691b24
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-it/translations.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Avrai bisogno di un indirizzo della stanza per renderla visibile nell\'elenco."</string>
+  <string name="screen_edit_room_address_title">"Indirizzo della stanza"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Aggiungi l\'indirizzo della stanza"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Chiunque può chiedere di entrare nella stanza, ma un amministratore o un moderatore dovrà accettare la richiesta."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sì, attiva la crittografia"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Una volta attivata, la crittografia di una stanza non può essere disattivata, la cronologia dei messaggi sarà visibile solo ai membri della stanza da quando sono stati invitati o da quando sono entrati nella stanza.
+Nessuno, oltre ai membri della stanza, sarà in grado di leggere i messaggi. Ciò potrebbe impedire ai bot e ai bridge di funzionare correttamente.
+Non consigliamo di attivare la crittografia per le stanze che chiunque può trovare e in cui può entrare."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Attivare la crittografia?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Una volta attivata, la crittografia non può essere disattivata."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Attiva la crittografia end-to-end"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Chiunque può trovare ed entrare"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Chiunque"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Le persone possono partecipare solo se invitate"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Solo su invito"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Accesso alla stanza"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Gli spazi non sono attualmente supportati"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membri dello spazio"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Per rendere visibile la stanza nell\'elenco delle stanze, è necessario l\'indirizzo della stanza."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Indirizzo della stanza"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Consenti la ricerca di questa stanza effettuando una ricerca nell\'elenco delle stanze pubbliche di %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visibile nell\'elenco delle stanze pubbliche"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Chi può leggere la cronologia messaggi"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Solo membri da quando sono stati invitati"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Solo membri da dopo aver selezionato questa opzione"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Gli indirizzi delle stanze sono modi per trovare e accedervi. In questo modo puoi anche condividere facilmente la tua stanze con altri.
+Puoi scegliere di pubblicare la tua stanza nell\'elenco delle stanza pubbliche dell\'homeserver."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Pubblicazione della stanza"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Gli indirizzi delle stanze sono modi per trovare e accedere a queste ultime. Questo assicura anche che tu possa condividere facilmente la tua stanza con altri. L\'indirizzo è anche necessario per rendere la stanza visibile in %1$s nell\'elenco delle stanze pubbliche."</string>
+  <string name="screen_security_and_privacy_title">"Sicurezza e privacy"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Chiedi di entrare"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Crittografia"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Chiunque"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilità della stanza"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-ko/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ko/translations.xml
new file mode 100644
index 0000000000..b144b6bdde
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-ko/translations.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"디렉토리에 표시하려면 방 주소가 필요합니다."</string>
+  <string name="screen_edit_room_address_title">"방 주소"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"방 주소 추가"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"누구나 방에 참여 요청을 할 수 있지만, 관리자나 운영자가 요청을 수락해야 합니다."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"예, 암호화 활성화"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"일단 활성화되면, 방의 암호화는 비활성화할 수 없습니다. 메시지 기록은 방에 초대된 후 또는 방에 참여한 이후부터 방 구성원만 볼 수 있습니다.
+방 구성원 외에는 아무도 메시지를 읽을 수 없습니다. 이로 인해 봇과 브리지가 제대로 작동하지 않을 수 있습니다.
+누구나 찾고 참여할 수 있는 방에는 암호화를 활성화하지 않는 것이 좋습니다."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"암호화 활성화?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"일단 활성화되면, 암호화는 비활성화할 수 없습니다."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"종단간 암호화 활성화"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"누구나 찾을 수 있고 참여할 수 있습니다."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"초대받은 사용자만 가입할 수 있습니다."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"초대 전용"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"방 액세스"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"스페이스는 현재 지원되지 않습니다"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"스페이스 멤버들"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"방 디렉토리에 표시하려면 방 주소가 필요합니다."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"%1$s 공개 방 디렉토리에서 이 방을 검색할 수 있도록 허용합니다"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"공개 룸 디렉토리에 표시됨"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"누가 기록을 읽을 수 있는가"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"초대받은 회원만 이용 가능합니다"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"이 옵션을 선택한 회원만 이용 가능합니다."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"방 주소는 방을 찾고 액세스하는 방법입니다. 이를 통해 다른 사람들과 방을 쉽게 공유할 수 있습니다.
+홈서버의 공개 방 디렉토리에 방을 공개할지 여부를 선택할 수 있습니다."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"방 게시"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"방 주소는 방을 찾고 액세스하는 방법입니다. 또한 이 주소를 사용하면 다른 사람들과 방을 쉽게 공유할 수 있습니다.
+%1$s 의 공개 방 디렉토리에서 방을 표시하려면 이 주소도 필요합니다."</string>
+  <string name="screen_security_and_privacy_title">"보안 및 개인정보 보호"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"참가 요청"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"암호화"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"누구나"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"방 표시 여부"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-nb/translations.xml b/features/securityandprivacy/impl/src/main/res/values-nb/translations.xml
new file mode 100644
index 0000000000..02f2163c51
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-nb/translations.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Du trenger en adresse til rommet for å gjøre det synlig i katalogen."</string>
+  <string name="screen_edit_room_address_title">"Romadresse"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Legg til romadresse"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle kan be om å bli med i rommet, men en administrator eller moderator må godta forespørselen."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktiver kryptering"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Når kryptering for et rom er aktivert, kan den ikke deaktiveres. Meldingshistorikken vil bare være synlig for rommedlemmer siden de ble invitert eller siden de ble med i rommet.
+Ingen andre enn rommedlemmene vil kunne lese meldingene. Dette kan føre til at bots og broer ikke fungerer som de skal.
+Vi anbefaler ikke å aktivere kryptering for rom som hvem som helst kan finne og bli med i."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Vil du aktivere kryptering?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Når kryptering er aktivert, kan det ikke deaktiveres."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Aktiver ende-til-ende-kryptering"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Alle kan finne og bli med"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Folk kan bare bli med hvis de er invitert"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun for inviterte"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Tilgang til rom"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Områder støttes ikke for øyeblikket"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer av område"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du trenger en adresse til rommet for å gjøre rommet synlig i romkatalogen."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillat at dette rommet blir funnet ved å søke %1$s offentlig romkatalog"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i offentlig romkatalog"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Hvem kan lese historikk"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Medlemmer bare siden de ble invitert"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kun medlemmer siden du valgte dette alternativet"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Romadresser er måter å finne og få tilgang til rom på. Dette sikrer også at du enkelt kan dele rommet ditt med andre.
+Du kan velge å publisere rommet ditt i hjemeserverens offentlige romkatalog."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publisering av rom"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Romadresser er en måte å finne og få tilgang til rommene på. Dette sikrer også at du enkelt kan dele rommet ditt med andre.
+Adressen er også nødvendig for å gjøre rommet synlig i den offentlige romkatalogen på %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Sikkerhet og personvern"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Be om å bli med"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Alle"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Romsynlighet"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-nl/translations.xml b/features/securityandprivacy/impl/src/main/res/values-nl/translations.xml
new file mode 100644
index 0000000000..3913599edb
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-nl/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Vraag om toe te treden"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Iedereen"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml b/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml
new file mode 100644
index 0000000000..8cad565318
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Aby pokój był widoczny w katalogu, potrzebny jest adres pokoju."</string>
+  <string name="screen_edit_room_address_title">"Adres pokoju"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Dodaj adres pokoju"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Każdy może poprosić o dołączenie do pokoju, ale administrator lub moderator będzie musiał zatwierdzić żądanie."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Tak, włącz szyfrowanie"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po włączeniu szyfrowanie pokoju nie może zostać wyłączone, a historia wiadomości będzie widoczna tylko dla członków od momentu, w którym dołączyli lub zostali zaproszeni.
+Nikt poza członkami pokoju nie będzie mógł czytać wiadomości. Może to wpłynąć na prawidłowe działanie botów lub mostków.
+Odradzamy włączanie szyfrowania dla pokoi, które każdy może znaleźć i do których każdy może dołączyć."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Włączyć szyfrowanie?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Po włączeniu szyfrowania nie można wyłączyć."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Włącz szyfrowanie end-to-end"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Każdy może znaleźć i dołączyć"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Każdy"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Tylko osoby z zaproszeniem mogą dołączyć"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Tylko zaproszenie"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Dostęp do pokoju"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Przestrzenie nie są obecnie wspierane"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Członkowie przestrzeni"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Aby pokój był widoczny w katalogu pokoi, potrzebny jest adres pokoju."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adres pokoju"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Zezwól na znalezienie tego pokoju wyszukując %1$s w katalogu pokoi publicznych"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Widoczny w katalogu pokoi publicznych"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Kto może czytać historię"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Od momentu kiedy członkowie zostali zaproszeni"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Członkowie od momentu włączenia tej opcji"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy pokoju umożliwiają łatwe znalezienie i dołączenie do pokojów.
+Również możesz się zdecydować na upublicznienie Twojego serwera w katalogu pokoi publicznych."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publikowanie pokoju"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy pokoju umożliwiają łatwe znalezienie i dołączenie do pokojów.
+Dodatkowo adres pokoju jest wymagany, aby pomieszczenie było widoczne w katalogu pokoi publicznych %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Bezpieczeństwo i prywatność"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Poproś o dołączenie"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Szyfrowanie"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Wszyscy"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Widoczność pomieszczenia"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml b/features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml
new file mode 100644
index 0000000000..980fb118fb
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Você precisará de um endereço de sala para torná-la visível no diretório."</string>
+  <string name="screen_edit_room_address_title">"Endereço da sala"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Adicionar endereço da sala"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Qualquer pessoa pode pedir para entrar na sala, mas um administrador ou moderador terá que aceitar o pedido."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sim, ativar a criptografia"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Uma vez ativada, a criptografia de uma sala não pode ser desativada. O histórico de mensagens só será visível para os membros da sala desde que foram convidados ou desde que entraram na sala.
+Ninguém além dos membros da sala poderá ler as mensagens. Isso pode impedir que os bots e as pontes funcionem corretamente.
+Não recomendamos que você ative a criptografia para salas que qualquer pessoa possa encontrar e participar."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Ativar a criptografia?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Uma vez ativada, a criptografia não poderá ser desativada."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Ativar a criptografia de ponta a ponta"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer um pode encontrar e entrar"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"As pessoas só podem participar se forem convidadas"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Somente para convidados"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Acesso à sala"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"No momento, não há suporte aos espaços"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membros do espaço"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Você precisará de um endereço de sala para torná-la visível no diretório de salas."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permitir que esta sala seja encontrada pesquisando diretório de salas públicas de %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório de salas públicas"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Quem pode ler o histórico"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Somente membros, desde que foram convidados"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Somente para membros após selecionar esta opção"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhar facilmente sua sala com outras pessoas.
+Você pode optar por publicar sua sala no diretório público de salas do seu servidor-casa."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publicação da sala"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhar facilmente sua sala com outras pessoas.
+O endereço também é necessário para que você possa ver a sala no diretório público de salas do %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para entrar"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Criptografia"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Qualquer pessoa"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade da sala"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-pt/translations.xml b/features/securityandprivacy/impl/src/main/res/values-pt/translations.xml
new file mode 100644
index 0000000000..cdf157ab11
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-pt/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"É necessário um endereço para tornar a sala visível no diretório."</string>
+  <string name="screen_edit_room_address_title">"Endereço da sala"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Adicionar endereço de sala"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Qualquer pessoa pode pedir para entrar na sala, mas um administrador ou moderador tem que aceitar o pedido."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sim, ativar cifragem"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Uma vez ativada, a cifragem não pode ser desativada. O histórico de mensagens só será visível a membros a partir do momento em que foram convidados ou que entraram na sala.
+Ninguém além dos membros poderão ler quaisquer mensagens. Isto pode impedir que robôs (\"bots\") e pontes (\"bridges\") funcionem devidamente.
+Não recomendamos ativar a cifragem em salas que qualquer pessoa possa encontrar e entrar."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Ativar cifragem?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Uma vez ativada, a cifragem não pode ser desativada."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Ativar cifragem ponta-a-ponta"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer pessoa pode encontrar a sala e entrar"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Qualquer pessoa"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Só é possível entrar tendo um convite"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Apenas por convite"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Acesso à sala"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Os espaços ainda não estão implementados"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membros do espaço"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"É necessário um endereço para tornar a sala visível no diretório."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Endereço da sala"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permite que esta sala seja encontrada através do diretório público do %1$s."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório público de salas"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Quem pode ler o histórico de mensagens"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Apenas membros, desde o momento em que forem convidados"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Apenas membros, desde o memento em que esta opção for selecionada"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Estes endereços permitem encontrar e aceder a sala, bem como a sua fácil partilha com outros.
+Podes escolher publicar a sala no diretório público do teu servidor."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publicar sala"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Estes endereços permitem encontrar e aceder a sala, bem como a sua fácil partilha com outros.
+Além disso, é necessário ter endereço para publicar a sala no diretório público do %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para participar"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Cifragem"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Qualquer pessoa"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade da sala"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml
new file mode 100644
index 0000000000..2bd0e41582
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Veți avea nevoie de o adresă de cameră pentru a o face vizibilă în director."</string>
+  <string name="screen_edit_room_address_title">"Adresa camerei"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Adăugați adresa camerei"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Oricine poate cere să se alăture camerei, dar un administrator sau moderator va trebui să accepte cererea."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Da, activați criptarea"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Odată activată, criptarea pentru o cameră nu poate fi dezactivată. Mesajele anterioare vor fi vizibile numai pentru membrii camerei de la momentul la care au fost invitați sau de la momentul la care s-au alăturat camerei. 
+Nimeni în afară de membrii camerei nu va putea citi messaje. Acest lucru poate împiedica funcționarea corectă a boților și a punților. 
+Nu recomandăm activarea criptării pentru camerele pe care oricine le poate găsi și la care se poate alătura."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Activați criptarea?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Odată activată, criptarea nu poate fi dezactivată."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Activați criptarea end-to-end"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Oricine poate găsi și alătura camerei"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Persoanele se pot alătura numai dacă invitate"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Doar pe bază de invitație"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Acces la cameră"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spațiile nu sunt momentan suportate."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membrii spațiului"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Veți avea nevoie de o adresă de cameră pentru a o face vizibilă în directorul de camere."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permiteți găsirea acestei camere prin căutarea în directorul de camere publice al %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Vizibilă în directorul de camere publice"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Cine poate citi mesajele anterioare"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Doar pentru membri, de la momentul în care au fost invitați"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Doar pentru membri, după selectarea acestei opțiuni"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresele camerelor sunt modalități de a găsi și accesa camere. Acest lucru vă asigură, de asemenea, că puteți partaja cu ușurință camera dumneavoastră cu alte persoane.
+Puteți alege să publicați camera în directorul public al camerelor serverului dumneavoastră."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publicare cameră"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresele camerelor sunt modalități de a găsi și accesa camerele. Acest lucru vă asigură, de asemenea, că puteți partaja cu ușurință camera dvs. cu alte persoane.
+Adresa este necesară și pentru ca camera să fie vizibilă în directorul public de camere al %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Securitate &amp; confidențialitate"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Cereți să vă alăturați"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Criptare"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Oricine"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Vizibilitatea camerei"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
new file mode 100644
index 0000000000..1a54034ee5
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Вам понадобится адрес комнаты, чтобы сделать ее видимой в каталоге."</string>
+  <string name="screen_edit_room_address_title">"Редактировать адрес комнаты"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Добавить адрес комнаты"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Любой желающий может подать заявку на присоединение к комнате, но администратор должен будет принять запрос."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Да, включить шифрование"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Шифрование комнаты нельзя будет отключить, история сообщений будет видна только участникам комнаты с момента их приглашения или с момента присоединения к комнате.
+Никто, кроме членов комнаты, не сможет читать сообщения. Это может помешать ботам и мостам работать корректно.
+Мы не рекомендуем включать шифрование для комнат, в которые может найти и присоединиться любой желающий."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Включить шифрование?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"После включения, шифрование не может быть отключено."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Включить сквозное шифрование"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Любой желающий может найти и присоединиться"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Публичный"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Присоединиться могут только приглашенные люди."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Только по приглашению"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Доступ"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Пространства в настоящее время не поддерживаются."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Участники пространства"</string>
+  <string name="screen_security_and_privacy_room_address_description">"Вам необходимо добавить адрес комнаты, чтобы сделать ее видимой в каталоге."</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Вам понадобится адрес комнаты, чтобы сделать ее видимой в каталоге комнат."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Опубликованный адрес"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Опубликовать %1$s в каталоге публичных комнат"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Разрешить поиск в публичном каталоге."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Доступна в списке публичных комнат"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Кто может читать историю"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Участники только с тех пор, как они были приглашены"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Только для участников с момента выбора этой опции"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Адреса комнат — это способ найти комнату и получить к ней доступ. Это также гарантирует, что вы сможете легко поделиться своей комнатой с другими.
+Вы можете опубликовать свою комнату в каталоге общедоступных комнат на домашнем сервере."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Публикация комнат"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Адреса комнат — это способ найти комнату и получить к ним доступ. Это также гарантирует, что вы сможете легко поделиться своей комнатой с другими.
+Адрес также необходим для отображения комнаты в каталоге %1$s общедоступных комнат."</string>
+  <string name="screen_security_and_privacy_title">"Безопасность и конфиденциальность"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Попросить присоединиться"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Шифрование"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Любой"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Видимость комнаты"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-sk/translations.xml b/features/securityandprivacy/impl/src/main/res/values-sk/translations.xml
new file mode 100644
index 0000000000..287fa1f442
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-sk/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Budete potrebovať adresu miestnosti, aby bola viditeľná v adresári."</string>
+  <string name="screen_edit_room_address_title">"Adresa miestnosti"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Pridať adresu miestnosti"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Ktokoľvek môže požiadať o pripojenie do miestnosti, ale správca alebo moderátor bude musieť žiadosť prijať."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Áno, povoliť šifrovanie"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po aktivácii nie je možné zakázať šifrovanie pre miestnosť. História správ bude viditeľná len pre členov miestnosti, odkedy boli pozvaní alebo keď vstúpili do miestnosti. 
+Nikto okrem členov miestnosti nebude môcť čítať správy. 
+To môže brániť správnemu fungovaniu robotov a premostení. Neodporúčame povoliť šifrovanie pre miestnosti, ktoré môže ktokoľvek nájsť a pripojiť sa k nim."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Povoliť šifrovanie?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Po zapnutí už šifrovanie nie je možné vypnúť."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Povoliť end-to-end šifrovanie"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Ktokoľvek môže nájsť a pripojiť sa"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Ktokoľvek"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Ľudia sa môžu pripojiť len vtedy, ak sú pozvaní"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Iba na pozvánku"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Prístup do miestnosti"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Priestory momentálne nie sú podporované"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Členovia priestoru"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Budete potrebovať adresu miestnosti, aby bola viditeľná v adresári miestností."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresa miestnosti"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Umožniť vyhľadanie tejto miestnosti v adresári verejných miestností %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditeľné v adresári verejných miestností"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Kto môže čítať históriu"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Len pre členov, odkedy boli pozvaní"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Len členovia od zvolenia tejto možnosti"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy miestností predstavujú spôsoby, ako nájsť a získať prístup k miestnostiam. To tiež zaisťuje, že môžete jednoducho zdieľať svoju miestnosť s ostatnými. 
+Môžete sa rozhodnúť zverejniť svoju miestnosť v adresári verejných miestností vášho domovského servera."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Zverejnenie miestnosti"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy miestností predstavujú spôsoby, ako nájsť a získať prístup k miestnostiam. Toto tiež zaisťuje, že môžete jednoducho zdieľať svoju miestnosť s ostatnými. 
+Adresa je tiež potrebná, aby bola miestnosť viditeľná v adresári verejných miestností %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Bezpečnosť a súkromie"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Požiadať o pripojenie"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Šifrovanie"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Ktokoľvek"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditeľnosť miestnosti"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-sv/translations.xml b/features/securityandprivacy/impl/src/main/res/values-sv/translations.xml
new file mode 100644
index 0000000000..b8d76de9bf
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-sv/translations.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Du behöver en rumsadress för att göra den synlig i katalogen."</string>
+  <string name="screen_edit_room_address_title">"Rumsadress"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Lägg till rumsadress"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Vem som helst kan be om att gå med i rummet men en administratör eller moderator måste acceptera begäran."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktivera kryptering"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"När det är aktiverat kan kryptering för ett rum inte inaktiveras, meddelandehistoriken visas bara för rumsmedlemmar sedan de blev inbjudna eller sedan de gick med i rummet.
+Ingen förutom rumsmedlemmarna kommer att kunna läsa meddelanden. Detta kan förhindra att bots och bridges fungerar korrekt.
+Vi rekommenderar inte att aktivera kryptering för rum som vem som helst kan hitta och gå med i."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Aktivera kryptering?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Efter aktivering kan kryptering inte inaktiveras."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Aktivera totalsträckskryptering"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Vem som helst kan hitta och gå med"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Vem som helst"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Användare kan bara gå med om de är inbjudna"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Endast inbjudan"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Tillgång till rum"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Utrymmen stöds för närvarande inte"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Utrymmesmedlemmar"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du behöver en rumsadress för att göra den synlig i rumskatalogen."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillåt att detta rum hittas genom att söka i den offentliga rumskatalogen på %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i katalogen för offentliga rum"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Vem kan läsa historik"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Endast medlemmar sedan de bjöds in"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Endast medlemmar sedan det här alternativet har valts"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Rumsadresser är sätt att hitta och komma åt rum. Detta säkerställer också att du enkelt kan dela ditt rum med andra.
+Du kan välja att publicera ditt rum i din hemservers offentliga rumskatalog."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Rumspublicering"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Rumsadresser är sätt att hitta och komma åt rum. Detta säkerställer också att du enkelt kan dela ditt rum med andra. 
+Adressen krävs också för att göra rummet synligt i%1$s katalog för offentliga rum."</string>
+  <string name="screen_security_and_privacy_title">"Säkerhet och sekretess"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Be om att gå med"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Vem som helst"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Rumssynlighet"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-tr/translations.xml b/features/securityandprivacy/impl/src/main/res/values-tr/translations.xml
new file mode 100644
index 0000000000..959833c7b6
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-tr/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Dizinde görünür hale getirmek için bir oda adresine ihtiyacınız olacak."</string>
+  <string name="screen_edit_room_address_title">"Oda adresi"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Oda adresi ekle"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Herkes odaya katılma isteğinde bulunabilir ancak bir yönetici veya moderatörün isteği kabul etmesi gerekir."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Evet, şifrelemeyi etkinleştir"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Etkinleştirildikten sonra, bir oda için şifreleme devre dışı bırakılamaz, Mesaj geçmişi yalnızca davet edildiklerinden veya odaya katıldıklarından beri oda üyeleri için görünür olacaktır.
+Oda üyeleri dışında hiç kimse mesajları okuyamayacaktır. Bu, botların ve köprülerin düzgün çalışmasını engelleyebilir.
+Herkesin bulabileceği ve katılabileceği odalar için şifrelemenin etkinleştirilmesini önermiyoruz."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Şifrelemeyi etkinleştir?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Açıldıktan donra şifreleme kapatılamaz."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Uçtan uca şifrelemeyi etkinleştir"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Herkes bulabilir ve katılabilir"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Herkes"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"İnsanlar yalnızca davet edildiklerinde katılabilirler"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Yalnızca davet"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Oda Erişimi"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Alanlar şu anda desteklenmiyor"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Alan üyeleri"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Oda dizininde görünür kılmak için bir oda adresine ihtiyacınız olacaktır."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Oda adresi"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Bu odanın %1$s genel oda dizininde arama yapılarak bulunmasına izin verin"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Genel oda dizininde görünür"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Geçmişi kimler okuyabilir ?"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Sadece üyeler (davet edildiklerinden beri)"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Bu seçeneği seçtiğinden beri yalnızca üyeler"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Oda adresleri, odaları bulmanın ve odalara erişmenin yoludur. Bu aynı zamanda odanızı başkalarıyla kolayca paylaşabilmenizi sağlar.
+Odanızı ana sunucunuzun genel oda dizininde yayınlamayı seçebilirsiniz."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Oda yayınlama"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Oda adresleri, odaları bulmanın ve odalara erişmenin yollarıdır. Bu aynı zamanda odanızı başkalarıyla kolayca paylaşabilmenizi sağlar.
+Adres, odayı %1$s genel oda dizininde görünür kılmak için de gereklidir."</string>
+  <string name="screen_security_and_privacy_title">"Güvenlik ve gizlilik"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Katılmak için sor"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Şifreleme"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Herkes"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Oda görünürlüğü"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml b/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml
new file mode 100644
index 0000000000..b631ee092b
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Вам знадобиться адреса кімнати, щоб зробити її видимою в каталозі."</string>
+  <string name="screen_edit_room_address_title">"Адреса кімнати"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Додати адресу кімнати"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Будь-хто може надіслати запит приєднатися до кімнати, але адміністратор або модератор повинні прийняти запит."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Так, увімкнути шифрування"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Після ввімкнення шифрування кімнати, його неможливо вимкнути, історію повідомлень бачитимуть лише учасники кімнати, яких було запрошено або які приєдналися до кімнати.
+Ніхто, крім учасників кімнати, не зможе прочитати повідомлення. Це може перешкоджати коректній роботі ботів і мостів.
+Ми не радимо вмикати шифрування для кімнат, які будь-хто може знайти та до яких може приєднатися всі."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Увімкнути шифрування?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Після ввімкнення шифрування неможливо вимкнути."</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Увімкнути наскрізне шифрування"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Будь-хто може знайти та приєднатися."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Будь-хто"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Люди можуть приєднатися, лише якщо їх запросили"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Лише запрошені"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Доступ до кімнати"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Простори наразі не підтримуються"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Учасники простору"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Вам знадобиться адреса кімнати, щоб зробити її видимою в каталозі кімнат."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Адреса кімнати"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Дозвольте, щоб цю кімнату можна було знайти за допомогою пошуку в каталозі загальнодоступних кімнат %1$s "</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Видима в каталозі загальнодоступних кімнат"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Хто може читати історію"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Лише учасники з моменту запрошення"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Лише учасники після вибору цього параметра"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Адреси кімнат — це спосіб знайти кімнату та отримати до неї доступ. Це також гарантує, що ви можете легко поділитися своєю кімнатою з іншими.
+Ви можете опублікувати свою кімнату в каталозі загальнодоступних кімнат вашого домашнього сервера."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Публікація в кімнаті"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Адреси кімнат — це спосіб знайти та отримати доступ до кімнат. Це також гарантує, що ви зможете легко поділитися своєю кімнатою з іншими.
+Адреса також необхідна, щоб зробити кімнату видимою в каталозі загальнодоступних кімнат %1$s."</string>
+  <string name="screen_security_and_privacy_title">"Безпека й приватність"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Запросити приєднатися"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Шифрування"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Кожний"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Видимість кімнати"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml b/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml
new file mode 100644
index 0000000000..157e8f8418
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Qo‘shilishni so‘rang"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Shifrlash"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Har kim"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Xonaning ko‘rinishi"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml b/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml
new file mode 100644
index 0000000000..44a21456f4
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"您需要聊天室地址才能在目錄中顯示它。"</string>
+  <string name="screen_edit_room_address_title">"聊天室地址"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"新增聊天室地址"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"任何人都可以要求加入聊天室，但管理員必須接受請求。"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是的，啟用加密"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"啟用後就無法停用聊天室的加密，只有受邀的聊天室成員或加入聊天室後才能看到訊息歷史紀錄。
+除了聊天室成員以外，任何人都不能讀取訊息。這可能會讓機器人與橋接無法正常運作。
+我們不建議對任何人都可以找到並加入的聊天室啟用加密。"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"啟用加密？"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"一旦啟用就無法停用加密。"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"啟用端到端加密"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以找到並加入"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"任何人"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"人們僅有受到邀請時才能加入"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"僅限邀請"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"聊天室存取權"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"目前不支援空間"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"空間成員"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"您需要聊天室地址才能在聊天室目錄中顯示。"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"聊天室地址"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允許透過搜尋 %1$s 公開聊天室目錄找到此聊天室"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"在公開聊天室目錄中可見"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"誰可以讀取歷史紀錄"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"僅在成員被邀請後"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"選取此選項後僅限成員"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"聊天室地址是尋找與存取聊天室的方法。也確保您可以輕鬆與其他人分享聊天室。
+您可以選擇在家伺服器公開聊天室目錄中發佈您的聊天室。"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"聊天室發佈"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"聊天室地址是尋找與存取聊天室的方法。也確保您可以輕鬆與其他人分享聊天室。
+若要讓聊天室在 %1$s 公開聊天室目錄中可見，地址也是必要的。"</string>
+  <string name="screen_security_and_privacy_title">"安全與隱私"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"要求加入"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"加密"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"聊天室能見度"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml b/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml
new file mode 100644
index 0000000000..1dd91a684d
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"你需要房间地址才能使其在目录中可见。"</string>
+  <string name="screen_edit_room_address_title">"房间地址"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"添加房间地址"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"任何人都可以请求加入房间，但必须由管理员或版主接受请求。"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是的，启用加密"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"一旦启用，就不能再禁用房间的加密功能。消息历史记录只能在房间成员被邀请或加入房间后才可见。
+除房间成员外，任何人都无法阅读信息。这可能会妨碍机器人和网桥正常工作。
+我们不建议对任何人都能找到并加入的房间启用加密。"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"启用加密？"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"加密一旦启用，就无法禁用。"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"启用端到端加密"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以找到并加入"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"任何人"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"只有受邀者才能加入"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"仅限邀请"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"房间访问权限"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"目前不支持空间"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"空间成员"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"你需要有房间地址才能使其在房间目录中可见。"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"房间地址"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允许通过搜索 %1$s 的公共房间目录来发现此房间"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"在公共房间目录中可见"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"谁可以读取历史记录"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"仅限被邀请的成员"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"仅自选择此选项以来的成员"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"房间地址是查找和访问房间的方式。这也确保你可以轻松地向他人分享房间。
+你可以选择在你服务器的公共房间目录中发布你的房间。"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"房间发布"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"房间地址是查找和访问房间的方式。这也确保你可以轻松地向他人分享房间。
+在 %1$s 的公共房间目录中显示该房间时也需要地址。"</string>
+  <string name="screen_security_and_privacy_title">"安全与隐私"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"请求加入"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"加密"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"房间可见性"</string>
+</resources>
\ No newline at end of file
diff --git a/features/securityandprivacy/impl/src/main/res/values/localazy.xml b/features/securityandprivacy/impl/src/main/res/values/localazy.xml
new file mode 100644
index 0000000000..b0e8195733
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values/localazy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"You’ll need an address in order to make it visible in the public directory."</string>
+  <string name="screen_edit_room_address_title">"Edit address"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Add room address"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Anyone can request access but an administrator must accept the request."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Ask to join"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Yes, enable encryption"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Once enabled, encryption for a room cannot be disabled, Message history will only be visible for room members since they were invited or since they joined the room.
+No one besides the room members will be able to read messages. This may prevent bots and bridges to work correctly.
+We do not recommend enabling encryption for rooms that anyone can find and join."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Enable encryption?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Once enabled, encryption cannot be disabled."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Encryption"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Enable end-to-end encryption"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Anyone can join."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Public"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Only invited people can join."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Private"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Access"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spaces are not currently supported"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Space members"</string>
+  <string name="screen_security_and_privacy_room_address_description">"You’ll need an address in order to make it visible in the public directory."</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"You’ll need a room address in order to make it visible in the room directory."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Published address"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Allow for this room to be found by searching %1$s public room directory"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Allow to be found by searching the public directory."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible in public directory"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Anyone"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Who can read history"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Members only since they were invited"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Members only since selecting this option"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.
+You can choose to publish your room in your homeserver public room directory."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Room publishing"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.
+The address is also required to make the room visible in %1$s public room directory."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Room visibility"</string>
+  <string name="screen_security_and_privacy_title">"Security &amp; privacy"</string>
+</resources>
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/FakeSecurityAndPrivacyNavigator.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/FakeSecurityAndPrivacyNavigator.kt
similarity index 90%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/FakeSecurityAndPrivacyNavigator.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/FakeSecurityAndPrivacyNavigator.kt
index 4ba6019f77..9ca3cc5288 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/FakeSecurityAndPrivacyNavigator.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/FakeSecurityAndPrivacyNavigator.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl
 
 import io.element.android.tests.testutils.lambda.lambdaError
 
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenterTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyPresenterTest.kt
similarity index 97%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenterTest.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyPresenterTest.kt
index 34edea50fb..bdae5274f0 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenterTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyPresenterTest.kt
@@ -6,9 +6,13 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyEvents
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyHistoryVisibility
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyPresenter
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyRoomAccess
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.featureflag.api.FeatureFlagService
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyViewTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
similarity index 90%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyViewTest.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
index 93d644121c..c7ab57a577 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyViewTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy
+package io.element.android.features.securityandprivacy.impl
 
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
@@ -14,7 +14,13 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.element.android.features.roomdetails.impl.R
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyEvents
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyHistoryVisibility
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyRoomAccess
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyState
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyView
+import io.element.android.features.securityandprivacy.impl.root.aSecurityAndPrivacySettings
+import io.element.android.features.securityandprivacy.impl.root.aSecurityAndPrivacyState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenterTest.kt
similarity index 93%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenterTest.kt
index 75d7b44a95..aac25ec018 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenterTest.kt
@@ -6,12 +6,11 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.roomdetails.impl.aJoinedRoom
-import io.element.android.features.roomdetails.impl.securityandprivacy.FakeSecurityAndPrivacyNavigator
-import io.element.android.features.roomdetails.impl.securityandprivacy.SecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.FakeSecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.room.JoinedRoom
@@ -21,6 +20,7 @@ import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.alias.FakeRoomAliasHelper
 import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidity
 import io.element.android.tests.testutils.lambda.assert
@@ -31,11 +31,13 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import java.util.Optional
 
-class EditBaseRoomAddressPresenterTest {
+class EditRoomAddressPresenterTest {
     @Test
     fun `present - initial state no address`() = runTest {
         val presenter = createEditRoomAddressPresenter(
-            room = aJoinedRoom(displayName = "")
+            room = FakeJoinedRoom().apply {
+                givenRoomInfo(aRoomInfo(name = ""))
+            }
         )
         presenter.test {
             with(awaitItem()) {
@@ -50,9 +52,9 @@ class EditBaseRoomAddressPresenterTest {
 
     @Test
     fun `present - initial state address matching own homeserver`() = runTest {
-        val room = aJoinedRoom(
-            canonicalAlias = RoomAlias("#canonical:matrix.org"),
-        )
+        val room = FakeJoinedRoom().apply {
+            givenRoomInfo(aRoomInfo(canonicalAlias = RoomAlias("#canonical:matrix.org")))
+        }
         val presenter = createEditRoomAddressPresenter(room = room)
         presenter.test {
             with(awaitItem()) {
@@ -67,10 +69,14 @@ class EditBaseRoomAddressPresenterTest {
 
     @Test
     fun `present - initial state address not matching own homeserver`() = runTest {
-        val room = aJoinedRoom(
-            displayName = "",
-            canonicalAlias = RoomAlias("#canonical:notmatrix.org"),
-        )
+        val room = FakeJoinedRoom().apply {
+            givenRoomInfo(
+                aRoomInfo(
+                    name = "",
+                    canonicalAlias = RoomAlias("#canonical:notmatrix.org")
+                )
+            )
+        }
         val presenter = createEditRoomAddressPresenter(room = room)
         presenter.test {
             with(awaitItem()) {
@@ -196,12 +202,13 @@ class EditBaseRoomAddressPresenterTest {
 
         val navigator = FakeSecurityAndPrivacyNavigator(closeEditRoomAddressLambda = closeEditAddressLambda)
         val canonicalAlias = RoomAlias("#canonical:matrix.org")
-        val room = aJoinedRoom(
-            canonicalAlias = canonicalAlias,
+        val room = FakeJoinedRoom(
             updateCanonicalAliasResult = updateCanonicalAliasResult,
             publishRoomAliasInRoomDirectoryResult = publishAliasInRoomDirectoryResult,
             removeRoomAliasFromRoomDirectoryResult = removeAliasFromRoomDirectoryResult
-        )
+        ).apply {
+            givenRoomInfo(aRoomInfo(canonicalAlias = canonicalAlias))
+        }
         val presenter = createEditRoomAddressPresenter(room = room, navigator = navigator)
         presenter.test {
             with(awaitItem()) {
@@ -246,12 +253,13 @@ class EditBaseRoomAddressPresenterTest {
 
         val navigator = FakeSecurityAndPrivacyNavigator(closeEditRoomAddressLambda = closeEditAddressLambda)
         val canonicalAlias = RoomAlias("#canonical:notmatrix.org")
-        val room = aJoinedRoom(
-            canonicalAlias = canonicalAlias,
+        val room = FakeJoinedRoom(
             updateCanonicalAliasResult = updateCanonicalAliasResult,
             publishRoomAliasInRoomDirectoryResult = publishAliasInRoomDirectoryResult,
             removeRoomAliasFromRoomDirectoryResult = removeAliasFromRoomDirectoryResult
-        )
+        ).apply {
+            givenRoomInfo(aRoomInfo(canonicalAlias = canonicalAlias))
+        }
         val presenter = createEditRoomAddressPresenter(room = room, navigator = navigator)
         presenter.test {
             with(awaitItem()) {
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressViewTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt
similarity index 97%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressViewTest.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt
index ff6a75881b..17d6f3a88d 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressViewTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
@@ -29,7 +29,7 @@ import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class EditBaseRoomAddressViewTest {
+class EditRoomAddressViewTest {
     @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test
diff --git a/features/securityandprivacy/test/build.gradle.kts b/features/securityandprivacy/test/build.gradle.kts
new file mode 100644
index 0000000000..903ef6d194
--- /dev/null
+++ b/features/securityandprivacy/test/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.securityandprivacy.test"
+}
+
+dependencies {
+    implementation(projects.features.securityandprivacy.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/securityandprivacy/test/src/main/kotlin/io/element/android/features/securityandprivacy/test/FakeSecurityAndPrivacyEntryPoint.kt b/features/securityandprivacy/test/src/main/kotlin/io/element/android/features/securityandprivacy/test/FakeSecurityAndPrivacyEntryPoint.kt
new file mode 100644
index 0000000000..f316b2fe96
--- /dev/null
+++ b/features/securityandprivacy/test/src/main/kotlin/io/element/android/features/securityandprivacy/test/FakeSecurityAndPrivacyEntryPoint.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securityandprivacy.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeSecurityAndPrivacyEntryPoint : SecurityAndPrivacyEntryPoint {
+    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+        lambdaError()
+    }
+}
diff --git a/tools/localazy/config.json b/tools/localazy/config.json
index 8cb1228b94..46908438b5 100644
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@@ -377,6 +377,13 @@
         "screen_room_member_list.*",
         "screen\\.room_member_list\\..*"
       ]
+    },
+    {
+      "name" : ":features:securityandprivacy:impl",
+      "includeRegex" : [
+        "screen\\.edit_room_address\\..*",
+        "screen\\.security_and_privacy\\..*"
+      ]
     }
   ]
 }

From 2774a07b559acf598806f22094a6b4e230fd15a2 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 19 Nov 2025 14:52:59 +0100
Subject: [PATCH 066/113] change(security and privacy) : add isSpace and update
 state provider

---
 .../impl/root/SecurityAndPrivacyPresenter.kt  |   1 +
 .../impl/root/SecurityAndPrivacyState.kt      |   5 +-
 .../root/SecurityAndPrivacyStateProvider.kt   | 109 ++++++++++--------
 3 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
index 7c0c04f8c3..fa51008113 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
@@ -160,6 +160,7 @@ class SecurityAndPrivacyPresenter(
             isKnockEnabled = isKnockEnabled,
             saveAction = saveAction.value,
             permissions = permissions,
+            isSpace = roomInfo.isSpace,
             eventSink = ::handleEvent,
         )
 
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
index be9c24dc65..06a283657b 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
@@ -22,6 +22,7 @@ data class SecurityAndPrivacyState(
     val showEnableEncryptionConfirmation: Boolean,
     val isKnockEnabled: Boolean,
     val saveAction: AsyncAction<Unit>,
+    val isSpace: Boolean,
     private val permissions: SecurityAndPrivacyPermissions,
     val eventSink: (SecurityAndPrivacyEvents) -> Unit
 ) {
@@ -38,8 +39,8 @@ data class SecurityAndPrivacyState(
 
     val showRoomAccessSection = permissions.canChangeRoomAccess
     val showRoomVisibilitySections = permissions.canChangeRoomVisibility && editedSettings.roomAccess != SecurityAndPrivacyRoomAccess.InviteOnly
-    val showHistoryVisibilitySection = permissions.canChangeHistoryVisibility
-    val showEncryptionSection = permissions.canChangeEncryption
+    val showHistoryVisibilitySection = permissions.canChangeHistoryVisibility && !isSpace
+    val showEncryptionSection = permissions.canChangeEncryption && !isSpace
 }
 
 data class SecurityAndPrivacySettings(
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
index c13fc36d34..3f55449b51 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
@@ -15,56 +15,67 @@ import io.element.android.libraries.architecture.AsyncData
 
 open class SecurityAndPrivacyStateProvider : PreviewParameterProvider<SecurityAndPrivacyState> {
     override val values: Sequence<SecurityAndPrivacyState>
-        get() = sequenceOf(
-            aSecurityAndPrivacyState(),
-            aSecurityAndPrivacyState(
-                editedSettings = aSecurityAndPrivacySettings(
-                    roomAccess = SecurityAndPrivacyRoomAccess.AskToJoin
-                )
-            ),
-            aSecurityAndPrivacyState(
-                editedSettings = aSecurityAndPrivacySettings(
-                    roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
-                    isEncrypted = false,
-                )
-            ),
-            aSecurityAndPrivacyState(
-                savedSettings = aSecurityAndPrivacySettings(
-                    roomAccess = SecurityAndPrivacyRoomAccess.SpaceMember
-                ),
-                isKnockEnabled = false,
-            ),
-            aSecurityAndPrivacyState(
-                editedSettings = aSecurityAndPrivacySettings(
-                    roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
-                    address = "#therapy:myserver.xyz"
-                )
-            ),
-            aSecurityAndPrivacyState(
-                editedSettings = aSecurityAndPrivacySettings(
-                    isVisibleInRoomDirectory = AsyncData.Loading()
-                )
-            ),
-            aSecurityAndPrivacyState(
-                editedSettings = aSecurityAndPrivacySettings(
-                    isVisibleInRoomDirectory = AsyncData.Success(true)
-                )
-            ),
-            aSecurityAndPrivacyState(
-                showEncryptionConfirmation = true
-            ),
-            aSecurityAndPrivacyState(
-                saveAction = AsyncAction.Loading
-            ),
-            aSecurityAndPrivacyState(
-                savedSettings = aSecurityAndPrivacySettings(
-                    roomAccess = SecurityAndPrivacyRoomAccess.AskToJoin
-                ),
-                isKnockEnabled = false,
-            ),
-        )
+        get() = securityAndPrivacyStates(isSpace = false) + securityAndPrivacyStates(isSpace = true)
 }
 
+private fun securityAndPrivacyStates(isSpace: Boolean): Sequence<SecurityAndPrivacyState> = sequenceOf(
+    aSecurityAndPrivacyState(isSpace = isSpace),
+    aSecurityAndPrivacyState(
+        editedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.AskToJoin,
+        ),
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        editedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
+            isEncrypted = false,
+        ),
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        savedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.SpaceMember
+        ),
+        isSpace = isSpace,
+        isKnockEnabled = false,
+    ),
+    aSecurityAndPrivacyState(
+        editedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
+            address = "#therapy:myserver.xyz"
+        ),
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        editedSettings = aSecurityAndPrivacySettings(
+            isVisibleInRoomDirectory = AsyncData.Loading()
+        ),
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        editedSettings = aSecurityAndPrivacySettings(
+            isVisibleInRoomDirectory = AsyncData.Success(true)
+        ),
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        showEncryptionConfirmation = true,
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        saveAction = AsyncAction.Loading,
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        savedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.AskToJoin
+        ),
+        isSpace = isSpace,
+        isKnockEnabled = false,
+    ),
+)
+
 fun aSecurityAndPrivacySettings(
     roomAccess: SecurityAndPrivacyRoomAccess = SecurityAndPrivacyRoomAccess.InviteOnly,
     isEncrypted: Boolean = true,
@@ -92,6 +103,7 @@ fun aSecurityAndPrivacyState(
         canChangeRoomVisibility = true
     ),
     isKnockEnabled: Boolean = true,
+    isSpace: Boolean = false,
     eventSink: (SecurityAndPrivacyEvents) -> Unit = {}
 ) = SecurityAndPrivacyState(
     editedSettings = editedSettings,
@@ -101,5 +113,6 @@ fun aSecurityAndPrivacyState(
     saveAction = saveAction,
     isKnockEnabled = isKnockEnabled,
     permissions = permissions,
+    isSpace = isSpace,
     eventSink = eventSink
 )

From 355e1b2f3d18123ae2fe951a16d07e95eee2537f Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 19 Nov 2025 15:32:51 +0100
Subject: [PATCH 067/113] change(security and privacy) : makes sure room
 visibility sections is shown when needed

---
 .../impl/root/SecurityAndPrivacyState.kt           | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
index 06a283657b..61e8ffd17c 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
@@ -38,7 +38,10 @@ data class SecurityAndPrivacyState(
     }.toImmutableSet()
 
     val showRoomAccessSection = permissions.canChangeRoomAccess
-    val showRoomVisibilitySections = permissions.canChangeRoomVisibility && editedSettings.roomAccess != SecurityAndPrivacyRoomAccess.InviteOnly
+
+    val showRoomVisibilitySections = permissions.canChangeRoomVisibility &&
+        editedSettings.roomAccess.canConfigureRoomVisibility()
+
     val showHistoryVisibilitySection = permissions.canChangeHistoryVisibility && !isSpace
     val showEncryptionSection = permissions.canChangeEncryption && !isSpace
 }
@@ -72,7 +75,14 @@ enum class SecurityAndPrivacyRoomAccess {
     InviteOnly,
     AskToJoin,
     Anyone,
-    SpaceMember
+    SpaceMember;
+
+    fun canConfigureRoomVisibility(): Boolean {
+        return when (this) {
+            InviteOnly, SpaceMember -> false
+            AskToJoin, Anyone -> true
+        }
+    }
 }
 
 sealed class SecurityAndPrivacyFailures : Exception() {

From 6ed7a6107d82cd43ba0a9342ca72d39bd8c4b2bb Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 19 Nov 2025 15:50:07 +0100
Subject: [PATCH 068/113] change(security and privacy) : update access items

---
 .../impl/root/SecurityAndPrivacyView.kt       | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
index 7eeabba3c0..4523be8d0c 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
@@ -187,11 +187,22 @@ private fun RoomAccessSection(
         modifier = modifier,
     ) {
         ListItem(
-            headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_invite_only_option_title)) },
-            supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_invite_only_option_description)) },
-            trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.InviteOnly),
-            onClick = { onSelectOption(SecurityAndPrivacyRoomAccess.InviteOnly) },
+            headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_anyone_option_title)) },
+            supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_anyone_option_description)) },
+            trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.Anyone),
+            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Public())),
+            onClick = { onSelectOption(SecurityAndPrivacyRoomAccess.Anyone) },
         )
+        // Show space member option, but disabled as we don't support this option for now.
+        if (saved == SecurityAndPrivacyRoomAccess.SpaceMember) {
+            ListItem(
+                headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_title)) },
+                supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_description)) },
+                trailingContent = ListItemContent.RadioButton(selected =  edited == SecurityAndPrivacyRoomAccess.SpaceMember, enabled = false),
+                leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Workspace())),
+                enabled = false,
+            )
+        }
         // Show Ask to join option in two cases:
         // - the Knock FF is enabled
         // - AskToJoin is the current saved value
@@ -201,24 +212,18 @@ private fun RoomAccessSection(
                 supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_ask_to_join_option_description)) },
                 trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.AskToJoin),
                 onClick = { onSelectOption(SecurityAndPrivacyRoomAccess.AskToJoin) },
+                leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.UserAdd())),
                 enabled = isKnockEnabled,
             )
         }
         ListItem(
-            headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_anyone_option_title)) },
-            supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_anyone_option_description)) },
-            trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.Anyone),
-            onClick = { onSelectOption(SecurityAndPrivacyRoomAccess.Anyone) },
+            headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_invite_only_option_title)) },
+            supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_invite_only_option_description)) },
+            trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.InviteOnly),
+            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),
+            onClick = { onSelectOption(SecurityAndPrivacyRoomAccess.InviteOnly) },
         )
-        // Show space member option, but disabled as we don't support this option for now.
-        if (saved == SecurityAndPrivacyRoomAccess.SpaceMember) {
-            ListItem(
-                headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_title)) },
-                supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_description)) },
-                trailingContent = ListItemContent.RadioButton(selected = true, enabled = false),
-                enabled = false,
-            )
-        }
+
     }
 }
 
@@ -259,7 +264,7 @@ private fun RoomAddressSection(
                 Text(text = roomAddress ?: stringResource(R.string.screen_security_and_privacy_add_room_address_action))
             },
             trailingContent = if (roomAddress.isNullOrEmpty()) ListItemContent.Icon(IconSource.Vector(CompoundIcons.Plus())) else null,
-            supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_address_section_footer)) },
+            supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_address_description)) },
             onClick = onRoomAddressClick,
             colors = ListItemDefaults.colors(trailingIconColor = ElementTheme.colors.iconAccentPrimary),
         )
@@ -267,7 +272,7 @@ private fun RoomAddressSection(
         ListItem(
             headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_directory_visibility_toggle_title)) },
             supportingContent = {
-                Text(text = stringResource(R.string.screen_security_and_privacy_room_directory_visibility_section_footer, homeserverName))
+                Text(text = stringResource(R.string.screen_security_and_privacy_room_directory_visibility_toggle_description, homeserverName))
             },
             onClick = if (isVisibleInRoomDirectory.isSuccess()) onVisibilityChange else null,
             trailingContent = when (isVisibleInRoomDirectory) {

From 519b6c28878fb619c8049bde4473876a3e3440eb Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 19 Nov 2025 16:55:18 +0100
Subject: [PATCH 069/113] change(security and privacy) : retain state in node

---
 .../securityandprivacy/impl/root/SecurityAndPrivacyNode.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyNode.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyNode.kt
index 87ba27cb02..5e329a06f6 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyNode.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyNode.kt
@@ -9,6 +9,8 @@
 package io.element.android.features.securityandprivacy.impl.root
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
@@ -18,6 +20,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
+import io.element.android.libraries.architecture.appyx.launchMolecule
 import io.element.android.libraries.di.RoomScope
 
 @ContributesNode(RoomScope::class)
@@ -30,9 +33,11 @@ class SecurityAndPrivacyNode(
     private val navigator = plugins<SecurityAndPrivacyNavigator>().first()
     private val presenter = presenterFactory.create(navigator)
 
+    private val stateFlow = launchMolecule { presenter.present() }
+
     @Composable
     override fun View(modifier: Modifier) {
-        val state = presenter.present()
+        val state by stateFlow.collectAsState()
         SecurityAndPrivacyView(
             state = state,
             onBackClick = this::navigateUp,

From 11bd9f5e8880f3b91f5425505586a67098ddf34a Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 19 Nov 2025 16:55:27 +0100
Subject: [PATCH 070/113] change(security and privacy) : clean code

---
 .../impl/root/SecurityAndPrivacyPresenter.kt                   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
index fa51008113..e1766f3220 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
@@ -75,12 +75,11 @@ class SecurityAndPrivacyPresenter(
 
         val savedSettings by remember {
             derivedStateOf {
-                val historyVisibility = roomInfo.historyVisibility.map()
                 SecurityAndPrivacySettings(
                     roomAccess = roomInfo.joinRule.map(),
                     isEncrypted = roomInfo.isEncrypted == true,
                     isVisibleInRoomDirectory = savedIsVisibleInRoomDirectory.value,
-                    historyVisibility = historyVisibility,
+                    historyVisibility = roomInfo.historyVisibility.map(),
                     address = roomInfo.firstDisplayableAlias(homeserverName)?.value,
                 )
             }

From 717584f5128fd6d1d13fdc9f83e04305892793c8 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 19 Nov 2025 21:44:39 +0100
Subject: [PATCH 071/113] change(security and privacy) : display
 SaveChangesDialog on exit

---
 .../impl/root/SecurityAndPrivacyEvents.kt     |  2 +
 .../impl/root/SecurityAndPrivacyPresenter.kt  | 15 +++++-
 .../impl/root/SecurityAndPrivacyState.kt      |  1 +
 .../root/SecurityAndPrivacyStateProvider.kt   | 53 ++++++++++++-------
 .../impl/root/SecurityAndPrivacyView.kt       | 22 +++++++-
 5 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt
index 8119ddb0c4..2553090541 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt
@@ -11,6 +11,8 @@ package io.element.android.features.securityandprivacy.impl.root
 sealed interface SecurityAndPrivacyEvents {
     data object EditRoomAddress : SecurityAndPrivacyEvents
     data object Save : SecurityAndPrivacyEvents
+    data object Exit: SecurityAndPrivacyEvents
+    data object DismissExitConfirmation : SecurityAndPrivacyEvents
     data class ChangeRoomAccess(val roomAccess: SecurityAndPrivacyRoomAccess) : SecurityAndPrivacyEvents
     data object ToggleEncryptionState : SecurityAndPrivacyEvents
     data object CancelEnableEncryption : SecurityAndPrivacyEvents
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
index e1766f3220..5bcbe15f7c 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
@@ -26,6 +26,7 @@ import io.element.android.features.securityandprivacy.impl.editroomaddress.match
 import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissionsAsState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.architecture.AsyncData.*
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.architecture.runUpdatingState
@@ -64,6 +65,7 @@ class SecurityAndPrivacyPresenter(
             featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock)
         }.collectAsState(false)
         val saveAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
+        var confirmExitAction by remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)}
         val homeserverName = remember { matrixClient.userIdServerName() }
         val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
         val roomInfo by room.roomInfoFlow.collectAsState()
@@ -133,7 +135,7 @@ class SecurityAndPrivacyPresenter(
                 }
                 SecurityAndPrivacyEvents.ToggleRoomVisibility -> {
                     editedVisibleInRoomDirectory = when (val edited = editedVisibleInRoomDirectory) {
-                        is AsyncData.Success -> AsyncData.Success(!edited.data)
+                        is Success -> Success(!edited.data)
                         else -> edited
                     }
                 }
@@ -148,6 +150,16 @@ class SecurityAndPrivacyPresenter(
                 SecurityAndPrivacyEvents.DismissSaveError -> {
                     saveAction.value = AsyncAction.Uninitialized
                 }
+                SecurityAndPrivacyEvents.Exit -> {
+                    confirmExitAction = if (savedSettings == editedSettings || confirmExitAction.isConfirming()) {
+                        AsyncAction.Success(Unit)
+                    } else {
+                        AsyncAction.ConfirmingNoParams
+                    }
+                }
+                SecurityAndPrivacyEvents.DismissExitConfirmation -> {
+                    confirmExitAction = AsyncAction.Uninitialized
+                }
             }
         }
 
@@ -160,6 +172,7 @@ class SecurityAndPrivacyPresenter(
             saveAction = saveAction.value,
             permissions = permissions,
             isSpace = roomInfo.isSpace,
+            confirmExitAction = confirmExitAction,
             eventSink = ::handleEvent,
         )
 
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
index 61e8ffd17c..0671bbf163 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
@@ -22,6 +22,7 @@ data class SecurityAndPrivacyState(
     val showEnableEncryptionConfirmation: Boolean,
     val isKnockEnabled: Boolean,
     val saveAction: AsyncAction<Unit>,
+    val confirmExitAction: AsyncAction<Unit>,
     val isSpace: Boolean,
     private val permissions: SecurityAndPrivacyPermissions,
     val eventSink: (SecurityAndPrivacyEvents) -> Unit
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
index 3f55449b51..00dc175b4c 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
@@ -15,10 +15,29 @@ import io.element.android.libraries.architecture.AsyncData
 
 open class SecurityAndPrivacyStateProvider : PreviewParameterProvider<SecurityAndPrivacyState> {
     override val values: Sequence<SecurityAndPrivacyState>
-        get() = securityAndPrivacyStates(isSpace = false) + securityAndPrivacyStates(isSpace = true)
+        get() = commonSecurityAndPrivacyStates(isSpace = false) +
+            commonSecurityAndPrivacyStates(isSpace = true) +
+            sequenceOf(
+                aSecurityAndPrivacyState(
+                    saveAction = AsyncAction.Loading,
+                    isSpace = false,
+                ),
+                aSecurityAndPrivacyState(
+                    saveAction = AsyncAction.Failure(SecurityAndPrivacyFailures.SaveFailed),
+                    isSpace = false,
+                ),
+                aSecurityAndPrivacyState(
+                    confirmExitAction = AsyncAction.ConfirmingCancellation,
+                    isSpace = false,
+                ),
+                aSecurityAndPrivacyState(
+                    showEncryptionConfirmation = true,
+                    isSpace = false,
+                ),
+            )
 }
 
-private fun securityAndPrivacyStates(isSpace: Boolean): Sequence<SecurityAndPrivacyState> = sequenceOf(
+private fun commonSecurityAndPrivacyStates(isSpace: Boolean): Sequence<SecurityAndPrivacyState> = sequenceOf(
     aSecurityAndPrivacyState(isSpace = isSpace),
     aSecurityAndPrivacyState(
         editedSettings = aSecurityAndPrivacySettings(
@@ -26,6 +45,13 @@ private fun securityAndPrivacyStates(isSpace: Boolean): Sequence<SecurityAndPriv
         ),
         isSpace = isSpace,
     ),
+    aSecurityAndPrivacyState(
+        savedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.AskToJoin
+        ),
+        isSpace = isSpace,
+        isKnockEnabled = false,
+    ),
     aSecurityAndPrivacyState(
         editedSettings = aSecurityAndPrivacySettings(
             roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
@@ -49,31 +75,18 @@ private fun securityAndPrivacyStates(isSpace: Boolean): Sequence<SecurityAndPriv
     ),
     aSecurityAndPrivacyState(
         editedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
             isVisibleInRoomDirectory = AsyncData.Loading()
         ),
         isSpace = isSpace,
     ),
     aSecurityAndPrivacyState(
         editedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
             isVisibleInRoomDirectory = AsyncData.Success(true)
         ),
         isSpace = isSpace,
     ),
-    aSecurityAndPrivacyState(
-        showEncryptionConfirmation = true,
-        isSpace = isSpace,
-    ),
-    aSecurityAndPrivacyState(
-        saveAction = AsyncAction.Loading,
-        isSpace = isSpace,
-    ),
-    aSecurityAndPrivacyState(
-        savedSettings = aSecurityAndPrivacySettings(
-            roomAccess = SecurityAndPrivacyRoomAccess.AskToJoin
-        ),
-        isSpace = isSpace,
-        isKnockEnabled = false,
-    ),
 )
 
 fun aSecurityAndPrivacySettings(
@@ -96,6 +109,7 @@ fun aSecurityAndPrivacyState(
     homeserverName: String = "myserver.xyz",
     showEncryptionConfirmation: Boolean = false,
     saveAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    confirmExitAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     permissions: SecurityAndPrivacyPermissions = SecurityAndPrivacyPermissions(
         canChangeRoomAccess = true,
         canChangeHistoryVisibility = true,
@@ -103,7 +117,7 @@ fun aSecurityAndPrivacyState(
         canChangeRoomVisibility = true
     ),
     isKnockEnabled: Boolean = true,
-    isSpace: Boolean = false,
+    isSpace: Boolean,
     eventSink: (SecurityAndPrivacyEvents) -> Unit = {}
 ) = SecurityAndPrivacyState(
     editedSettings = editedSettings,
@@ -111,8 +125,9 @@ fun aSecurityAndPrivacyState(
     homeserverName = homeserverName,
     showEnableEncryptionConfirmation = showEncryptionConfirmation,
     saveAction = saveAction,
+    confirmExitAction = confirmExitAction,
     isKnockEnabled = isKnockEnabled,
     permissions = permissions,
     isSpace = isSpace,
-    eventSink = eventSink
+    eventSink = eventSink,
 )
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
index 4523be8d0c..a4e3396f44 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.features.securityandprivacy.impl.root
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
@@ -31,12 +32,14 @@ import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.securityandprivacy.impl.R
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.libraries.designsystem.components.dialogs.SaveChangesDialog
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
@@ -50,6 +53,7 @@ import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableSet
+import java.security.Security
 
 @Composable
 fun SecurityAndPrivacyView(
@@ -57,12 +61,17 @@ fun SecurityAndPrivacyView(
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    BackHandler {
+        state.eventSink(SecurityAndPrivacyEvents.Exit)
+    }
     Scaffold(
         modifier = modifier,
         topBar = {
             SecurityAndPrivacyToolbar(
                 isSaveActionEnabled = state.canBeSaved,
-                onBackClick = onBackClick,
+                onBackClick = {
+                    state.eventSink(SecurityAndPrivacyEvents.Exit)
+                },
                 onSaveClick = {
                     state.eventSink(SecurityAndPrivacyEvents.Save)
                 },
@@ -131,6 +140,17 @@ fun SecurityAndPrivacyView(
         },
         onRetry = { state.eventSink(SecurityAndPrivacyEvents.Save) },
     )
+    AsyncActionView(
+        async = state.confirmExitAction,
+        onSuccess = { onBackClick() },
+        onErrorDismiss = { },
+        confirmationDialog = {
+            SaveChangesDialog(
+                onSubmitClick = { state.eventSink(SecurityAndPrivacyEvents.Exit) },
+                onDismiss = { state.eventSink(SecurityAndPrivacyEvents.DismissExitConfirmation) }
+            )
+        },
+    )
 }
 
 @OptIn(ExperimentalMaterial3Api::class)

From f775a599d8a40a0508e028a86582f17b7466156e Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 26 Nov 2025 15:16:13 +0100
Subject: [PATCH 072/113] quality: fix formatting and test

---
 .../impl/root/SecurityAndPrivacyEvents.kt     |  2 +-
 .../impl/root/SecurityAndPrivacyPresenter.kt  |  4 +-
 .../root/SecurityAndPrivacyStateProvider.kt   |  2 +-
 .../impl/root/SecurityAndPrivacyView.kt       |  3 +-
 .../impl/SecurityAndPrivacyViewTest.kt        | 42 +++++++++++++++----
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt
index 2553090541..b1d739c45b 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvents.kt
@@ -11,7 +11,7 @@ package io.element.android.features.securityandprivacy.impl.root
 sealed interface SecurityAndPrivacyEvents {
     data object EditRoomAddress : SecurityAndPrivacyEvents
     data object Save : SecurityAndPrivacyEvents
-    data object Exit: SecurityAndPrivacyEvents
+    data object Exit : SecurityAndPrivacyEvents
     data object DismissExitConfirmation : SecurityAndPrivacyEvents
     data class ChangeRoomAccess(val roomAccess: SecurityAndPrivacyRoomAccess) : SecurityAndPrivacyEvents
     data object ToggleEncryptionState : SecurityAndPrivacyEvents
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
index 5bcbe15f7c..dd28ca65dd 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
@@ -21,9 +21,9 @@ import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
+import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissionsAsState
 import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
 import io.element.android.features.securityandprivacy.impl.editroomaddress.matchesServer
-import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissionsAsState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.AsyncData.*
@@ -65,7 +65,7 @@ class SecurityAndPrivacyPresenter(
             featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock)
         }.collectAsState(false)
         val saveAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
-        var confirmExitAction by remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)}
+        var confirmExitAction by remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
         val homeserverName = remember { matrixClient.userIdServerName() }
         val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
         val roomInfo by room.roomInfoFlow.collectAsState()
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
index 00dc175b4c..11e5665c1c 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
@@ -117,7 +117,7 @@ fun aSecurityAndPrivacyState(
         canChangeRoomVisibility = true
     ),
     isKnockEnabled: Boolean = true,
-    isSpace: Boolean,
+    isSpace: Boolean = false,
     eventSink: (SecurityAndPrivacyEvents) -> Unit = {}
 ) = SecurityAndPrivacyState(
     editedSettings = editedSettings,
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
index a4e3396f44..3ba4b8a142 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
@@ -218,7 +218,7 @@ private fun RoomAccessSection(
             ListItem(
                 headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_title)) },
                 supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_description)) },
-                trailingContent = ListItemContent.RadioButton(selected =  edited == SecurityAndPrivacyRoomAccess.SpaceMember, enabled = false),
+                trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.SpaceMember, enabled = false),
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Workspace())),
                 enabled = false,
             )
@@ -243,7 +243,6 @@ private fun RoomAccessSection(
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),
             onClick = { onSelectOption(SecurityAndPrivacyRoomAccess.InviteOnly) },
         )
-
     }
 }
 
diff --git a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
index c7ab57a577..c4c004b265 100644
--- a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
@@ -21,12 +21,12 @@ import io.element.android.features.securityandprivacy.impl.root.SecurityAndPriva
 import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyView
 import io.element.android.features.securityandprivacy.impl.root.aSecurityAndPrivacySettings
 import io.element.android.features.securityandprivacy.impl.root.aSecurityAndPrivacyState
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
-import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
 import org.junit.Rule
 import org.junit.Test
@@ -39,15 +39,41 @@ class SecurityAndPrivacyViewTest {
     @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test
-    fun `click on back invokes expected callback`() {
-        ensureCalledOnce { callback ->
-            rule.setSecurityAndPrivacyView(
-                onBackClick = callback,
-            )
-            rule.pressBack()
-        }
+    fun `click on back invokes emits the expected event`() {
+        val recorder = EventsRecorder<SecurityAndPrivacyEvents>()
+        val state = aSecurityAndPrivacyState(
+            eventSink = recorder,
+        )
+        rule.setSecurityAndPrivacyView(state)
+        rule.pressBack()
+        recorder.assertSingle(SecurityAndPrivacyEvents.Exit)
     }
 
+    @Test
+    fun `confirm cancellation emits the expected event`() {
+        val recorder = EventsRecorder<SecurityAndPrivacyEvents>()
+        val state = aSecurityAndPrivacyState(
+            confirmExitAction = AsyncAction.ConfirmingCancellation,
+            eventSink = recorder,
+        )
+        rule.setSecurityAndPrivacyView(state)
+        rule.clickOn(CommonStrings.action_ok)
+        recorder.assertSingle(SecurityAndPrivacyEvents.Exit)
+    }
+
+    @Test
+    fun `dismiss cancellation confirmation emits the expected event`() {
+        val recorder = EventsRecorder<SecurityAndPrivacyEvents>()
+        val state = aSecurityAndPrivacyState(
+            confirmExitAction = AsyncAction.ConfirmingCancellation,
+            eventSink = recorder,
+        )
+        rule.setSecurityAndPrivacyView(state)
+        rule.clickOn(CommonStrings.action_cancel)
+        recorder.assertSingle(SecurityAndPrivacyEvents.DismissExitConfirmation)
+    }
+
+
     @Test
     fun `click on room access item emits the expected event`() {
         val recorder = EventsRecorder<SecurityAndPrivacyEvents>()

From 47d43c0a1919021d64b5f5549e108a61e8730df5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 15:06:32 +0000
Subject: [PATCH 073/113] fix(deps): update dependency
 org.matrix.rustcomponents:sdk-android to v25.11.26

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c0bb446e87..108b4fde04 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -177,7 +177,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
 # https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
 # All new features should not be implemented in the pull request that upgrades the version, developers should
 # only fix API breaks and may add some TODOs.
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.11.24"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.11.26"
 
 # Others
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }

From 1834d8000fb249d35b6103f3ab97d1a03fafb264 Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Wed, 26 Nov 2025 15:10:07 +0000
Subject: [PATCH 074/113] Update screenshots

---
 ...impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en.png | 3 ---
 ...impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png | 3 ---
 ...impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png | 3 ---
 ...impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png | 3 ---
 ...impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png | 3 ---
 ...impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en.png | 3 ---
 ...impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en.png | 3 ---
 ...impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en.png | 3 ---
 ...impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en.png | 3 ---
 ...impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en.png | 3 ---
 ...mpl.securityandprivacy_SecurityAndPrivacyViewLight_0_en.png | 3 ---
 ...mpl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png | 3 ---
 ...mpl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png | 3 ---
 ...mpl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png | 3 ---
 ...mpl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png | 3 ---
 ...mpl.securityandprivacy_SecurityAndPrivacyViewLight_5_en.png | 3 ---
 ...mpl.securityandprivacy_SecurityAndPrivacyViewLight_6_en.png | 3 ---
 ...mpl.securityandprivacy_SecurityAndPrivacyViewLight_7_en.png | 3 ---
 ...mpl.securityandprivacy_SecurityAndPrivacyViewLight_8_en.png | 3 ---
 ...mpl.securityandprivacy_SecurityAndPrivacyViewLight_9_en.png | 3 ---
 ...vacy.impl.editroomaddress_EditRoomAddressView_Day_0_en.png} | 0
 ...vacy.impl.editroomaddress_EditRoomAddressView_Day_1_en.png} | 0
 ...vacy.impl.editroomaddress_EditRoomAddressView_Day_2_en.png} | 0
 ...vacy.impl.editroomaddress_EditRoomAddressView_Day_3_en.png} | 0
 ...vacy.impl.editroomaddress_EditRoomAddressView_Day_4_en.png} | 0
 ...cy.impl.editroomaddress_EditRoomAddressView_Night_0_en.png} | 0
 ...cy.impl.editroomaddress_EditRoomAddressView_Night_1_en.png} | 0
 ...cy.impl.editroomaddress_EditRoomAddressView_Night_2_en.png} | 0
 ...cy.impl.editroomaddress_EditRoomAddressView_Night_3_en.png} | 0
 ...cy.impl.editroomaddress_EditRoomAddressView_Night_4_en.png} | 0
 ...ityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png | 3 +++
 ...ityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png | 3 +++
 ...ityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png | 3 +++
 ...ityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png | 3 +++
 ...ityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png | 3 +++
 ...ityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png | 3 +++
 ...ityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png | 3 +++
 ...ityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png | 3 +++
 ...ityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png | 3 +++
 ...ityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png | 3 +++
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png | 3 +++
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png | 3 +++
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png | 3 +++
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png | 3 +++
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png | 3 +++
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png | 3 +++
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png | 3 +++
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png | 3 +++
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png | 3 +++
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png | 3 +++
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png | 3 +++
 70 files changed, 120 insertions(+), 60 deletions(-)
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en.png
 delete mode 100644 tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en.png
 rename tests/uitests/src/test/snapshots/images/{features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en.png => features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en.png => features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en.png => features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en.png => features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en.png => features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en.png => features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_0_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en.png => features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_1_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en.png => features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_2_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en.png => features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_3_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en.png => features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_4_en.png} (100%)
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png

diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en.png
deleted file mode 100644
index 8971f2f33c..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54c924c8f8874050a874ba7cf46c2518c682c7bdb0987a5c3ce10a43b8faceb3
-size 36216
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png
deleted file mode 100644
index 5ffb675c87..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b4701427ccafa8bb12a8f384433862770b84c650268772e11df91343c25bb1b0
-size 56924
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png
deleted file mode 100644
index f227c74f10..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b307b024232c5033ab6aaf2930f244106fdb5a2bdd6c4919c24a60266fb4a814
-size 54885
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png
deleted file mode 100644
index 08e6c8aad9..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aad071d4ebb05c5db831bbf75021b7dcc9de185455c7f0292d3275247bcd5b75
-size 57403
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png
deleted file mode 100644
index 474c7943ff..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25c09f5b840f62fc4d71b15acefb6ad73f64df7ed6e7228d0cdfd16487f1e20e
-size 57503
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en.png
deleted file mode 100644
index dabb4ac712..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2864979f28763dc975a79402d38f38cbbe52b0a9338847d8848cbf71b1423dfe
-size 36089
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en.png
deleted file mode 100644
index dabb4ac712..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2864979f28763dc975a79402d38f38cbbe52b0a9338847d8848cbf71b1423dfe
-size 36089
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en.png
deleted file mode 100644
index 31768159c1..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb41d1dd32d3812de94dca3236e83c35c54024a97402044d75e541476bb265a4
-size 41684
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en.png
deleted file mode 100644
index 014cfe0f8c..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee12f0c2d1950347357914a3dcd69feafca46a6bcaa3de779493d1aa14fefa2b
-size 31249
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en.png
deleted file mode 100644
index 1dc35b3b2b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:53101722bdc3002df0d01827753d56cd0d47676396967b4c0d8b01fe9d048947
-size 56621
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en.png
deleted file mode 100644
index 4de3f3321f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccb10ece709e70a13ce8ee8d4c37d4d4cc3ad3b17cf8697306cf5919877377b9
-size 37712
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png
deleted file mode 100644
index 43b341d174..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d3bc2a629aceda805d0976f46c6cf9ddca8ef05123fafe5d51500d68fea5c99
-size 58981
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png
deleted file mode 100644
index 2ae2618dac..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:518131a76d772d7b7eddbf74702e4a2a477dfea2ae9b89de58269d02820bfdca
-size 56907
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png
deleted file mode 100644
index afbdc3a813..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:767c62fbb463557379dae310a4d830c0f86818ace934a25307ea3befe86042ac
-size 59459
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png
deleted file mode 100644
index 52568b8670..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b85a87cdb67b1ef8280d65e77abb77f6319a029a571a0747c4c56c2f4a652824
-size 59580
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en.png
deleted file mode 100644
index a03986e6ef..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2cbb5af6e3c4ee623911ac087257771a72e461777cc2485a09575e96d53e57e1
-size 37563
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en.png
deleted file mode 100644
index a03986e6ef..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2cbb5af6e3c4ee623911ac087257771a72e461777cc2485a09575e96d53e57e1
-size 37563
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en.png
deleted file mode 100644
index 8751501f2f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3099335a1567dfde3a68d7af8c894f9bdd4c29882eccd3d4e3756450f15e50a9
-size 43759
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en.png
deleted file mode 100644
index cc45166325..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f6cddc09a2a9668af04a8da45dd6edd8c8cf6bfcf9b104f21dce91663940868
-size 32691
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en.png
deleted file mode 100644
index 47ebe3a1fd..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:083a8f10725f4573807865f02b53ca0a3c6ff2bf43d99997afa9412a547c33bd
-size 58652
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en.png
rename to tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en.png
rename to tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en.png
rename to tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en.png
rename to tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en.png
rename to tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en.png
rename to tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_1_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en.png
rename to tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_1_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_2_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en.png
rename to tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_2_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_3_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en.png
rename to tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_3_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_4_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en.png
rename to tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_4_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png
new file mode 100644
index 0000000000..ae15fd2efd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59cfdfa8b68af10024d8650b680481a37b5717d981999adce49a0e62d55e433f
+size 38619
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png
new file mode 100644
index 0000000000..9ac055352b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9c5983ff1143ef6c517dc948b9b60102607ff397748e8d87f3b565ab86efc4b
+size 46360
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png
new file mode 100644
index 0000000000..d5640cc559
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64d0aecdae4cd8c7581ded462d8534620cd006a78a089a4333c1608e8023ead1
+size 46768
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png
new file mode 100644
index 0000000000..52e6f29adb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4230969f15739f418eebe1d4a14e895c84bbe5bdbf832ccc60ae4bfafea0839
+size 19751
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png
new file mode 100644
index 0000000000..6f9172af47
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4eb56b2db5b843d94f89c60baea02809d43733b718c59f0d06c1cee7ad4db9a7
+size 47036
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png
new file mode 100644
index 0000000000..d5640cc559
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64d0aecdae4cd8c7581ded462d8534620cd006a78a089a4333c1608e8023ead1
+size 46768
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png
new file mode 100644
index 0000000000..f367faca6b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3f5880e027ca7f380d24144efe8de3a222e359f5bf2e700f5af701dbe5d9bec
+size 47145
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png
new file mode 100644
index 0000000000..ef258a39e6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6895ffbb2c5b10705135ca748d7bfb243c19c250d5f9a5fa3cedf3f83baba0c
+size 33097
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png
new file mode 100644
index 0000000000..c883064bb0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2701337aad7fcdd419770718dc57c3ff6a1567cf23420624471a23120a3b9f8d
+size 31593
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png
new file mode 100644
index 0000000000..d24af812f5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ced07a8e45e02c9fef27fa7bdbe969a26c73c850672d7b7167c58ff09cd9ed78
+size 32927
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png
new file mode 100644
index 0000000000..a1c720f7c3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f91b888b3948956f57a3d4a94ebea36e5da6c39d606170e3bb748e9caca70127
+size 41892
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png
new file mode 100644
index 0000000000..5b752d5035
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4bda58361cf1c8dd39d634203038ab7c8ac130df1aa465fb9dfb37a439b1c72
+size 59877
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png
new file mode 100644
index 0000000000..22f6338462
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3b390cabae48e7f5487737b89d2d9e7a18f538a4601a0b262fc205954ef70a3
+size 59439
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png
new file mode 100644
index 0000000000..a28746d476
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ec795cb5ffcb06e29be3a59dd95d88232f518bae66f96c05f1b75197cefdbf3
+size 59992
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png
new file mode 100644
index 0000000000..2781d8a337
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d213f421daa486febb24033e0d3928b47e6380e21889636d6b51550ee66b99b8
+size 36843
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png
new file mode 100644
index 0000000000..1a79cae3e1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c604f0a5f6003f51da4dadff3a01080b54ff2f2e34a4a4a9d2fbf0e5fac20221
+size 60117
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png
new file mode 100644
index 0000000000..2393e0a15b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67e064c056d4559c3ab183015f47aed82360c0a9846170ec95f83089c22c22a2
+size 59864
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png
new file mode 100644
index 0000000000..2dd0307a7a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea71f66e3a2e1b3e513c806875d59088a33a4dedcd198b409ef3ec1c6bab59ed
+size 60223
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png
new file mode 100644
index 0000000000..1e97e4c8f2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db47cd993b12896c3439c7f4c9bddde833c5048a33f84b41aa15c48277cd53e9
+size 21577
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png
new file mode 100644
index 0000000000..169f1ad8f9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83a1ff18c075d93b625ab55d2c54a767612b2af278ec6e5d1ebd9a509647c809
+size 46782
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png
new file mode 100644
index 0000000000..41d20622ba
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49bf2a919952035933e6d658076a845845f51fd33c2a3c21cc1f1e332ee95825
+size 40258
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png
new file mode 100644
index 0000000000..ecced7e27f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:808934308408e850551bc3103cee5a37d85d106adf567105003b0144651ca408
+size 47683
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png
new file mode 100644
index 0000000000..e2a98e5f81
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbf2bff6460019434e1af725763ef775240b832b947d7faea760ae08b31a1815
+size 48101
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png
new file mode 100644
index 0000000000..59c10f26e9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7064846fe9af8d99fc1bf40ce410149a9b52cffab7b7d54b4383aace6689933e
+size 20358
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png
new file mode 100644
index 0000000000..ae17ccb1aa
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:805fdb8f857bdffe88caccd4f62bc1c2251a8119a51e865e3b7da9b9f6ff22b0
+size 48377
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png
new file mode 100644
index 0000000000..e2a98e5f81
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbf2bff6460019434e1af725763ef775240b832b947d7faea760ae08b31a1815
+size 48101
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png
new file mode 100644
index 0000000000..a17602cc6d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c121a184f66582bedf67ed73ec4740b3ce6984a264cfe04c241138bfa5d022a7
+size 48562
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png
new file mode 100644
index 0000000000..c7b5337e1b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11edb6109de15b857f90da338a0be8b5f1e202129fc3357ed3669ffc1edbf51a
+size 34662
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png
new file mode 100644
index 0000000000..a32249c2ad
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f55c84fb18a3a60b1621125edc305c6245f1bd042724198bf505ca1b7c39231c
+size 33593
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png
new file mode 100644
index 0000000000..1129971ac4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d11da663b4512e76a74774da0b191dc4a72daa0edfcf68ab011469c73302ff0
+size 35017
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png
new file mode 100644
index 0000000000..d68df083c4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:398a2bb2ea12547edcc0af04fe85c83c4ea19aeb4e385d6e5b81b6a2eef96006
+size 44007
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png
new file mode 100644
index 0000000000..9af2e30e19
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:618d2b08a9eaf0a7e56403125c785937e7078bff435bcc76ecafd068921d8f2a
+size 61912
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png
new file mode 100644
index 0000000000..11df3bd052
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3d9c431a14e527cad513fc92a5081b0b4dc6ae5153d381456684eb06b88e1fe
+size 61491
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png
new file mode 100644
index 0000000000..6e23df8b30
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84aff9af3ac8512db3790f8c41cde10b0fcfdf29b7390ea48f460e4e21a3cbe4
+size 62146
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png
new file mode 100644
index 0000000000..8c60403815
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67467daa13b1a5d404686ddf94ea9a133f3546b43770b6d1e264782ae054f198
+size 38350
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png
new file mode 100644
index 0000000000..40ccd4d4fe
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0312b48791d6c0af66d25b01bc9f9f8f78dbf1808aafbf5251df3c6490e62e3a
+size 62171
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png
new file mode 100644
index 0000000000..b9a696d0d2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9b1fa55fd171af2eef1bd6cb874b0e542dd32332f56e21c430f3f7767d56d35
+size 61905
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png
new file mode 100644
index 0000000000..69b7b4374b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:958b45102cb3fcefd7461f86e1870ac44daf6c9f9b13583ba4f60106c20b6bab
+size 62349
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png
new file mode 100644
index 0000000000..7a45fa88bb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e37f1f6e15cee552219e997aa8dd491e672d73e55900f3e2cbdeea08f1355373
+size 22125
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png
new file mode 100644
index 0000000000..63616838a9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aeff0b99f3ca35b84735ad464c78f4b69ca6ba22bdc67eb4ef56268d04bbb859
+size 48109

From 4af4944a557ab6a5b859bbcb98a2b8fb3a0d0ebd Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 26 Nov 2025 17:03:27 +0100
Subject: [PATCH 075/113] deps: fix api break

---
 .../libraries/matrix/api/auth/qrlogin/QrLoginException.kt        | 1 +
 .../android/libraries/matrix/impl/auth/qrlogin/QrErrorMapper.kt  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt
index 4099e525cf..c81437eff0 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt
@@ -20,4 +20,5 @@ sealed class QrLoginException : Exception() {
     data object CheckCodeAlreadySent : QrLoginException()
     data object CheckCodeCannotBeSent : QrLoginException()
     data object Unknown : QrLoginException()
+    data object NotFound : QrLoginException()
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapper.kt
index 73875da558..65e15b5f2b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapper.kt
@@ -45,5 +45,6 @@ object QrErrorMapper {
         is RustHumanQrLoginException.SlidingSyncNotAvailable -> QrLoginException.SlidingSyncNotAvailable
         is RustHumanQrLoginException.CheckCodeAlreadySent -> QrLoginException.CheckCodeAlreadySent
         is RustHumanQrLoginException.CheckCodeCannotBeSent -> QrLoginException.CheckCodeCannotBeSent
+        is RustHumanQrLoginException.NotFound -> QrLoginException.NotFound
     }
 }

From f3d7b16463ea7b680076ea6175d9ab4965ff9ef6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 26 Nov 2025 17:14:33 +0100
Subject: [PATCH 076/113] Fix crash when recording long voice message.

---
 .../composer/DefaultVoiceMessageComposerPresenter.kt         | 5 ++++-
 .../element/android/libraries/textcomposer/TextComposer.kt   | 5 ++++-
 .../libraries/textcomposer/components/LiveWaveformView.kt    | 2 +-
 .../textcomposer/components/VoiceMessageRecording.kt         | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt
index 1acaae2aae..5405124283 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt
@@ -192,7 +192,10 @@ class DefaultVoiceMessageComposerPresenter(
             voiceMessageState = when (val state = recorderState) {
                 is VoiceRecorderState.Recording -> VoiceMessageState.Recording(
                     duration = state.elapsedTime,
-                    levels = state.levels.toImmutableList(),
+                    levels = state.levels
+                        // Keep only the last 128 samples for display, else we can have a crash
+                        .takeLast(128)
+                        .toImmutableList(),
                 )
                 is VoiceRecorderState.Finished ->
                     previewState(
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
index 5553fd0b01..f2070c9610 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
@@ -299,7 +299,10 @@ fun TextComposer(
                     onSeek = onSeekVoiceMessage,
                 )
             is VoiceMessageState.Recording ->
-                VoiceMessageRecording(voiceMessageState.levels, voiceMessageState.duration)
+                VoiceMessageRecording(
+                    levels = voiceMessageState.levels,
+                    duration = voiceMessageState.duration,
+                )
             VoiceMessageState.Idle -> {}
         }
     }
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt
index 48d7dcdc3e..5e4ad02bd6 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt
@@ -54,7 +54,7 @@ fun LiveWaveformView(
 
     var parentWidth by remember { mutableIntStateOf(0) }
 
-    val waveformWidth by remember(levels, lineWidth, linePadding) {
+    val waveformWidth by remember(levels.size, lineWidth, linePadding) {
         derivedStateOf {
             levels.size * (lineWidth.value + linePadding.value)
         }
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecording.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecording.kt
index 17bdf3e7bf..e742372108 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecording.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecording.kt
@@ -74,7 +74,7 @@ internal fun VoiceMessageRecording(
             modifier = Modifier
                 .height(26.dp)
                 .weight(1f),
-            levels = levels
+            levels = levels,
         )
     }
 }

From a344b11eaa8a83dff79660a0981fedcc74008049 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Nov 2025 07:16:13 +0100
Subject: [PATCH 077/113] Rename test class

---
 ...enterTest.kt => DefaultVoiceMessageComposerPresenterTest.kt} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/{VoiceMessageComposerPresenterTest.kt => DefaultVoiceMessageComposerPresenterTest.kt} (99%)

diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
similarity index 99%
rename from features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt
rename to features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
index 73688d2db4..c5ea1743a8 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
@@ -57,7 +57,7 @@ import java.io.File
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
-class VoiceMessageComposerPresenterTest {
+class DefaultVoiceMessageComposerPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 

From 0fbf15626210f0c6ee91dcabdfb6400974c08c8d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Nov 2025 09:02:07 +0100
Subject: [PATCH 078/113] Use test extension

---
 ...efaultVoiceMessageComposerPresenterTest.kt | 96 +++++--------------
 1 file changed, 24 insertions(+), 72 deletions(-)

diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
index c5ea1743a8..ff98a65a70 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
@@ -12,10 +12,7 @@ package io.element.android.features.messages.impl.voicemessages.composer
 
 import android.Manifest
 import androidx.lifecycle.Lifecycle
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
 import app.cash.turbine.TurbineTestContext
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.Composer
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvents
@@ -46,6 +43,7 @@ import io.element.android.libraries.voicerecorder.test.FakeVoiceRecorder
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.test
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
@@ -91,9 +89,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
             voiceRecorder.assertCalls(started = 0)
@@ -105,9 +101,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - recording state`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             val finalState = awaitItem()
@@ -121,9 +115,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - recording keeps screen on`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().apply {
                 eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
                 assertThat(keepScreenOn).isFalse()
@@ -145,9 +137,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - abort recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Cancel))
             val finalState = awaitItem()
@@ -160,9 +150,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - finish recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
 
@@ -177,9 +165,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - play recording before it is ready`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             val finalState = awaitItem().apply {
                 this.eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
@@ -196,9 +182,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - play recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
@@ -214,9 +198,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - pause recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
@@ -233,9 +215,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - seek recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Seek(0.5f)))
@@ -260,9 +240,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - delete recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().eventSink(VoiceMessageComposerEvents.DeleteVoiceMessage)
@@ -278,9 +256,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - delete while playing`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
@@ -300,9 +276,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - send recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
@@ -319,9 +293,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - sending is tracked`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Send a normal voice message
             messageComposerContext.composerMode = MessageComposerMode.Normal
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
@@ -348,9 +320,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - send while playing`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
@@ -370,9 +340,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - send recording before previous completed, waits`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().run {
@@ -395,9 +363,7 @@ class DefaultVoiceMessageComposerPresenterTest {
         // Let sending fail due to media preprocessing error
         mediaPreProcessor.givenResult(Result.failure(Exception()))
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().apply {
@@ -419,9 +385,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - send failures can be retried`() = runTest {
         // Let sending fail due to media preprocessing error
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             mediaPreProcessor.givenResult(Result.failure(Exception()))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
@@ -448,9 +412,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - send failures are displayed as an error dialog`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Let sending fail due to media preprocessing error
             mediaPreProcessor.givenResult(Result.failure(Exception()))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
@@ -483,9 +445,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     @Test
     fun `present - send error - missing recording is tracked`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             // Send the message before recording anything
             initialState.eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
@@ -504,9 +464,7 @@ class DefaultVoiceMessageComposerPresenterTest {
         val exception = SecurityException("")
         voiceRecorder.givenThrowsSecurityException(exception)
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
@@ -528,9 +486,7 @@ class DefaultVoiceMessageComposerPresenterTest {
         val presenter = createDefaultVoiceMessageComposerPresenter(
             permissionsPresenter = permissionsPresenter,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
             assertThat(awaitItem().voiceMessageState).isEqualTo(VoiceMessageState.Idle)
@@ -557,9 +513,7 @@ class DefaultVoiceMessageComposerPresenterTest {
         val presenter = createDefaultVoiceMessageComposerPresenter(
             permissionsPresenter = permissionsPresenter,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             // See the dialog and accept it
@@ -591,9 +545,7 @@ class DefaultVoiceMessageComposerPresenterTest {
         val presenter = createDefaultVoiceMessageComposerPresenter(
             permissionsPresenter = permissionsPresenter,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             // See the dialog and accept it

From b25b99c890ddc6d3aee0b802938b46f4186ee44a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Nov 2025 09:24:43 +0100
Subject: [PATCH 079/113] Add unit test to ensure that number of levels is
 limited.

---
 ...efaultVoiceMessageComposerPresenterTest.kt | 26 +++++++++++++++++++
 .../voicerecorder/test/FakeVoiceRecorder.kt   |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
index ff98a65a70..e478ccc726 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
@@ -39,6 +39,7 @@ import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
 import io.element.android.libraries.textcomposer.model.VoiceMessageRecorderEvent
 import io.element.android.libraries.textcomposer.model.VoiceMessageState
 import io.element.android.libraries.voiceplayer.api.VoiceMessageException
+import io.element.android.libraries.voicerecorder.api.VoiceRecorder
 import io.element.android.libraries.voicerecorder.test.FakeVoiceRecorder
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
@@ -112,6 +113,30 @@ class DefaultVoiceMessageComposerPresenterTest {
         }
     }
 
+    @Test
+    fun `present - recording state - number of levels is limited`() = runTest {
+        val numberOfLevels = 200
+        val levels = List(numberOfLevels) { it / numberOfLevels.toFloat() }
+        val voiceRecorder = FakeVoiceRecorder(
+            levels = levels,
+            recordingDuration = RECORDING_DURATION,
+        )
+        val presenter = createDefaultVoiceMessageComposerPresenter(
+            voiceRecorder = voiceRecorder,
+        )
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            skipItems(numberOfLevels / 2 - 1)
+            val finalState = awaitItem()
+            assertThat(finalState.voiceMessageState).isInstanceOf(VoiceMessageState.Recording::class.java)
+            val recordingState = finalState.voiceMessageState as VoiceMessageState.Recording
+            // The number of levels should be limited to 128 items
+            assertThat(recordingState.levels.size).isEqualTo(128)
+            assertThat(recordingState.levels).isEqualTo(levels.takeLast(128))
+            testPauseAndDestroy(finalState)
+        }
+    }
+
     @Test
     fun `present - recording keeps screen on`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
@@ -614,6 +639,7 @@ class DefaultVoiceMessageComposerPresenterTest {
 
     private fun TestScope.createDefaultVoiceMessageComposerPresenter(
         permissionsPresenter: PermissionsPresenter = createFakePermissionsPresenter(),
+        voiceRecorder: VoiceRecorder = this@DefaultVoiceMessageComposerPresenterTest.voiceRecorder,
     ): DefaultVoiceMessageComposerPresenter {
         return DefaultVoiceMessageComposerPresenter(
             sessionCoroutineScope = backgroundScope,
diff --git a/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt b/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt
index a04f6d0ac9..ec62227857 100644
--- a/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt
+++ b/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt
@@ -14,6 +14,7 @@ import io.element.android.libraries.voicerecorder.api.VoiceRecorder
 import io.element.android.libraries.voicerecorder.api.VoiceRecorderState
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.yield
 import java.io.File
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
@@ -49,6 +50,7 @@ class FakeVoiceRecorder(
         timeSource += recordingDuration
         for (i in 1..levels.size) {
             _state.emit(VoiceRecorderState.Recording(startedAt.elapsedNow(), levels.take(i)))
+            yield()
         }
     }
 

From d94e8e7a2c64fdfa3c87f7e533c65526006a1cdf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Nov 2025 09:41:29 +0100
Subject: [PATCH 080/113] Rename VoiceMessageComposerEvents to
 VoiceMessageComposerEvent

---
 ...Events.kt => VoiceMessageComposerEvent.kt} |  18 +--
 .../composer/VoiceMessageComposerState.kt     |   2 +-
 .../features/messages/impl/MessagesView.kt    |  10 +-
 .../messagecomposer/MessageComposerView.kt    |  10 +-
 .../DefaultVoiceMessageComposerPresenter.kt   |  20 +--
 ...efaultVoiceMessageComposerPresenterTest.kt | 140 +++++++++---------
 6 files changed, 100 insertions(+), 100 deletions(-)
 rename features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/{VoiceMessageComposerEvents.kt => VoiceMessageComposerEvent.kt} (76%)

diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvents.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvent.kt
similarity index 76%
rename from features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvents.kt
rename to features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvent.kt
index 5220c4a762..ef5fe93d08 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvents.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvent.kt
@@ -12,17 +12,17 @@ import androidx.lifecycle.Lifecycle
 import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
 import io.element.android.libraries.textcomposer.model.VoiceMessageRecorderEvent
 
-sealed interface VoiceMessageComposerEvents {
+sealed interface VoiceMessageComposerEvent {
     data class RecorderEvent(
         val recorderEvent: VoiceMessageRecorderEvent
-    ) : VoiceMessageComposerEvents
+    ) : VoiceMessageComposerEvent
     data class PlayerEvent(
         val playerEvent: VoiceMessagePlayerEvent,
-    ) : VoiceMessageComposerEvents
-    data object SendVoiceMessage : VoiceMessageComposerEvents
-    data object DeleteVoiceMessage : VoiceMessageComposerEvents
-    data object AcceptPermissionRationale : VoiceMessageComposerEvents
-    data object DismissPermissionsRationale : VoiceMessageComposerEvents
-    data class LifecycleEvent(val event: Lifecycle.Event) : VoiceMessageComposerEvents
-    data object DismissSendFailureDialog : VoiceMessageComposerEvents
+    ) : VoiceMessageComposerEvent
+    data object SendVoiceMessage : VoiceMessageComposerEvent
+    data object DeleteVoiceMessage : VoiceMessageComposerEvent
+    data object AcceptPermissionRationale : VoiceMessageComposerEvent
+    data object DismissPermissionsRationale : VoiceMessageComposerEvent
+    data class LifecycleEvent(val event: Lifecycle.Event) : VoiceMessageComposerEvent
+    data object DismissSendFailureDialog : VoiceMessageComposerEvent
 }
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerState.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerState.kt
index 5a213cbbbb..f324bb7612 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerState.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerState.kt
@@ -17,5 +17,5 @@ data class VoiceMessageComposerState(
     val showPermissionRationaleDialog: Boolean,
     val showSendFailureDialog: Boolean,
     val keepScreenOn: Boolean,
-    val eventSink: (VoiceMessageComposerEvents) -> Unit,
+    val eventSink: (VoiceMessageComposerEvent) -> Unit,
 )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
index 1f62adeb23..03b04608d6 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -44,7 +44,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
-import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvents
+import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvent
 import io.element.android.features.messages.impl.actionlist.ActionListEvents
 import io.element.android.features.messages.impl.actionlist.ActionListView
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
@@ -120,7 +120,7 @@ fun MessagesView(
     knockRequestsBannerView: @Composable () -> Unit,
 ) {
     OnLifecycleEvent { _, event ->
-        state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.LifecycleEvent(event))
+        state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvent.LifecycleEvent(event))
     }
 
     KeepScreenOn(state.voiceMessageComposerState.keepScreenOn)
@@ -399,17 +399,17 @@ private fun MessagesViewContent(
         if (state.voiceMessageComposerState.showPermissionRationaleDialog) {
             VoiceMessagePermissionRationaleDialog(
                 onContinue = {
-                    state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.AcceptPermissionRationale)
+                    state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvent.AcceptPermissionRationale)
                 },
                 onDismiss = {
-                    state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.DismissPermissionsRationale)
+                    state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvent.DismissPermissionsRationale)
                 },
                 appName = state.appName
             )
         }
         if (state.voiceMessageComposerState.showSendFailureDialog) {
             VoiceMessageSendingFailedDialog(
-                onDismiss = { state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.DismissSendFailureDialog) },
+                onDismiss = { state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvent.DismissSendFailureDialog) },
             )
         }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
index 292a6b39a8..4b346e0c15 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
@@ -18,7 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvents
+import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvent
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerState
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerStateProvider
 import io.element.android.features.messages.api.timeline.voicemessages.composer.aVoiceMessageComposerState
@@ -78,19 +78,19 @@ internal fun MessageComposerView(
     }
 
     val onVoiceRecorderEvent = { press: VoiceMessageRecorderEvent ->
-        voiceMessageState.eventSink(VoiceMessageComposerEvents.RecorderEvent(press))
+        voiceMessageState.eventSink(VoiceMessageComposerEvent.RecorderEvent(press))
     }
 
     val onSendVoiceMessage = {
-        voiceMessageState.eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+        voiceMessageState.eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
     }
 
     val onDeleteVoiceMessage = {
-        voiceMessageState.eventSink(VoiceMessageComposerEvents.DeleteVoiceMessage)
+        voiceMessageState.eventSink(VoiceMessageComposerEvent.DeleteVoiceMessage)
     }
 
     val onVoicePlayerEvent = { event: VoiceMessagePlayerEvent ->
-        voiceMessageState.eventSink(VoiceMessageComposerEvents.PlayerEvent(event))
+        voiceMessageState.eventSink(VoiceMessageComposerEvent.PlayerEvent(event))
     }
 
     TextComposer(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt
index 5405124283..051ded02ae 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt
@@ -26,7 +26,7 @@ import dev.zacsweers.metro.AssistedInject
 import dev.zacsweers.metro.ContributesBinding
 import im.vector.app.features.analytics.plan.Composer
 import io.element.android.features.messages.api.MessageComposerContext
-import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvents
+import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvent
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerPresenter
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerState
 import io.element.android.libraries.di.RoomScope
@@ -164,25 +164,25 @@ class DefaultVoiceMessageComposerPresenter(
             }
         }
 
-        fun handleEvent(event: VoiceMessageComposerEvents) {
+        fun handleEvent(event: VoiceMessageComposerEvent) {
             when (event) {
-                is VoiceMessageComposerEvents.RecorderEvent -> handleVoiceMessageRecorderEvent(event.recorderEvent)
-                is VoiceMessageComposerEvents.PlayerEvent -> handleVoiceMessagePlayerEvent(event.playerEvent)
-                is VoiceMessageComposerEvents.SendVoiceMessage -> localCoroutineScope.launch {
+                is VoiceMessageComposerEvent.RecorderEvent -> handleVoiceMessageRecorderEvent(event.recorderEvent)
+                is VoiceMessageComposerEvent.PlayerEvent -> handleVoiceMessagePlayerEvent(event.playerEvent)
+                is VoiceMessageComposerEvent.SendVoiceMessage -> localCoroutineScope.launch {
                     sendVoiceMessage()
                 }
-                VoiceMessageComposerEvents.DeleteVoiceMessage -> {
+                VoiceMessageComposerEvent.DeleteVoiceMessage -> {
                     player.pause()
                     localCoroutineScope.deleteRecording()
                 }
-                VoiceMessageComposerEvents.DismissPermissionsRationale -> {
+                VoiceMessageComposerEvent.DismissPermissionsRationale -> {
                     permissionState.eventSink(PermissionsEvents.CloseDialog)
                 }
-                VoiceMessageComposerEvents.AcceptPermissionRationale -> {
+                VoiceMessageComposerEvent.AcceptPermissionRationale -> {
                     permissionState.eventSink(PermissionsEvents.OpenSystemSettingAndCloseDialog)
                 }
-                is VoiceMessageComposerEvents.LifecycleEvent -> handleLifecycleEvent(event.event)
-                VoiceMessageComposerEvents.DismissSendFailureDialog -> {
+                is VoiceMessageComposerEvent.LifecycleEvent -> handleLifecycleEvent(event.event)
+                VoiceMessageComposerEvent.DismissSendFailureDialog -> {
                     showSendFailureDialog = false
                 }
             }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
index e478ccc726..48348f5e9a 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
@@ -15,7 +15,7 @@ import androidx.lifecycle.Lifecycle
 import app.cash.turbine.TurbineTestContext
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.Composer
-import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvents
+import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvent
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerState
 import io.element.android.features.messages.impl.messagecomposer.aReplyMode
 import io.element.android.features.messages.test.FakeMessageComposerContext
@@ -103,7 +103,7 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - recording state`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(RECORDING_STATE)
@@ -125,7 +125,7 @@ class DefaultVoiceMessageComposerPresenterTest {
             voiceRecorder = voiceRecorder,
         )
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             skipItems(numberOfLevels / 2 - 1)
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isInstanceOf(VoiceMessageState.Recording::class.java)
@@ -142,13 +142,13 @@ class DefaultVoiceMessageComposerPresenterTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
             awaitItem().apply {
-                eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+                eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
                 assertThat(keepScreenOn).isFalse()
             }
 
             awaitItem().apply {
                 assertThat(keepScreenOn).isTrue()
-                eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+                eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             }
 
             val finalState = awaitItem().apply {
@@ -163,8 +163,8 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - abort recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Cancel))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Cancel))
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
             voiceRecorder.assertCalls(started = 1, stopped = 1, deleted = 1)
@@ -176,8 +176,8 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - finish recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
 
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(aPreviewState())
@@ -191,9 +191,9 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - play recording before it is ready`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             val finalState = awaitItem().apply {
-                this.eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
+                this.eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Play))
             }
 
             // Nothing should happen
@@ -208,9 +208,9 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - play recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Play))
             val finalState = awaitItem().also {
                 assertThat(it.voiceMessageState).isEqualTo(aPlayingState())
             }
@@ -224,10 +224,10 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - pause recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Pause))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Play))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Pause))
             val finalState = awaitItem().also {
                 assertThat(it.voiceMessageState).isEqualTo(aPausedState())
             }
@@ -241,15 +241,15 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - seek recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Seek(0.5f)))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Seek(0.5f)))
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPreviewState(playbackProgress = 0.5f, time = 0.seconds, showCursor = true))
             }
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPreviewState(playbackProgress = 0.5f, time = 5.seconds, showCursor = true))
-                eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Seek(0.2f)))
+                eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Seek(0.2f)))
             }
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPreviewState(playbackProgress = 0.2f, time = 5.seconds, showCursor = true))
@@ -266,9 +266,9 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - delete recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.DeleteVoiceMessage)
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.DeleteVoiceMessage)
 
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
@@ -282,10 +282,10 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - delete while playing`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
-            awaitItem().eventSink(VoiceMessageComposerEvents.DeleteVoiceMessage)
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Play))
+            awaitItem().eventSink(VoiceMessageComposerEvent.DeleteVoiceMessage)
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPausedState())
             }
@@ -302,9 +302,9 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - send recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             assertThat(awaitItem().voiceMessageState).isEqualTo(aPreviewState().toSendingState())
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
@@ -321,16 +321,16 @@ class DefaultVoiceMessageComposerPresenterTest {
         presenter.test {
             // Send a normal voice message
             messageComposerContext.composerMode = MessageComposerMode.Normal
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             skipItems(1) // Sending state
             advanceUntilIdle()
             // Now reply with a voice message
             messageComposerContext.composerMode = aReplyMode()
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             val finalState = awaitItem() // Sending state
 
             assertThat(analyticsService.capturedEvents).containsExactly(
@@ -346,10 +346,10 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - send while playing`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
-            awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Play))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             assertThat(awaitItem().voiceMessageState).isEqualTo(aPlayingState().toSendingState())
             skipItems(1) // Duplicate sending state
 
@@ -366,11 +366,11 @@ class DefaultVoiceMessageComposerPresenterTest {
     fun `present - send recording before previous completed, waits`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().run {
-                eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
-                eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+                eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
+                eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             }
             assertThat(awaitItem().voiceMessageState).isEqualTo(aPreviewState().toSendingState())
 
@@ -389,11 +389,11 @@ class DefaultVoiceMessageComposerPresenterTest {
         mediaPreProcessor.givenResult(Result.failure(Exception()))
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPreviewState())
-                eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+                eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             }
 
             val finalState = awaitItem()
@@ -412,11 +412,11 @@ class DefaultVoiceMessageComposerPresenterTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
             mediaPreProcessor.givenResult(Result.failure(Exception()))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             val previewState = awaitItem()
 
-            previewState.eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            previewState.eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             assertThat(awaitItem().voiceMessageState).isEqualTo(aPreviewState().toSendingState())
 
             ensureAllEventsConsumed()
@@ -424,7 +424,7 @@ class DefaultVoiceMessageComposerPresenterTest {
             sendVoiceMessageResult.assertions().isNeverCalled()
 
             mediaPreProcessor.givenAudioResult()
-            previewState.eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            previewState.eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
             sendVoiceMessageResult.assertions().isCalledOnce()
@@ -440,9 +440,9 @@ class DefaultVoiceMessageComposerPresenterTest {
         presenter.test {
             // Let sending fail due to media preprocessing error
             mediaPreProcessor.givenResult(Result.failure(Exception()))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
 
             assertThat(awaitItem().voiceMessageState).isEqualTo(aPreviewState().toSendingState())
 
@@ -454,7 +454,7 @@ class DefaultVoiceMessageComposerPresenterTest {
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPreviewState())
                 assertThat(showSendFailureDialog).isTrue()
-                eventSink(VoiceMessageComposerEvents.DismissSendFailureDialog)
+                eventSink(VoiceMessageComposerEvent.DismissSendFailureDialog)
             }
 
             val finalState = awaitItem().apply {
@@ -473,7 +473,7 @@ class DefaultVoiceMessageComposerPresenterTest {
         presenter.test {
             val initialState = awaitItem()
             // Send the message before recording anything
-            initialState.eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            initialState.eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
 
             assertThat(initialState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
             sendVoiceMessageResult.assertions().isNeverCalled()
@@ -491,7 +491,7 @@ class DefaultVoiceMessageComposerPresenterTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
         presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            initialState.eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             sendVoiceMessageResult.assertions().isNeverCalled()
             assertThat(analyticsService.trackedErrors).containsExactly(
@@ -513,15 +513,15 @@ class DefaultVoiceMessageComposerPresenterTest {
         )
         presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            initialState.eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             assertThat(awaitItem().voiceMessageState).isEqualTo(VoiceMessageState.Idle)
 
-            initialState.eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            initialState.eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             voiceRecorder.assertCalls(stopped = 1)
 
             permissionsPresenter.setPermissionGranted()
 
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(RECORDING_STATE)
             voiceRecorder.assertCalls(stopped = 1, started = 1)
@@ -539,13 +539,13 @@ class DefaultVoiceMessageComposerPresenterTest {
             permissionsPresenter = permissionsPresenter,
         )
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             // See the dialog and accept it
             awaitItem().also {
                 assertThat(it.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
                 assertThat(it.showPermissionRationaleDialog).isTrue()
-                it.eventSink(VoiceMessageComposerEvents.AcceptPermissionRationale)
+                it.eventSink(VoiceMessageComposerEvent.AcceptPermissionRationale)
             }
 
             // Dialog is hidden, user accepts permissions
@@ -553,7 +553,7 @@ class DefaultVoiceMessageComposerPresenterTest {
 
             permissionsPresenter.setPermissionGranted()
 
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(RECORDING_STATE)
             voiceRecorder.assertCalls(started = 1)
@@ -571,19 +571,19 @@ class DefaultVoiceMessageComposerPresenterTest {
             permissionsPresenter = permissionsPresenter,
         )
         presenter.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             // See the dialog and accept it
             awaitItem().also {
                 assertThat(it.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
                 assertThat(it.showPermissionRationaleDialog).isTrue()
-                it.eventSink(VoiceMessageComposerEvents.DismissPermissionsRationale)
+                it.eventSink(VoiceMessageComposerEvent.DismissPermissionsRationale)
             }
 
             // Dialog is hidden, user tries to record again
             awaitItem().also {
                 assertThat(it.showPermissionRationaleDialog).isFalse()
-                it.eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+                it.eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             }
 
             // Dialog is shown once again
@@ -601,7 +601,7 @@ class DefaultVoiceMessageComposerPresenterTest {
         mostRecentState: VoiceMessageComposerState,
     ) {
         mostRecentState.eventSink(
-            VoiceMessageComposerEvents.LifecycleEvent(event = Lifecycle.Event.ON_PAUSE)
+            VoiceMessageComposerEvent.LifecycleEvent(event = Lifecycle.Event.ON_PAUSE)
         )
 
         val onPauseState = when (val state = mostRecentState.voiceMessageState) {
@@ -622,7 +622,7 @@ class DefaultVoiceMessageComposerPresenterTest {
         }
 
         onPauseState.eventSink(
-            VoiceMessageComposerEvents.LifecycleEvent(event = Lifecycle.Event.ON_DESTROY)
+            VoiceMessageComposerEvent.LifecycleEvent(event = Lifecycle.Event.ON_DESTROY)
         )
 
         when (val state = onPauseState.voiceMessageState) {

From 597a243579ba78f8f73b261daf243bd2545ab39a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Nov 2025 09:57:07 +0100
Subject: [PATCH 081/113] Inject RoomMemberListDataSource in the presenter
 constructor.

---
 .../rolesandpermissions/impl/roles/ChangeRolesPresenter.kt    | 4 +---
 .../impl/roles/ChangeRolesPresenterTest.kt                    | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
index f7736cb77c..88da850fcd 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
@@ -27,7 +27,6 @@ import io.element.android.features.rolesandpermissions.impl.RoomMemberListDataSo
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runUpdatingState
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.di.annotations.RoomCoroutineScope
 import io.element.android.libraries.matrix.api.core.UserId
@@ -55,7 +54,7 @@ import kotlinx.coroutines.launch
 class ChangeRolesPresenter(
     @Assisted private val role: RoomMember.Role,
     private val room: JoinedRoom,
-    private val dispatchers: CoroutineDispatchers,
+    private val dataSource: RoomMemberListDataSource,
     private val analyticsService: AnalyticsService,
     @RoomCoroutineScope private val roomCoroutineScope: CoroutineScope,
 ) : Presenter<ChangeRolesState> {
@@ -68,7 +67,6 @@ class ChangeRolesPresenter(
 
     @Composable
     override fun present(): ChangeRolesState {
-        val dataSource = remember { RoomMemberListDataSource(room, dispatchers) }
         var query by rememberSaveable { mutableStateOf<String?>(null) }
         var searchActive by rememberSaveable { mutableStateOf(false) }
         var searchResults by remember {
diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
index 4bc39fd971..1da7ddcce4 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
@@ -10,6 +10,7 @@ package io.element.android.features.rolesandpermissions.impl.roles
 
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.RoomModeration
+import io.element.android.features.rolesandpermissions.impl.RoomMemberListDataSource
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
@@ -576,7 +577,7 @@ internal fun TestScope.createChangeRolesPresenter(
     return ChangeRolesPresenter(
         role = role,
         room = room,
-        dispatchers = dispatchers,
+        dataSource = RoomMemberListDataSource(room, dispatchers),
         analyticsService = analyticsService,
         roomCoroutineScope = this,
     )

From 63e582f773316cf5dffc5dbad285631f2b7fb2c3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Nov 2025 10:34:34 +0100
Subject: [PATCH 082/113] fix(deps): update dependencyanalysis to v3.5.1
 (#5819)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 108b4fde04..1a8ebd36a2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -49,7 +49,7 @@ telephoto = "0.18.0"
 haze = "1.6.10"
 
 # Dependency analysis
-dependencyAnalysis = "3.5.0"
+dependencyAnalysis = "3.5.1"
 
 # DI
 metro = "0.7.7"

From 5624386f98499a0c65ce409188c42764b2fba753 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Nov 2025 12:22:57 +0100
Subject: [PATCH 083/113] Add indicators in room list for sending event and
 errors.

---
 .../home/impl/components/RoomSummaryRow.kt    | 94 ++++++++++++++-----
 .../datasource/RoomListRoomSummaryFactory.kt  | 28 +++++-
 .../features/home/impl/model/LatestEvent.kt   | 34 +++++++
 .../home/impl/model/RoomListRoomSummary.kt    |  2 +-
 .../impl/model/RoomListRoomSummaryProvider.kt | 28 +++---
 .../impl/roomlist/RoomListStateProvider.kt    |  7 +-
 .../impl/model/RoomListBaseRoomSummaryTest.kt |  2 +-
 .../home/impl/roomlist/RoomListViewTest.kt    |  6 +-
 .../src/main/res/values/localazy.xml          |  1 +
 9 files changed, 160 insertions(+), 42 deletions(-)
 create mode 100644 features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt

diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
index c43f7dcdd2..da0f47ba05 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
@@ -40,6 +40,7 @@ import androidx.compose.ui.zIndex
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.home.impl.R
+import io.element.android.features.home.impl.model.LatestEvent
 import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.model.RoomListRoomSummaryProvider
 import io.element.android.features.home.impl.model.RoomSummaryDisplayType
@@ -120,6 +121,7 @@ internal fun RoomSummaryRow(
                 ) {
                     NameAndTimestampRow(
                         name = room.name,
+                        latestEvent = room.latestEvent,
                         timestamp = room.timestamp,
                         isHighlighted = room.isHighlighted
                     )
@@ -136,6 +138,7 @@ internal fun RoomSummaryRow(
                 ) {
                     NameAndTimestampRow(
                         name = room.name,
+                        latestEvent = room.latestEvent,
                         timestamp = null,
                         isHighlighted = room.isHighlighted
                     )
@@ -211,6 +214,7 @@ private fun RoomSummaryScaffoldRow(
 @Composable
 private fun NameAndTimestampRow(
     name: String?,
+    latestEvent: LatestEvent,
     timestamp: String?,
     isHighlighted: Boolean,
     modifier: Modifier = Modifier
@@ -219,16 +223,42 @@ private fun NameAndTimestampRow(
         modifier = modifier.fillMaxWidth(),
         horizontalArrangement = spacedBy(16.dp)
     ) {
-        // Name
-        Text(
+        Row(
             modifier = Modifier.weight(1f),
-            style = ElementTheme.typography.fontBodyLgMedium,
-            text = name ?: stringResource(id = CommonStrings.common_no_room_name),
-            fontStyle = FontStyle.Italic.takeIf { name == null },
-            color = ElementTheme.colors.roomListRoomName,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis
-        )
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            // Name
+            Text(
+                style = ElementTheme.typography.fontBodyLgMedium,
+                text = name ?: stringResource(id = CommonStrings.common_no_room_name),
+                fontStyle = FontStyle.Italic.takeIf { name == null },
+                color = ElementTheme.colors.roomListRoomName,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+            // Picto
+            when (latestEvent) {
+                is LatestEvent.Sending -> {
+                    Spacer(modifier = Modifier.width(4.dp))
+                    Icon(
+                        modifier = Modifier.size(16.dp),
+                        imageVector = CompoundIcons.Time(),
+                        contentDescription = null,
+                        tint = ElementTheme.colors.iconTertiary,
+                    )
+                }
+                is LatestEvent.Error -> {
+                    Spacer(modifier = Modifier.width(4.dp))
+                    Icon(
+                        modifier = Modifier.size(16.dp),
+                        imageVector = CompoundIcons.ErrorSolid(),
+                        contentDescription = null,
+                        tint = ElementTheme.colors.iconCriticalPrimary,
+                    )
+                }
+                else -> Unit
+            }
+        }
         // Timestamp
         Text(
             text = timestamp ?: "",
@@ -274,21 +304,41 @@ private fun MessagePreviewAndIndicatorRow(
         modifier = modifier.fillMaxWidth(),
         horizontalArrangement = spacedBy(28.dp)
     ) {
-        val messagePreview = if (room.isTombstoned) {
-            stringResource(R.string.screen_roomlist_tombstoned_room_description)
+        if (room.isTombstoned) {
+            Text(
+                modifier = Modifier.weight(1f),
+                text = stringResource(R.string.screen_roomlist_tombstoned_room_description),
+                color = ElementTheme.colors.roomListRoomMessage,
+                style = ElementTheme.typography.fontBodyMdRegular,
+                minLines = 2,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
         } else {
-            room.latestEvent.orEmpty()
+            if (room.latestEvent is LatestEvent.Error) {
+                Text(
+                    modifier = Modifier.weight(1f),
+                    text = stringResource(CommonStrings.common_message_failed_to_send),
+                    color = ElementTheme.colors.textCriticalPrimary,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    minLines = 2,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            } else {
+                val messagePreview = room.latestEvent.content()
+                val annotatedMessagePreview = messagePreview as? AnnotatedString ?: AnnotatedString(text = messagePreview.orEmpty().toString())
+                Text(
+                    modifier = Modifier.weight(1f),
+                    text = annotatedMessagePreview,
+                    color = ElementTheme.colors.roomListRoomMessage,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    minLines = 2,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
         }
-        val annotatedMessagePreview = messagePreview as? AnnotatedString ?: AnnotatedString(text = messagePreview.toString())
-        Text(
-            modifier = Modifier.weight(1f),
-            text = annotatedMessagePreview,
-            color = ElementTheme.colors.roomListRoomMessage,
-            style = ElementTheme.typography.fontBodyMdRegular,
-            minLines = 2,
-            maxLines = 2,
-            overflow = TextOverflow.Ellipsis
-        )
 
         // Call and unread
         Row(
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
index 935410e572..14121516d6 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
@@ -9,6 +9,7 @@
 package io.element.android.features.home.impl.datasource
 
 import dev.zacsweers.metro.Inject
+import io.element.android.features.home.impl.model.LatestEvent
 import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.model.RoomSummaryDisplayType
 import io.element.android.libraries.core.extensions.orEmpty
@@ -18,6 +19,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.isDm
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.toInviteSender
@@ -44,7 +46,7 @@ class RoomListRoomSummaryFactory(
                 mode = DateFormatterMode.TimeOrDate,
                 useRelative = true,
             ),
-            latestEvent = roomLatestEventFormatter.format(roomSummary.latestEvent, roomInfo.isDm).orEmpty(),
+            latestEvent = computeLatestEvent(roomSummary.latestEvent, roomInfo.isDm),
             avatarData = avatarData,
             userDefinedNotificationMode = roomInfo.userDefinedNotificationMode,
             hasRoomCall = roomInfo.hasRoomCall,
@@ -71,4 +73,28 @@ class RoomListRoomSummaryFactory(
             isSpace = roomInfo.isSpace,
         )
     }
+
+    private fun computeLatestEvent(latestEvent: LatestEventValue, dm: Boolean): LatestEvent {
+        return when (latestEvent) {
+            is LatestEventValue.None -> {
+                LatestEvent.None
+            }
+            is LatestEventValue.Local -> {
+                if (latestEvent.isSending) {
+                    val content = roomLatestEventFormatter.format(latestEvent, dm).orEmpty()
+                    LatestEvent.Sending(
+                        content = content,
+                    )
+                } else {
+                    LatestEvent.Error
+                }
+            }
+            is LatestEventValue.Remote -> {
+                val content = roomLatestEventFormatter.format(latestEvent, dm).orEmpty()
+                LatestEvent.Regular(
+                    content = content,
+                )
+            }
+        }
+    }
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt
new file mode 100644
index 0000000000..6a268e8284
--- /dev/null
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+sealed interface LatestEvent {
+    data object None : LatestEvent
+
+    data class Regular(
+        val content: CharSequence?,
+    ) : LatestEvent
+
+    data class Sending(
+        val content: CharSequence?,
+    ) : LatestEvent
+
+    data object Error : LatestEvent
+
+    fun content(): CharSequence? {
+        return when (this) {
+            is None -> null
+            is Regular -> content
+            is Sending -> content
+            is Error -> null
+        }
+    }
+}
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt
index aa983baf56..a59e444455 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt
@@ -29,7 +29,7 @@ data class RoomListRoomSummary(
     val numberOfUnreadNotifications: Long,
     val isMarkedUnread: Boolean,
     val timestamp: String?,
-    val latestEvent: CharSequence?,
+    val latestEvent: LatestEvent,
     val avatarData: AvatarData,
     val userDefinedNotificationMode: RoomNotificationMode?,
     val hasRoomCall: Boolean,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
index e88d6d0972..65c70f98ed 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
@@ -25,12 +25,14 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                 aRoomListRoomSummary(displayType = RoomSummaryDisplayType.PLACEHOLDER),
                 aRoomListRoomSummary(),
                 aRoomListRoomSummary(name = null),
-                aRoomListRoomSummary(lastMessage = null),
+                aRoomListRoomSummary(latestEvent = LatestEvent.None),
                 aRoomListRoomSummary(
                     name = "A very long room name that should be truncated",
-                    lastMessage = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt" +
-                        " ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea com" +
-                        "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
+                    latestEvent = LatestEvent.Regular(
+                        "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt" +
+                            " ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea com" +
+                            "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur."
+                    ),
                     timestamp = "yesterday",
                     numberOfUnreadMessages = 1,
                 ),
@@ -44,7 +46,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     listOf(
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            lastMessage = "No activity" + if (hasCall) ", call" else "",
+                            latestEvent = LatestEvent.Regular("No activity" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 0,
                             numberOfUnreadMentions = 0,
@@ -52,7 +54,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                         ),
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            lastMessage = "New messages" + if (hasCall) ", call" else "",
+                            latestEvent = LatestEvent.Regular("New messages" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 1,
                             numberOfUnreadMentions = 0,
@@ -60,7 +62,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                         ),
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            lastMessage = "New messages, mentions" + if (hasCall) ", call" else "",
+                            latestEvent = LatestEvent.Regular("New messages, mentions" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 1,
                             numberOfUnreadMentions = 1,
@@ -68,7 +70,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                         ),
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            lastMessage = "New mentions" + if (hasCall) ", call" else "",
+                            latestEvent = LatestEvent.Regular("New mentions" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 0,
                             numberOfUnreadMentions = 1,
@@ -127,6 +129,10 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     isTombstoned = true,
                 )
             ),
+            listOf(
+                aRoomListRoomSummary(latestEvent = LatestEvent.Sending("A sending message")),
+                aRoomListRoomSummary(latestEvent = LatestEvent.Error),
+            )
         ).flatten()
 }
 
@@ -148,8 +154,8 @@ internal fun aRoomListRoomSummary(
     numberOfUnreadMentions: Long = 0,
     numberOfUnreadNotifications: Long = 0,
     isMarkedUnread: Boolean = false,
-    lastMessage: String? = "Last message",
-    timestamp: String? = lastMessage?.let { "88:88" },
+    latestEvent: LatestEvent = LatestEvent.Regular("Last message"),
+    timestamp: String? = latestEvent.takeIf { it !is LatestEvent.None }?.let { "88:88" },
     notificationMode: RoomNotificationMode? = null,
     hasRoomCall: Boolean = false,
     avatarData: AvatarData = AvatarData(id, name, size = AvatarSize.RoomListItem),
@@ -171,7 +177,7 @@ internal fun aRoomListRoomSummary(
     numberOfUnreadNotifications = numberOfUnreadNotifications,
     isMarkedUnread = isMarkedUnread,
     timestamp = timestamp,
-    latestEvent = lastMessage,
+    latestEvent = latestEvent,
     avatarData = avatarData,
     userDefinedNotificationMode = notificationMode,
     hasRoomCall = hasRoomCall,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt
index bf47d667f1..b0cc0a4809 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt
@@ -11,6 +11,7 @@ package io.element.android.features.home.impl.roomlist
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.home.impl.filters.RoomListFiltersState
 import io.element.android.features.home.impl.filters.aRoomListFiltersState
+import io.element.android.features.home.impl.model.LatestEvent
 import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.model.RoomSummaryDisplayType
 import io.element.android.features.home.impl.model.aRoomListRoomSummary
@@ -88,7 +89,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
             name = "Room",
             numberOfUnreadMessages = 1,
             timestamp = "14:18",
-            lastMessage = "A very very very very long message which suites on two lines",
+            latestEvent = LatestEvent.Regular("A very very very very long message which suites on two lines"),
             avatarData = AvatarData("!id", "R", size = AvatarSize.RoomListItem),
             id = "!roomId:domain",
         ),
@@ -96,7 +97,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
             name = "Room#2",
             numberOfUnreadMessages = 0,
             timestamp = "14:16",
-            lastMessage = "A short message",
+            latestEvent = LatestEvent.Regular("A short message"),
             avatarData = AvatarData("!id", "Z", size = AvatarSize.RoomListItem),
             id = "!roomId2:domain",
         ),
@@ -119,7 +120,7 @@ internal fun generateRoomListRoomSummaryList(
             name = "Room#$index",
             numberOfUnreadMessages = 0,
             timestamp = "14:16",
-            lastMessage = "A message",
+            latestEvent = LatestEvent.Regular("A message"),
             avatarData = AvatarData("!id$index", "${(65 + index % 26).toChar()}", size = AvatarSize.RoomListItem),
             id = "!roomId$index:domain",
         )
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
index cbf6c145ad..0a5350d086 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
@@ -96,7 +96,7 @@ internal fun createRoomListRoomSummary(
     numberOfUnreadNotifications = numberOfUnreadNotifications,
     isMarkedUnread = isMarkedUnread,
     timestamp = timestamp,
-    latestEvent = "",
+    latestEvent = LatestEvent.Regular(""),
     avatarData = AvatarData(id = A_ROOM_ID.value, name = A_ROOM_NAME, size = AvatarSize.RoomListItem),
     displayType = displayType,
     userDefinedNotificationMode = userDefinedNotificationMode,
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt
index 7855180926..bb82d51a79 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt
@@ -170,7 +170,7 @@ class RoomListViewTest {
             // Remove automatic initial events
             eventsRecorder.clear()
 
-            rule.onNodeWithText(room0.latestEvent!!.toString()).performClick()
+            rule.onNodeWithText(room0.latestEvent.content().toString()).performClick()
         }
 
         eventsRecorder.assertEmpty()
@@ -192,7 +192,7 @@ class RoomListViewTest {
             )
             // Remove automatic initial events
             eventsRecorder.clear()
-            rule.onNodeWithText(room0.latestEvent!!.toString())
+            rule.onNodeWithText(room0.latestEvent.content().toString())
                 .performClick()
                 .performClick()
         }
@@ -214,7 +214,7 @@ class RoomListViewTest {
         // Remove automatic initial events
         eventsRecorder.clear()
 
-        rule.onNodeWithText(room0.latestEvent!!.toString()).performTouchInput { longClick() }
+        rule.onNodeWithText(room0.latestEvent.content().toString()).performTouchInput { longClick() }
         eventsRecorder.assertSingle(RoomListEvents.ShowContextMenu(room0))
     }
 
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index b1586a8d66..6bf57481d4 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -246,6 +246,7 @@ Reason: %1$s."</string>
   </plurals>
   <string name="common_message">"Message"</string>
   <string name="common_message_actions">"Message actions"</string>
+  <string name="common_message_failed_to_send">"Message failed to send"</string>
   <string name="common_message_layout">"Message layout"</string>
   <string name="common_message_removed">"Message removed"</string>
   <string name="common_modern">"Modern"</string>

From 919b577659aaf436853914946887d643f47facaa Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Thu, 27 Nov 2025 12:17:28 +0000
Subject: [PATCH 084/113] Update screenshots

---
 .../features.home.impl.components_RoomSummaryRow_Day_36_en.png | 3 +++
 .../features.home.impl.components_RoomSummaryRow_Day_37_en.png | 3 +++
 ...eatures.home.impl.components_RoomSummaryRow_Night_36_en.png | 3 +++
 ...eatures.home.impl.components_RoomSummaryRow_Night_37_en.png | 3 +++
 4 files changed, 12 insertions(+)
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png

diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png
new file mode 100644
index 0000000000..fb772998e4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:761e963499f97f21b5c5b8b80e5d75092fbc4305371bcc413f595b503890d511
+size 13085
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png
new file mode 100644
index 0000000000..42db131266
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de31aa3dbb9c9427189621d35022211220197de8ed8584f36801eb99d613f0b1
+size 13728
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png
new file mode 100644
index 0000000000..bb29aaa4b5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f7327f29c9236b549d7f5037e3483e487a23902c5c30bd20a7a4bc0e6c13bec
+size 13009
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png
new file mode 100644
index 0000000000..c8ce9b58a1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f92a70303d515a135eb87eac344dc4a974183da8773524a48f790b31a70338e8
+size 13528

From 699cf9647e9bb6644155e7a875bcfd90a90e5dc0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Nov 2025 14:55:19 +0100
Subject: [PATCH 085/113] Room list: enable latest event sorter.

---
 .../libraries/matrix/impl/roomlist/RoomListExtensions.kt    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt
index 94651dfd40..84e759040d 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt
@@ -66,7 +66,11 @@ internal fun RoomListInterface.entriesFlow(
                 trySendBlocking(roomEntriesUpdate)
             }
         }
-        val result = entriesWithDynamicAdapters(pageSize.toUInt(), listener)
+        val result = entriesWithDynamicAdaptersWith(
+            pageSize = pageSize.toUInt(),
+            enableLatestEventSorter = true,
+            listener = listener,
+        )
         val controller = result.controller()
         controller.setFilter(initialFilterKind)
         roomListDynamicEvents.onEach { controllerEvents ->

From 5d61504f2482542632f42376eb6774a567ed3ceb Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 27 Nov 2025 19:02:15 +0100
Subject: [PATCH 086/113] quality: fix lint issues

---
 .../impl/root/SecurityAndPrivacyPresenter.kt                   | 3 +--
 .../securityandprivacy/impl/root/SecurityAndPrivacyView.kt     | 3 ---
 .../securityandprivacy/impl/SecurityAndPrivacyViewTest.kt      | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
index dd28ca65dd..43d8383b76 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
@@ -26,7 +26,6 @@ import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNav
 import io.element.android.features.securityandprivacy.impl.editroomaddress.matchesServer
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.architecture.AsyncData.*
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.architecture.runUpdatingState
@@ -135,7 +134,7 @@ class SecurityAndPrivacyPresenter(
                 }
                 SecurityAndPrivacyEvents.ToggleRoomVisibility -> {
                     editedVisibleInRoomDirectory = when (val edited = editedVisibleInRoomDirectory) {
-                        is Success -> Success(!edited.data)
+                        is AsyncData.Success -> AsyncData.Success(!edited.data)
                         else -> edited
                     }
                 }
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
index 3ba4b8a142..32674ef34f 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
@@ -32,7 +32,6 @@ import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.securityandprivacy.impl.R
-import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
@@ -53,8 +52,6 @@ import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableSet
-import java.security.Security
-
 @Composable
 fun SecurityAndPrivacyView(
     state: SecurityAndPrivacyState,
diff --git a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
index c4c004b265..78b840d823 100644
--- a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
@@ -73,7 +73,6 @@ class SecurityAndPrivacyViewTest {
         recorder.assertSingle(SecurityAndPrivacyEvents.DismissExitConfirmation)
     }
 
-
     @Test
     fun `click on room access item emits the expected event`() {
         val recorder = EventsRecorder<SecurityAndPrivacyEvents>()

From 3d590c1c46a1e02fd2c33099fddcf2e98633fd99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Wed, 19 Nov 2025 17:24:35 +0100
Subject: [PATCH 087/113] Have long running analytic transactions return actual
 transactions.

Also add `AnalyticsService.getLongRunningTransaction` and change `AnalyticsService.stopLongRunningTransaction` to `removeLongRunningTransaction`.
---
 .../matrix/impl/roomlist/RoomListFactory.kt       |  2 +-
 .../services/analytics/api/AnalyticsService.kt    | 15 +++++++++++++--
 .../analytics/impl/DefaultAnalyticsService.kt     | 14 ++++++++++----
 .../analytics/noop/NoopAnalyticsService.kt        |  5 +++--
 .../analytics/test/FakeAnalyticsService.kt        | 15 +++++++++++++--
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
index 4e342f3a48..1fd0871019 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
@@ -73,7 +73,7 @@ internal class RoomListFactory(
                     initialFilterKind = RoomListEntriesDynamicFilterKind.All(ROOM_LIST_RUST_FILTERS),
                 ).onEach { update ->
                     if (!firstRoomsTransaction.isFinished()) {
-                        analyticsService.stopLongRunningTransaction(AnalyticsLongRunningTransaction.FirstRoomsDisplayed)
+                        analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.FirstRoomsDisplayed)?.finish()
                         firstRoomsTransaction.finish()
                     }
                     processor.postUpdate(update)
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
index a936f47be1..726ec4180d 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
@@ -55,9 +55,20 @@ interface AnalyticsService : AnalyticsTracker, ErrorTracker {
      */
     fun startTransaction(name: String, operation: String? = null): AnalyticsTransaction
 
-    fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction)
+    /**
+     * Starts an [AnalyticsLongRunningTransaction], that can be shared with other components.
+     */
+    fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction
 
-    fun stopLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction)
+    /**
+     * Gets an ongoing [AnalyticsLongRunningTransaction], if it exists.
+     */
+    fun getLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction?
+
+    /**
+     * Removes an ongoing [AnalyticsLongRunningTransaction] so it's no longer shared.
+     */
+    fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction?
 }
 
 inline fun <T> AnalyticsService.recordTransaction(name: String, operation: String, block: (AnalyticsTransaction) -> T): T {
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
index e773212f33..83c76dc2fe 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
@@ -153,11 +153,17 @@ class DefaultAnalyticsService(
         } ?: NoopAnalyticsTransaction
     }
 
-    override fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction) {
-        pendingLongRunningTransactions[longRunningTransaction] = startTransaction(longRunningTransaction.name, longRunningTransaction.operation)
+    override fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction {
+        val transaction = startTransaction(longRunningTransaction.name, longRunningTransaction.operation)
+        pendingLongRunningTransactions[longRunningTransaction] = transaction
+        return transaction
     }
 
-    override fun stopLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction) {
-        pendingLongRunningTransactions.remove(longRunningTransaction)?.finish()
+    override fun getLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? {
+        return pendingLongRunningTransactions[longRunningTransaction]
+    }
+
+    override fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? {
+        return pendingLongRunningTransactions.remove(longRunningTransaction)
     }
 }
diff --git a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
index a2175231a4..36eeaa0aa2 100644
--- a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
+++ b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
@@ -39,6 +39,7 @@ class NoopAnalyticsService : AnalyticsService {
     override fun trackError(throwable: Throwable) = Unit
     override fun updateSuperProperties(updatedProperties: SuperProperties) = Unit
     override fun startTransaction(name: String, operation: String?): AnalyticsTransaction = NoopAnalyticsTransaction
-    override fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction) {}
-    override fun stopLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction) {}
+    override fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction = NoopAnalyticsTransaction
+    override fun getLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? = null
+    override fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction) = NoopAnalyticsTransaction
 }
diff --git a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
index c83e0119ed..9899ced193 100644
--- a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
+++ b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
@@ -31,6 +31,7 @@ class FakeAnalyticsService(
     val screenEvents = mutableListOf<VectorAnalyticsScreen>()
     val trackedErrors = mutableListOf<Throwable>()
     val capturedUserProperties = mutableListOf<UserProperties>()
+    val longRunningTransactions = mutableMapOf<AnalyticsLongRunningTransaction, AnalyticsTransaction>()
 
     override fun getAvailableAnalyticsProviders(): Set<AnalyticsProvider> = emptySet()
 
@@ -70,6 +71,16 @@ class FakeAnalyticsService(
     }
 
     override fun startTransaction(name: String, operation: String?): AnalyticsTransaction = NoopAnalyticsTransaction
-    override fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction) {}
-    override fun stopLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction) {}
+    override fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction {
+        longRunningTransactions[longRunningTransaction] = NoopAnalyticsTransaction
+        return NoopAnalyticsTransaction
+    }
+
+    override fun getLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? {
+        return longRunningTransactions[longRunningTransaction]
+    }
+
+    override fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? {
+        return longRunningTransactions.remove(longRunningTransaction)
+    }
 }

From 8815fe79864f2e52372fc1532e78541e1075b0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Wed, 19 Nov 2025 17:27:56 +0100
Subject: [PATCH 088/113] Add a 'warm' room list performance check:

We want to measure how long it takes the SDK to update the room list when the app comes back from being in background.

Note we don't want to check this in cold starts, only warm ones.
---
 .../android/appnav/LoggedInFlowNode.kt        |   4 +
 .../AnalyticsRoomListStateWatcher.kt          |  79 ++++++++
 .../AnalyticsRoomListStateWatcherTest.kt      | 170 ++++++++++++++++++
 .../api/AnalyticsLongRunningTransaction.kt    |   1 +
 4 files changed, 254 insertions(+)
 create mode 100644 appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcher.kt
 create mode 100644 appnav/src/test/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcherTest.kt

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index 5d0f373c11..310913e0ac 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -41,6 +41,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.annotations.ContributesNode
+import io.element.android.appnav.analytics.AnalyticsRoomListStateWatcher
 import io.element.android.appnav.loggedin.LoggedInNode
 import io.element.android.appnav.loggedin.MediaPreviewConfigMigration
 import io.element.android.appnav.loggedin.SendQueues
@@ -139,6 +140,7 @@ class LoggedInFlowNode(
     private val buildMeta: BuildMeta,
     snackbarDispatcher: SnackbarDispatcher,
     private val analyticsService: AnalyticsService,
+    private val analyticsRoomListStateWatcher: AnalyticsRoomListStateWatcher,
 ) : BaseFlowNode<LoggedInFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Placeholder,
@@ -202,6 +204,7 @@ class LoggedInFlowNode(
         }
         lifecycle.subscribe(
             onCreate = {
+                analyticsRoomListStateWatcher.start()
                 appNavigationStateService.onNavigateToSession(id, matrixClient.sessionId)
                 // TODO We do not support Space yet, so directly navigate to main space
                 appNavigationStateService.onNavigateToSpace(id, MAIN_SPACE)
@@ -238,6 +241,7 @@ class LoggedInFlowNode(
                 appNavigationStateService.onLeavingSession(id)
                 loggedInFlowProcessor.stopObserving()
                 matrixClient.sessionVerificationService.setListener(null)
+                analyticsRoomListStateWatcher.stop()
             }
         )
         setupSendingQueue()
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcher.kt b/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcher.kt
new file mode 100644
index 0000000000..91efa0bf92
--- /dev/null
+++ b/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcher.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.appnav.analytics
+
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.coroutine.withPreviousValue
+import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.matrix.api.roomlist.RoomListService
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.ResumeAppUntilNewRoomsReceived
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.appnavstate.api.AppNavigationStateService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * This component is used to check how long it takes for the room list to be up to date after opening the app while it's on a 'warm' state:
+ * the app was previously running and we just returned to it.
+ */
+@Inject
+class AnalyticsRoomListStateWatcher(
+    private val appNavigationStateService: AppNavigationStateService,
+    private val roomListService: RoomListService,
+    private val analyticsService: AnalyticsService,
+    @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
+    private val dispatchers: CoroutineDispatchers,
+) {
+    private var currentCoroutineScope: CoroutineScope? = null
+    private val isWarmState = AtomicBoolean(false)
+
+    fun start() {
+        if (currentCoroutineScope != null) {
+            Timber.w("Can't start RoomListStateWatcher, it's already running.")
+            return
+        }
+
+        val coroutineScope = CoroutineScope(sessionCoroutineScope.coroutineContext + dispatchers.computation)
+        appNavigationStateService.appNavigationState
+            .map { it.isInForeground }
+            .distinctUntilChanged()
+            .withPreviousValue()
+            .onEach { (wasInForeground, isInForeground) ->
+                if (isInForeground && roomListService.state.value != RoomListService.State.Running) {
+                    analyticsService.startLongRunningTransaction(ResumeAppUntilNewRoomsReceived)
+                }
+
+                if (wasInForeground == false && isInForeground) {
+                    isWarmState.set(true)
+                }
+            }
+            .launchIn(coroutineScope)
+
+        roomListService.state
+            .onEach { state ->
+                if (state == RoomListService.State.Running && isWarmState.get()) {
+                    analyticsService.removeLongRunningTransaction(ResumeAppUntilNewRoomsReceived)?.finish()
+                }
+            }
+            .launchIn(coroutineScope)
+
+        currentCoroutineScope = coroutineScope
+    }
+
+    fun stop() {
+        currentCoroutineScope?.cancel()
+        currentCoroutineScope = null
+    }
+}
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcherTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcherTest.kt
new file mode 100644
index 0000000000..f05190acc7
--- /dev/null
+++ b/appnav/src/test/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcherTest.kt
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.appnav.analytics
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.roomlist.RoomListService
+import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.ResumeAppUntilNewRoomsReceived
+import io.element.android.services.analytics.test.FakeAnalyticsService
+import io.element.android.services.appnavstate.api.AppNavigationState
+import io.element.android.services.appnavstate.api.NavigationState
+import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
+import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class AnalyticsRoomListStateWatcherTest {
+    @Test
+    fun `Opening the app in a warm state tracks the time until the room list is synced`() = runTest {
+        val navigationStateService = FakeAppNavigationStateService()
+        val roomListService = FakeRoomListService().apply {
+            postState(RoomListService.State.Idle)
+        }
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsRoomListStateWatcher(
+            appNavigationStateService = navigationStateService,
+            roomListService = roomListService,
+            analyticsService = analyticsService,
+        )
+
+        watcher.start()
+
+        // Give some time to load the initial state
+        runCurrent()
+
+        // Make sure it's warm by changing its internal state
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = false))
+        runCurrent()
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = true))
+        runCurrent()
+
+        // The transaction should be present now
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNotNull()
+
+        // And now the room list service running
+        roomListService.postState(RoomListService.State.Running)
+        runCurrent()
+
+        // And the transaction should now be gone
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNull()
+
+        watcher.stop()
+    }
+
+    @Test
+    fun `Opening the app in a cold state does nothing`() = runTest {
+        val navigationStateService = FakeAppNavigationStateService().apply {
+            appNavigationState.emit(AppNavigationState(NavigationState.Root, false))
+        }
+        val roomListService = FakeRoomListService().apply {
+            postState(RoomListService.State.Idle)
+        }
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsRoomListStateWatcher(
+            appNavigationStateService = navigationStateService,
+            roomListService = roomListService,
+            analyticsService = analyticsService,
+        )
+
+        watcher.start()
+
+        // Give some time to load the initial state
+        runCurrent()
+
+        // The room list service running
+        roomListService.postState(RoomListService.State.Running)
+        runCurrent()
+
+        // The transaction was never present
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNull()
+
+        watcher.stop()
+    }
+
+    @Test
+    fun `The transaction won't be finished until the room list is synchronised`() = runTest {
+        val navigationStateService = FakeAppNavigationStateService()
+        val roomListService = FakeRoomListService().apply {
+            postState(RoomListService.State.Idle)
+        }
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsRoomListStateWatcher(
+            appNavigationStateService = navigationStateService,
+            roomListService = roomListService,
+            analyticsService = analyticsService,
+        )
+
+        watcher.start()
+
+        // Give some time to load the initial state
+        runCurrent()
+
+        // Make sure it's warm by changing its internal state
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = false))
+        runCurrent()
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = true))
+        runCurrent()
+
+        // The transaction should be present now
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNotNull()
+
+        runCurrent()
+
+        // But without the room list syncing, it never finishes
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNotNull()
+
+        watcher.stop()
+    }
+
+    @Test
+    fun `Opening the app when the room list state was already Running does nothing`() = runTest {
+        val navigationStateService = FakeAppNavigationStateService()
+        val roomListService = FakeRoomListService().apply {
+            postState(RoomListService.State.Running)
+        }
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsRoomListStateWatcher(
+            appNavigationStateService = navigationStateService,
+            roomListService = roomListService,
+            analyticsService = analyticsService,
+        )
+
+        watcher.start()
+
+        // Give some time to load the initial state
+        runCurrent()
+
+        // Make sure it's warm by changing its internal state
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = false))
+        runCurrent()
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = true))
+        runCurrent()
+
+        // The transaction was never added
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNull()
+
+        watcher.stop()
+    }
+
+    private fun TestScope.createAnalyticsRoomListStateWatcher(
+        appNavigationStateService: FakeAppNavigationStateService = FakeAppNavigationStateService(),
+        roomListService: FakeRoomListService = FakeRoomListService(),
+        analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
+    ) = AnalyticsRoomListStateWatcher(
+        appNavigationStateService = appNavigationStateService,
+        roomListService = roomListService,
+        analyticsService = analyticsService,
+        sessionCoroutineScope = backgroundScope,
+        dispatchers = testCoroutineDispatchers(),
+    )
+}
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
index e465e2450a..c4aa5cc69b 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
@@ -12,4 +12,5 @@ sealed class AnalyticsLongRunningTransaction(
     val operation: String?,
 ) {
     data object FirstRoomsDisplayed : AnalyticsLongRunningTransaction("First rooms displayed after login or restoration", null)
+    data object ResumeAppUntilNewRoomsReceived : AnalyticsLongRunningTransaction("App was resumed and new room list items arrived", null)
 }

From e1bd189ba06e0eba30cd4d2078f8e83af9db4401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 20 Nov 2025 09:04:36 +0100
Subject: [PATCH 089/113] Add a performance check for notification tap ->
 populated timeline time

---
 .../element/android/x/intent/DefaultIntentProvider.kt  |  1 +
 .../kotlin/io/element/android/appnav/RootFlowNode.kt   | 10 +++++++++-
 .../messages/impl/timeline/TimelinePresenter.kt        |  4 ++++
 .../messages/impl/timeline/TimelinePresenterTest.kt    |  2 ++
 .../analytics/api/AnalyticsLongRunningTransaction.kt   |  1 +
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt b/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
index 204ee27313..a4272063ba 100644
--- a/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
+++ b/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
@@ -36,6 +36,7 @@ class DefaultIntentProvider(
         return Intent(context, MainActivity::class.java).apply {
             action = Intent.ACTION_VIEW
             data = deepLinkCreator.create(sessionId, roomId, threadId, eventId).toUri()
+            putExtra("from_notification", true)
         }
     }
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
index 1a23bce132..6fce57926b 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -62,6 +62,8 @@ import io.element.android.libraries.oidc.api.OidcActionFlow
 import io.element.android.libraries.sessionstorage.api.LoggedInState
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.ui.common.nodes.emptyNode
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -86,6 +88,7 @@ class RootFlowNode(
     private val oidcActionFlow: OidcActionFlow,
     private val featureFlagService: FeatureFlagService,
     private val announcementService: AnnouncementService,
+    private val analyticsService: AnalyticsService,
 ) : BaseFlowNode<RootFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.SplashScreen,
@@ -310,7 +313,12 @@ class RootFlowNode(
     suspend fun handleIntent(intent: Intent) {
         val resolvedIntent = intentResolver.resolve(intent) ?: return
         when (resolvedIntent) {
-            is ResolvedIntent.Navigation -> navigateTo(resolvedIntent.deeplinkData)
+            is ResolvedIntent.Navigation -> {
+                if (intent.getBooleanExtra("from_notification", false) && resolvedIntent.deeplinkData is DeeplinkData.Room) {
+                    analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.NotificationTapOpensTimeline)
+                }
+                navigateTo(resolvedIntent.deeplinkData)
+            }
             is ResolvedIntent.Login -> onLoginLink(resolvedIntent.params)
             is ResolvedIntent.Oidc -> onOidcAction(resolvedIntent.oidcAction)
             is ResolvedIntent.Permalink -> navigateTo(resolvedIntent.permalinkData)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
index 596c1d87e4..14b873491b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -55,6 +55,8 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
 import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
 import io.element.android.libraries.matrix.ui.room.canSendMessageAsState
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
@@ -86,6 +88,7 @@ class TimelinePresenter(
     private val typingNotificationPresenter: Presenter<TypingNotificationState>,
     private val roomCallStatePresenter: Presenter<RoomCallState>,
     private val featureFlagService: FeatureFlagService,
+    private val analyticsService: AnalyticsService,
 ) : Presenter<TimelineState> {
     private val tag = "TimelinePresenter"
     @AssistedFactory
@@ -225,6 +228,7 @@ class TimelinePresenter(
         LaunchedEffect(Unit) {
             timelineItemsFactory.timelineItems
                 .onEach { newTimelineItems ->
+                    analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.NotificationTapOpensTimeline)?.finish()
                     timelineItemIndexer.process(newTimelineItems)
                     timelineItems = newTimelineItems
                 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
index fbfce752ea..13c28da6e9 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
@@ -60,6 +60,7 @@ import io.element.android.libraries.matrix.test.timeline.aMessageContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
+import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.awaitLastSequentialItem
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
@@ -1054,6 +1055,7 @@ class TimelinePresenterTest {
             typingNotificationPresenter = { aTypingNotificationState() },
             roomCallStatePresenter = { aStandByCallState() },
             featureFlagService = featureFlagService,
+            analyticsService = FakeAnalyticsService(),
         )
     }
 }
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
index c4aa5cc69b..96dfe4ba3c 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
@@ -13,4 +13,5 @@ sealed class AnalyticsLongRunningTransaction(
 ) {
     data object FirstRoomsDisplayed : AnalyticsLongRunningTransaction("First rooms displayed after login or restoration", null)
     data object ResumeAppUntilNewRoomsReceived : AnalyticsLongRunningTransaction("App was resumed and new room list items arrived", null)
+    data object NotificationTapOpensTimeline : AnalyticsLongRunningTransaction("A notification was tapped and it opened a timeline", null)
 }

From daf7bea39e76d3a3826beb985bf5217b939ad1bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 20 Nov 2025 10:08:53 +0100
Subject: [PATCH 090/113] Add another performance check for cold start time
 until the cached room list is displayed

---
 .../android/appnav/NotLoggedInFlowNode.kt     |  3 +
 .../io/element/android/appnav/RootFlowNode.kt |  3 +
 .../analytics/AnalyticsColdStartWatcher.kt    | 69 +++++++++++++++++++
 features/home/impl/build.gradle.kts           |  1 +
 .../home/impl/roomlist/RoomListPresenter.kt   |  4 ++
 .../impl/roomlist/RoomListPresenterTest.kt    | 10 +++
 .../api/AnalyticsLongRunningTransaction.kt    |  1 +
 7 files changed, 91 insertions(+)
 create mode 100644 appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
index d888ac3b15..b1d371b4c0 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
@@ -24,6 +24,7 @@ import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.appnav.analytics.AnalyticsColdStartWatcher
 import io.element.android.features.login.api.LoginEntryPoint
 import io.element.android.features.login.api.LoginParams
 import io.element.android.libraries.architecture.BackstackView
@@ -43,6 +44,7 @@ class NotLoggedInFlowNode(
     @Assisted plugins: List<Plugin>,
     private val loginEntryPoint: LoginEntryPoint,
     private val imageLoaderHolder: ImageLoaderHolder,
+    private val analyticsColdStartWatcher: AnalyticsColdStartWatcher,
 ) : BaseFlowNode<NotLoggedInFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Root,
@@ -65,6 +67,7 @@ class NotLoggedInFlowNode(
 
     override fun onBuilt() {
         super.onBuilt()
+        analyticsColdStartWatcher.whenLoggingIn()
         lifecycle.subscribe(
             onResume = {
                 SingletonImageLoader.setUnsafe(imageLoaderHolder.get())
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
index 6fce57926b..52788fc992 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -29,6 +29,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.annotations.ContributesNode
+import io.element.android.appnav.analytics.AnalyticsColdStartWatcher
 import io.element.android.appnav.di.MatrixSessionCache
 import io.element.android.appnav.intent.IntentResolver
 import io.element.android.appnav.intent.ResolvedIntent
@@ -89,6 +90,7 @@ class RootFlowNode(
     private val featureFlagService: FeatureFlagService,
     private val announcementService: AnnouncementService,
     private val analyticsService: AnalyticsService,
+    private val analyticsColdStartWatcher: AnalyticsColdStartWatcher,
 ) : BaseFlowNode<RootFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.SplashScreen,
@@ -98,6 +100,7 @@ class RootFlowNode(
     plugins = plugins
 ) {
     override fun onBuilt() {
+        analyticsColdStartWatcher.start()
         matrixSessionCache.restoreWithSavedState(buildContext.savedStateMap)
         super.onBuilt()
         observeNavState()
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt b/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt
new file mode 100644
index 0000000000..29dcd61211
--- /dev/null
+++ b/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.appnav.analytics
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * Adds a performance check transaction measuring the time between a cold start (or, after we read the user consent after a cold start)
+ * until the cached room list is displayed. This check only takes place in a cold app start after the user is authenticated.
+ */
+interface AnalyticsColdStartWatcher {
+    fun start()
+    fun whenLoggingIn()
+    fun onRoomListVisible()
+}
+
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
+class DefaultAnalyticsColdStartWatcher(
+    private val analyticsService: AnalyticsService,
+    @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
+) : AnalyticsColdStartWatcher {
+    private val isColdStart = AtomicBoolean(true)
+
+    override fun start() {
+        analyticsService.userConsentFlow
+            .onEach { hasConsent ->
+                if (hasConsent) {
+                    if (isColdStart.get()) {
+                        Timber.d("Starting cold start check")
+                        analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)
+                    } else {
+                        error("The app is no longer in a cold start state")
+                    }
+                }
+            }
+            .catch { Timber.w(it.message) }
+            .launchIn(appCoroutineScope)
+    }
+
+    override fun whenLoggingIn() {
+        if (isColdStart.getAndSet(false)) {
+            Timber.d("Canceled cold start check: user is logging in")
+        }
+    }
+
+    override fun onRoomListVisible() {
+        if (isColdStart.getAndSet(false)) {
+            Timber.d("Room list is visible, finishing cold start check")
+            analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)?.finish()
+        }
+    }
+}
diff --git a/features/home/impl/build.gradle.kts b/features/home/impl/build.gradle.kts
index b36ee6aed2..9362702a1a 100644
--- a/features/home/impl/build.gradle.kts
+++ b/features/home/impl/build.gradle.kts
@@ -28,6 +28,7 @@ setupDependencyInjection()
 
 dependencies {
     implementation(projects.appconfig)
+    implementation(projects.appnav)
     implementation(projects.libraries.core)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt
index 6493d76d98..ce1197f9ca 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt
@@ -25,6 +25,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.Interaction
+import io.element.android.appnav.analytics.AnalyticsColdStartWatcher
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.features.announcement.api.AnnouncementService
 import io.element.android.features.home.impl.datasource.RoomListDataSource
@@ -86,6 +87,7 @@ class RoomListPresenter(
     private val appPreferencesStore: AppPreferencesStore,
     private val seenInvitesStore: SeenInvitesStore,
     private val announcementService: AnnouncementService,
+    private val coldStartWatcher: AnalyticsColdStartWatcher,
 ) : Presenter<RoomListState> {
     private val encryptionService = client.encryptionService
 
@@ -236,6 +238,8 @@ class RoomListPresenter(
             )
             showSkeleton -> RoomListContentState.Skeleton(count = 16)
             else -> {
+                coldStartWatcher.onRoomListVisible()
+
                 RoomListContentState.Rooms(
                     securityBannerState = securityBannerState,
                     showNewNotificationSoundBanner = showNewNotificationSoundBanner,
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
index cf636e26ca..a3be896f40 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
@@ -13,6 +13,7 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.Interaction
+import io.element.android.appnav.analytics.AnalyticsColdStartWatcher
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.features.announcement.api.AnnouncementService
 import io.element.android.features.home.impl.FakeDateTimeObserver
@@ -673,5 +674,14 @@ class RoomListPresenterTest {
         appPreferencesStore = appPreferencesStore,
         seenInvitesStore = seenInvitesStore,
         announcementService = announcementService,
+        coldStartWatcher = FakeAnalyticsColdStartWatcher(),
     )
 }
+
+private class FakeAnalyticsColdStartWatcher : AnalyticsColdStartWatcher {
+    override fun start() {}
+
+    override fun whenLoggingIn() {}
+
+    override fun onRoomListVisible() {}
+}
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
index 96dfe4ba3c..670b9ef268 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
@@ -11,6 +11,7 @@ sealed class AnalyticsLongRunningTransaction(
     val name: String,
     val operation: String?,
 ) {
+    data object ColdStartUntilCachedRoomList : AnalyticsLongRunningTransaction("Cold start until cached room list is displayed", null)
     data object FirstRoomsDisplayed : AnalyticsLongRunningTransaction("First rooms displayed after login or restoration", null)
     data object ResumeAppUntilNewRoomsReceived : AnalyticsLongRunningTransaction("App was resumed and new room list items arrived", null)
     data object NotificationTapOpensTimeline : AnalyticsLongRunningTransaction("A notification was tapped and it opened a timeline", null)

From 10b31e3e7267e4e2f03ba79de33152c6ef22c26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 20 Nov 2025 11:21:34 +0100
Subject: [PATCH 091/113] Add `OpenRoom` long running analytic transaction

---
 .../kotlin/io/element/android/appnav/room/RoomFlowNode.kt     | 4 ++++
 .../features/messages/impl/timeline/TimelinePresenter.kt      | 1 +
 .../services/analytics/api/AnalyticsLongRunningTransaction.kt | 1 +
 3 files changed, 6 insertions(+)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
index 22e1d925c9..16bae8c30f 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
@@ -48,6 +48,8 @@ import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.ui.room.LoadingRoomState
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
@@ -70,6 +72,7 @@ class RoomFlowNode(
     private val joinRoomEntryPoint: JoinRoomEntryPoint,
     private val roomAliasResolverEntryPoint: RoomAliasResolverEntryPoint,
     private val membershipObserver: RoomMembershipObserver,
+    private val analyticsService: AnalyticsService,
 ) : BaseFlowNode<RoomFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Loading,
@@ -108,6 +111,7 @@ class RoomFlowNode(
 
     override fun onBuilt() {
         super.onBuilt()
+        analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.OpenRoom)
         resolveRoomId()
     }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
index 14b873491b..15ceb70682 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -229,6 +229,7 @@ class TimelinePresenter(
             timelineItemsFactory.timelineItems
                 .onEach { newTimelineItems ->
                     analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.NotificationTapOpensTimeline)?.finish()
+                    analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.OpenRoom)?.finish()
                     timelineItemIndexer.process(newTimelineItems)
                     timelineItems = newTimelineItems
                 }
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
index 670b9ef268..b173b2cb8f 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
@@ -15,4 +15,5 @@ sealed class AnalyticsLongRunningTransaction(
     data object FirstRoomsDisplayed : AnalyticsLongRunningTransaction("First rooms displayed after login or restoration", null)
     data object ResumeAppUntilNewRoomsReceived : AnalyticsLongRunningTransaction("App was resumed and new room list items arrived", null)
     data object NotificationTapOpensTimeline : AnalyticsLongRunningTransaction("A notification was tapped and it opened a timeline", null)
+    data object OpenRoom : AnalyticsLongRunningTransaction("Open a room and see loaded items in the timeline", null)
 }

From 4b3796844fed3837d20be8b5980b3f231a59954e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 20 Nov 2025 12:23:03 +0100
Subject: [PATCH 092/113] Add transaction trees for opening a room so we can
 have a nice trace view

---
 .../analytics/AnalyticsColdStartWatcher.kt    |  6 ++++--
 .../android/appnav/room/RoomFlowNode.kt       |  8 +++++--
 .../room/joined/JoinedRoomLoadedFlowNode.kt   |  8 +++++++
 .../appnav/JoinedRoomLoadedFlowNodeTest.kt    |  2 ++
 .../features/messages/impl/MessagesNode.kt    |  4 ++++
 .../impl/timeline/TimelinePresenter.kt        | 21 ++++++++++++++++---
 .../matrix/impl/room/RustRoomFactory.kt       |  8 ++++++-
 .../api/AnalyticsLongRunningTransaction.kt    |  3 +++
 .../analytics/api/AnalyticsService.kt         | 15 ++++++++++---
 .../analytics/impl/DefaultAnalyticsService.kt |  9 ++++++--
 .../analytics/noop/NoopAnalyticsService.kt    |  5 ++++-
 .../analytics/test/FakeAnalyticsService.kt    |  5 ++++-
 .../sentry/SentryAnalyticsTransaction.kt      |  8 ++++++-
 13 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt b/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt
index 29dcd61211..0782973cc4 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt
@@ -12,6 +12,7 @@ import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.catch
@@ -44,7 +45,7 @@ class DefaultAnalyticsColdStartWatcher(
                 if (hasConsent) {
                     if (isColdStart.get()) {
                         Timber.d("Starting cold start check")
-                        analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)
+                        analyticsService.startLongRunningTransaction(ColdStartUntilCachedRoomList)
                     } else {
                         error("The app is no longer in a cold start state")
                     }
@@ -56,6 +57,7 @@ class DefaultAnalyticsColdStartWatcher(
 
     override fun whenLoggingIn() {
         if (isColdStart.getAndSet(false)) {
+            analyticsService.removeLongRunningTransaction(ColdStartUntilCachedRoomList)
             Timber.d("Canceled cold start check: user is logging in")
         }
     }
@@ -63,7 +65,7 @@ class DefaultAnalyticsColdStartWatcher(
     override fun onRoomListVisible() {
         if (isColdStart.getAndSet(false)) {
             Timber.d("Room list is visible, finishing cold start check")
-            analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)?.finish()
+            analyticsService.removeLongRunningTransaction(ColdStartUntilCachedRoomList)?.finish()
         }
     }
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
index 16bae8c30f..9aa62d6b16 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
@@ -48,7 +48,9 @@ import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.ui.room.LoadingRoomState
-import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.LoadJoinedRoomFlow
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.NotificationTapOpensTimeline
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.OpenRoom
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -111,7 +113,9 @@ class RoomFlowNode(
 
     override fun onBuilt() {
         super.onBuilt()
-        analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.OpenRoom)
+        val parentTransaction = analyticsService.getLongRunningTransaction(NotificationTapOpensTimeline)
+        val openRoomTransaction = analyticsService.startLongRunningTransaction(OpenRoom, parentTransaction)
+        analyticsService.startLongRunningTransaction(LoadJoinedRoomFlow, openRoomTransaction)
         resolveRoomId()
     }
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
index dab636031f..3ff8e16b49 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
@@ -45,6 +45,10 @@ import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.LoadJoinedRoomFlow
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.LoadMessagesUi
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.OpenRoom
+import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
@@ -66,6 +70,7 @@ class JoinedRoomLoadedFlowNode(
     private val sessionCoroutineScope: CoroutineScope,
     private val matrixClient: MatrixClient,
     private val activeRoomsHolder: ActiveRoomsHolder,
+    private val analyticsService: AnalyticsService,
     roomGraphFactory: RoomGraphFactory,
 ) : BaseFlowNode<JoinedRoomLoadedFlowNode.NavTarget>(
     backstack = BackStack(
@@ -93,6 +98,8 @@ class JoinedRoomLoadedFlowNode(
     init {
         lifecycle.subscribe(
             onCreate = {
+                val parent = analyticsService.getLongRunningTransaction(OpenRoom)
+                analyticsService.startLongRunningTransaction(LoadMessagesUi, parent)
                 Timber.v("OnCreate => ${inputs.room.roomId}")
                 appNavigationStateService.onNavigateToRoom(id, inputs.room.roomId)
                 activeRoomsHolder.addRoom(inputs.room)
@@ -100,6 +107,7 @@ class JoinedRoomLoadedFlowNode(
                 trackVisitedRoom()
             },
             onResume = {
+                analyticsService.removeLongRunningTransaction(LoadJoinedRoomFlow)?.finish()
                 sessionCoroutineScope.launch {
                     inputs.room.subscribeToSync()
                 }
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
index 77fcbae14e..6cd7df025b 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
@@ -34,6 +34,7 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
 import io.element.android.services.appnavstate.impl.DefaultActiveRoomsHolder
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
@@ -123,6 +124,7 @@ class JoinedRoomLoadedFlowNodeTest {
         roomGraphFactory = FakeRoomGraphFactory(),
         matrixClient = matrixClient,
         activeRoomsHolder = activeRoomsHolder,
+        analyticsService = FakeAnalyticsService(),
     )
 
     @Test
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
index 168a4d6b3d..2032d70d64 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
@@ -68,6 +68,7 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.mediaplayer.api.MediaPlayer
 import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.LoadMessagesUi
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -136,6 +137,9 @@ class MessagesNode(
             onCreate = {
                 sessionCoroutineScope.launch { analyticsService.capture(room.toAnalyticsViewRoom()) }
             },
+            onResume = {
+                analyticsService.removeLongRunningTransaction(LoadMessagesUi)?.finish()
+            },
             onDestroy = {
                 mediaPlayer.close()
             }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
index 15ceb70682..3044822256 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -55,7 +55,9 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
 import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
 import io.element.android.libraries.matrix.ui.room.canSendMessageAsState
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
-import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.DisplayFirstTimelineItems
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.NotificationTapOpensTimeline
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.OpenRoom
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -111,6 +113,11 @@ class TimelinePresenter(
 
     @Composable
     override fun present(): TimelineState {
+        LaunchedEffect(Unit) {
+            val parent = analyticsService.getLongRunningTransaction(OpenRoom)
+            analyticsService.startLongRunningTransaction(DisplayFirstTimelineItems, parent)
+        }
+
         val localScope = rememberCoroutineScope()
 
         val timelineMode = remember { timelineController.mainTimelineMode() }
@@ -228,18 +235,26 @@ class TimelinePresenter(
         LaunchedEffect(Unit) {
             timelineItemsFactory.timelineItems
                 .onEach { newTimelineItems ->
-                    analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.NotificationTapOpensTimeline)?.finish()
-                    analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.OpenRoom)?.finish()
                     timelineItemIndexer.process(newTimelineItems)
                     timelineItems = newTimelineItems
+
+                    analyticsService.run {
+                        removeLongRunningTransaction(DisplayFirstTimelineItems)?.finish()
+                        removeLongRunningTransaction(OpenRoom)?.finish()
+                        removeLongRunningTransaction(NotificationTapOpensTimeline)?.finish()
+                    }
                 }
                 .launchIn(this)
 
             combine(timelineController.timelineItems(), room.membersStateFlow) { items, membersState ->
+                val parent = analyticsService.getLongRunningTransaction(DisplayFirstTimelineItems)
+                val transaction = parent?.startChild("timelineItemsFactory.replaceWith", "Processing timeline items")
+                transaction?.setData("items", items.count())
                 timelineItemsFactory.replaceWith(
                     timelineItems = items,
                     roomMembers = membersState.roomMembers().orEmpty()
                 )
+                transaction?.finish()
                 items
             }
                 .onEach(redactedVoiceMessageManager::onEachMatrixTimelineItem)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
index 083777a7b7..5ff8e5d999 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
@@ -23,6 +23,7 @@ import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.roomlist.awaitLoaded
 import io.element.android.libraries.matrix.impl.room.preview.RoomPreviewInfoMapper
 import io.element.android.libraries.matrix.impl.roomlist.roomOrNull
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.api.recordTransaction
 import io.element.android.services.analyticsproviders.api.recordChildTransaction
@@ -113,10 +114,13 @@ class RustRoomFactory(
 
             val sdkRoom = awaitRoomInRoomList(roomId) ?: return@withLock null
 
+            val parentTransaction = analyticsService.getLongRunningTransaction(AnalyticsLongRunningTransaction.OpenRoom)
+
             if (sdkRoom.membership() == Membership.JOINED) {
                 analyticsService.recordTransaction(
                     name = "Get joined room",
                     operation = "RustRoomFactory.getJoinedRoomOrPreview",
+                    parentTransaction = parentTransaction,
                 ) { transaction ->
                     val hideThreadedEvents = featureFlagService.isFeatureEnabled(FeatureFlags.Threads)
                     // Init the live timeline in the SDK from the Room
@@ -136,9 +140,10 @@ class RustRoomFactory(
                         )
                     }
 
+                    val baseRoom = transaction.recordChildTransaction(operation = "getBaseRoom", description = "Get room from SDK") { getBaseRoom(sdkRoom) }
                     GetRoomResult.Joined(
                         JoinedRustRoom(
-                            baseRoom = getBaseRoom(sdkRoom),
+                            baseRoom = baseRoom,
                             notificationSettingsService = notificationSettingsService,
                             roomContentForwarder = roomContentForwarder,
                             liveInnerTimeline = timeline,
@@ -152,6 +157,7 @@ class RustRoomFactory(
                 analyticsService.recordTransaction(
                     name = "Get preview of room",
                     operation = "RustRoomFactory.getJoinedRoomOrPreview",
+                    parentTransaction = parentTransaction,
                 ) {
                     val preview = try {
                         sdkRoom.previewRoom(via = serverNames)
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
index b173b2cb8f..b318807a45 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
@@ -16,4 +16,7 @@ sealed class AnalyticsLongRunningTransaction(
     data object ResumeAppUntilNewRoomsReceived : AnalyticsLongRunningTransaction("App was resumed and new room list items arrived", null)
     data object NotificationTapOpensTimeline : AnalyticsLongRunningTransaction("A notification was tapped and it opened a timeline", null)
     data object OpenRoom : AnalyticsLongRunningTransaction("Open a room and see loaded items in the timeline", null)
+    data object LoadJoinedRoomFlow : AnalyticsLongRunningTransaction("Load joined room UI", "ui.load")
+    data object LoadMessagesUi : AnalyticsLongRunningTransaction("Load messages UI", "ui.load")
+    data object DisplayFirstTimelineItems : AnalyticsLongRunningTransaction("Get and display first timeline items", null)
 }
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
index 726ec4180d..1e95263509 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
@@ -58,7 +58,10 @@ interface AnalyticsService : AnalyticsTracker, ErrorTracker {
     /**
      * Starts an [AnalyticsLongRunningTransaction], that can be shared with other components.
      */
-    fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction
+    fun startLongRunningTransaction(
+        longRunningTransaction: AnalyticsLongRunningTransaction,
+        parentTransaction: AnalyticsTransaction? = null
+    ): AnalyticsTransaction
 
     /**
      * Gets an ongoing [AnalyticsLongRunningTransaction], if it exists.
@@ -71,8 +74,14 @@ interface AnalyticsService : AnalyticsTracker, ErrorTracker {
     fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction?
 }
 
-inline fun <T> AnalyticsService.recordTransaction(name: String, operation: String, block: (AnalyticsTransaction) -> T): T {
-    val transaction = startTransaction(name, operation)
+inline fun <T> AnalyticsService.recordTransaction(
+    name: String,
+    operation: String,
+    parentTransaction: AnalyticsTransaction? = null,
+    block: (AnalyticsTransaction) -> T
+): T {
+    val transaction = parentTransaction?.startChild(name, operation)
+        ?: startTransaction(name, operation)
     try {
         val result = block(transaction)
         return result
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
index 83c76dc2fe..f1a5b444de 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
@@ -153,8 +153,13 @@ class DefaultAnalyticsService(
         } ?: NoopAnalyticsTransaction
     }
 
-    override fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction {
-        val transaction = startTransaction(longRunningTransaction.name, longRunningTransaction.operation)
+    override fun startLongRunningTransaction(
+        longRunningTransaction: AnalyticsLongRunningTransaction,
+        parentTransaction: AnalyticsTransaction?,
+    ): AnalyticsTransaction {
+        val transaction = parentTransaction?.startChild(longRunningTransaction.name, longRunningTransaction.operation)
+            ?: startTransaction(longRunningTransaction.name, longRunningTransaction.operation)
+
         pendingLongRunningTransactions[longRunningTransaction] = transaction
         return transaction
     }
diff --git a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
index 36eeaa0aa2..591651ed6c 100644
--- a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
+++ b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
@@ -39,7 +39,10 @@ class NoopAnalyticsService : AnalyticsService {
     override fun trackError(throwable: Throwable) = Unit
     override fun updateSuperProperties(updatedProperties: SuperProperties) = Unit
     override fun startTransaction(name: String, operation: String?): AnalyticsTransaction = NoopAnalyticsTransaction
-    override fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction = NoopAnalyticsTransaction
+    override fun startLongRunningTransaction(
+        longRunningTransaction: AnalyticsLongRunningTransaction,
+        parentTransaction: AnalyticsTransaction?,
+    ): AnalyticsTransaction = NoopAnalyticsTransaction
     override fun getLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? = null
     override fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction) = NoopAnalyticsTransaction
 }
diff --git a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
index 9899ced193..274d06f6a5 100644
--- a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
+++ b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
@@ -71,7 +71,10 @@ class FakeAnalyticsService(
     }
 
     override fun startTransaction(name: String, operation: String?): AnalyticsTransaction = NoopAnalyticsTransaction
-    override fun startLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction {
+    override fun startLongRunningTransaction(
+        longRunningTransaction: AnalyticsLongRunningTransaction,
+        parentTransaction: AnalyticsTransaction?
+    ): AnalyticsTransaction {
         longRunningTransactions[longRunningTransaction] = NoopAnalyticsTransaction
         return NoopAnalyticsTransaction
     }
diff --git a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsTransaction.kt b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsTransaction.kt
index 5ed346aa6c..90bbd77e00 100644
--- a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsTransaction.kt
+++ b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsTransaction.kt
@@ -9,7 +9,9 @@ package io.element.android.services.analyticsproviders.sentry
 
 import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
 import io.sentry.ISpan
+import io.sentry.ITransaction
 import io.sentry.Sentry
+import timber.log.Timber
 
 class SentryAnalyticsTransaction private constructor(span: ISpan) : AnalyticsTransaction {
     constructor(name: String, operation: String?) : this(Sentry.startTransaction(name, operation.orEmpty()))
@@ -20,5 +22,9 @@ class SentryAnalyticsTransaction private constructor(span: ISpan) : AnalyticsTra
     )
     override fun setData(key: String, value: Any) = inner.setData(key, value)
     override fun isFinished(): Boolean = inner.isFinished
-    override fun finish() = inner.finish()
+    override fun finish() {
+        val name = if (inner is ITransaction) inner.name else inner.operation
+        Timber.d("Finishing transaction: $name")
+        inner.finish()
+    }
 }

From 055b9f67a002404c246972f3940772eadef9280c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 20 Nov 2025 12:45:52 +0100
Subject: [PATCH 093/113] Add tests for `DefaultAnalyticsColdStartWatcher`

---
 .../analytics/AnalyticsColdStartWatcher.kt    |   1 -
 .../DefaultAnalyticsColdStartWatcherTest.kt   | 107 ++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 appnav/src/test/kotlin/io/element/android/appnav/analytics/DefaultAnalyticsColdStartWatcherTest.kt

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt b/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt
index 0782973cc4..8b9efa94bf 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt
@@ -11,7 +11,6 @@ import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.AppCoroutineScope
-import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/analytics/DefaultAnalyticsColdStartWatcherTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/analytics/DefaultAnalyticsColdStartWatcherTest.kt
new file mode 100644
index 0000000000..d71d51faba
--- /dev/null
+++ b/appnav/src/test/kotlin/io/element/android/appnav/analytics/DefaultAnalyticsColdStartWatcherTest.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.appnav.analytics
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList
+import io.element.android.services.analytics.test.FakeAnalyticsService
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultAnalyticsColdStartWatcherTest {
+    @Test
+    fun `watch - until room list is visible`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsColdStartWatcher(analyticsService)
+
+        // Start watching
+        watcher.start()
+
+        // The user has given analytics consent, we can start tracking the cold start
+        analyticsService.setUserConsent(true)
+        runCurrent()
+
+        // The transaction is running
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNotNull()
+
+        // As soon as the room list is visible
+        watcher.onRoomListVisible()
+        runCurrent()
+
+        // The transaction is now finished
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNull()
+    }
+
+    @Test
+    fun `watch - user is logging in, transaction is cancelled since it's not a cold start`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsColdStartWatcher(analyticsService)
+
+        // Start watching
+        watcher.start()
+
+        // The user has given analytics consent, we can start tracking the cold start
+        analyticsService.setUserConsent(true)
+        runCurrent()
+
+        // The transaction is running
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNotNull()
+
+        // If the user starts a login flow
+        watcher.whenLoggingIn()
+        runCurrent()
+
+        // The transaction is gone
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNull()
+    }
+
+    @Test
+    fun `watch - user was logging in, transaction is never started since it's not a cold start`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsColdStartWatcher(analyticsService)
+
+        // Start watching
+        watcher.start()
+
+        // If the user starts a login flow
+        watcher.whenLoggingIn()
+
+        // The user has given analytics consent, we can start tracking the cold start
+        analyticsService.setUserConsent(true)
+        runCurrent()
+
+        // The transaction never starts
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNull()
+    }
+
+    @Test
+    fun `watch - never gets consent so it does nothing`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsColdStartWatcher(analyticsService)
+
+        // Start watching
+        watcher.start()
+
+        // The user never gets the analytics consent, so we do nothing
+        runCurrent()
+
+        // The transaction is not running in that case
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNull()
+    }
+
+    private fun TestScope.createAnalyticsColdStartWatcher(
+        analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
+    ) = DefaultAnalyticsColdStartWatcher(
+        analyticsService = analyticsService,
+        appCoroutineScope = backgroundScope,
+    )
+}

From 04feea5d255a8c9ad6029af536d51aebe6157e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 27 Nov 2025 12:13:16 +0100
Subject: [PATCH 094/113] Move analytic watchers to `:services:analytics`

---
 .../android/appnav/LoggedInFlowNode.kt        |  2 +-
 .../android/appnav/NotLoggedInFlowNode.kt     |  2 +-
 .../io/element/android/appnav/RootFlowNode.kt |  1 +
 features/home/impl/build.gradle.kts           |  1 -
 .../home/impl/roomlist/RoomListPresenter.kt   |  2 +-
 .../impl/roomlist/RoomListPresenterTest.kt    | 10 +------
 .../api/watchers/AnalyticsColdStartWatcher.kt | 18 ++++++++++++
 .../watchers/AnalyticsRoomListStateWatcher.kt | 17 +++++++++++
 services/analytics/impl/build.gradle.kts      |  4 +++
 .../DefaultAnalyticsColdStartWatcher.kt       | 21 ++++----------
 .../DefaultAnalyticsRoomListStateWatcher.kt   | 29 +++++++++----------
 .../DefaultAnalyticsColdStartWatcherTest.kt   |  2 +-
 ...efaultAnalyticsRoomListStateWatcherTest.kt |  6 ++--
 .../watchers/FakeAnalyticsColdStartWatcher.kt | 16 ++++++++++
 14 files changed, 84 insertions(+), 47 deletions(-)
 create mode 100644 services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsColdStartWatcher.kt
 create mode 100644 services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsRoomListStateWatcher.kt
 rename appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt => services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt (73%)
 rename appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcher.kt => services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt (77%)
 rename {appnav/src/test/kotlin/io/element/android/appnav/analytics => services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers}/DefaultAnalyticsColdStartWatcherTest.kt (98%)
 rename appnav/src/test/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcherTest.kt => services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt (97%)
 create mode 100644 services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/watchers/FakeAnalyticsColdStartWatcher.kt

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index 310913e0ac..7e782c7cc4 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -41,7 +41,6 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.annotations.ContributesNode
-import io.element.android.appnav.analytics.AnalyticsRoomListStateWatcher
 import io.element.android.appnav.loggedin.LoggedInNode
 import io.element.android.appnav.loggedin.MediaPreviewConfigMigration
 import io.element.android.appnav.loggedin.SendQueues
@@ -93,6 +92,7 @@ import io.element.android.libraries.push.api.notifications.conversations.Notific
 import io.element.android.libraries.ui.common.nodes.emptyNode
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.watchers.AnalyticsRoomListStateWatcher
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
index b1d371b4c0..080f3c1d77 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
@@ -24,7 +24,6 @@ import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
-import io.element.android.appnav.analytics.AnalyticsColdStartWatcher
 import io.element.android.features.login.api.LoginEntryPoint
 import io.element.android.features.login.api.LoginParams
 import io.element.android.libraries.architecture.BackstackView
@@ -35,6 +34,7 @@ import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.designsystem.utils.ForceOrientationInMobileDevices
 import io.element.android.libraries.designsystem.utils.ScreenOrientation
 import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(AppScope::class)
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
index 52788fc992..838804a055 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -65,6 +65,7 @@ import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.ui.common.nodes.emptyNode
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
diff --git a/features/home/impl/build.gradle.kts b/features/home/impl/build.gradle.kts
index 9362702a1a..b36ee6aed2 100644
--- a/features/home/impl/build.gradle.kts
+++ b/features/home/impl/build.gradle.kts
@@ -28,7 +28,6 @@ setupDependencyInjection()
 
 dependencies {
     implementation(projects.appconfig)
-    implementation(projects.appnav)
     implementation(projects.libraries.core)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt
index ce1197f9ca..5fc07ab21c 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt
@@ -25,7 +25,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.Interaction
-import io.element.android.appnav.analytics.AnalyticsColdStartWatcher
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.features.announcement.api.AnnouncementService
 import io.element.android.features.home.impl.datasource.RoomListDataSource
@@ -52,6 +51,7 @@ import io.element.android.libraries.preferences.api.store.SessionPreferencesStor
 import io.element.android.libraries.push.api.battery.BatteryOptimizationState
 import io.element.android.libraries.push.api.notifications.NotificationCleaner
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
 import io.element.android.services.analyticsproviders.api.trackers.captureInteraction
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
index a3be896f40..acc68db018 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
@@ -13,7 +13,6 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.Interaction
-import io.element.android.appnav.analytics.AnalyticsColdStartWatcher
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.features.announcement.api.AnnouncementService
 import io.element.android.features.home.impl.FakeDateTimeObserver
@@ -71,6 +70,7 @@ import io.element.android.libraries.push.api.notifications.NotificationCleaner
 import io.element.android.libraries.push.test.notifications.FakeNotificationCleaner
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
+import io.element.android.services.analytics.test.watchers.FakeAnalyticsColdStartWatcher
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
@@ -677,11 +677,3 @@ class RoomListPresenterTest {
         coldStartWatcher = FakeAnalyticsColdStartWatcher(),
     )
 }
-
-private class FakeAnalyticsColdStartWatcher : AnalyticsColdStartWatcher {
-    override fun start() {}
-
-    override fun whenLoggingIn() {}
-
-    override fun onRoomListVisible() {}
-}
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsColdStartWatcher.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsColdStartWatcher.kt
new file mode 100644
index 0000000000..67d3c5498b
--- /dev/null
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsColdStartWatcher.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.services.analytics.api.watchers
+
+/**
+ * Adds a performance check transaction measuring the time between a cold start (or, after we read the user consent after a cold start)
+ * until the cached room list is displayed. This check only takes place in a cold app start after the user is authenticated.
+ */
+interface AnalyticsColdStartWatcher {
+    fun start()
+    fun whenLoggingIn()
+    fun onRoomListVisible()
+}
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsRoomListStateWatcher.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsRoomListStateWatcher.kt
new file mode 100644
index 0000000000..2f6d4723a3
--- /dev/null
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsRoomListStateWatcher.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.services.analytics.api.watchers
+
+/**
+ * This component is used to check how long it takes for the room list to be up to date after opening the app while it's on a 'warm' state:
+ * the app was previously running and we just returned to it.
+ */
+interface AnalyticsRoomListStateWatcher {
+    fun start()
+    fun stop()
+}
diff --git a/services/analytics/impl/build.gradle.kts b/services/analytics/impl/build.gradle.kts
index 8aa542f60a..6ba2963853 100644
--- a/services/analytics/impl/build.gradle.kts
+++ b/services/analytics/impl/build.gradle.kts
@@ -25,16 +25,20 @@ dependencies {
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.sessionStorage.api)
+    implementation(projects.services.appnavstate.api)
 
     api(projects.services.analyticsproviders.api)
     api(projects.services.analytics.api)
     implementation(libs.androidx.datastore.preferences)
 
     testCommonDependencies(libs)
+    testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.sessionStorage.test)
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.services.analyticsproviders.test)
+    testImplementation(projects.services.appnavstate.test)
     testImplementation(projects.services.toolbox.test)
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt
similarity index 73%
rename from appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt
rename to services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt
index 8b9efa94bf..f5ef72ba8d 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsColdStartWatcher.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt
@@ -5,14 +5,15 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.appnav.analytics
+package io.element.android.services.analytics.impl.watchers
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.AppCoroutineScope
-import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.launchIn
@@ -20,16 +21,6 @@ import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicBoolean
 
-/**
- * Adds a performance check transaction measuring the time between a cold start (or, after we read the user consent after a cold start)
- * until the cached room list is displayed. This check only takes place in a cold app start after the user is authenticated.
- */
-interface AnalyticsColdStartWatcher {
-    fun start()
-    fun whenLoggingIn()
-    fun onRoomListVisible()
-}
-
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
 class DefaultAnalyticsColdStartWatcher(
@@ -44,7 +35,7 @@ class DefaultAnalyticsColdStartWatcher(
                 if (hasConsent) {
                     if (isColdStart.get()) {
                         Timber.d("Starting cold start check")
-                        analyticsService.startLongRunningTransaction(ColdStartUntilCachedRoomList)
+                        analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)
                     } else {
                         error("The app is no longer in a cold start state")
                     }
@@ -56,7 +47,7 @@ class DefaultAnalyticsColdStartWatcher(
 
     override fun whenLoggingIn() {
         if (isColdStart.getAndSet(false)) {
-            analyticsService.removeLongRunningTransaction(ColdStartUntilCachedRoomList)
+            analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)
             Timber.d("Canceled cold start check: user is logging in")
         }
     }
@@ -64,7 +55,7 @@ class DefaultAnalyticsColdStartWatcher(
     override fun onRoomListVisible() {
         if (isColdStart.getAndSet(false)) {
             Timber.d("Room list is visible, finishing cold start check")
-            analyticsService.removeLongRunningTransaction(ColdStartUntilCachedRoomList)?.finish()
+            analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)?.finish()
         }
     }
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcher.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
similarity index 77%
rename from appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcher.kt
rename to services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
index 91efa0bf92..c2a82eb49b 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcher.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
@@ -5,15 +5,18 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.appnav.analytics
+package io.element.android.services.analytics.impl.watchers
 
-import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.coroutine.childScope
 import io.element.android.libraries.core.coroutine.withPreviousValue
+import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
-import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.ResumeAppUntilNewRoomsReceived
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.watchers.AnalyticsRoomListStateWatcher
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
@@ -24,35 +27,31 @@ import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicBoolean
 
-/**
- * This component is used to check how long it takes for the room list to be up to date after opening the app while it's on a 'warm' state:
- * the app was previously running and we just returned to it.
- */
-@Inject
-class AnalyticsRoomListStateWatcher(
+@ContributesBinding(SessionScope::class)
+class DefaultAnalyticsRoomListStateWatcher(
     private val appNavigationStateService: AppNavigationStateService,
     private val roomListService: RoomListService,
     private val analyticsService: AnalyticsService,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
     private val dispatchers: CoroutineDispatchers,
-) {
+) : AnalyticsRoomListStateWatcher {
     private var currentCoroutineScope: CoroutineScope? = null
     private val isWarmState = AtomicBoolean(false)
 
-    fun start() {
+    override fun start() {
         if (currentCoroutineScope != null) {
             Timber.w("Can't start RoomListStateWatcher, it's already running.")
             return
         }
 
-        val coroutineScope = CoroutineScope(sessionCoroutineScope.coroutineContext + dispatchers.computation)
+        val coroutineScope = sessionCoroutineScope.childScope(dispatchers.computation, "AnalyticsRoomListStateWatcher")
         appNavigationStateService.appNavigationState
             .map { it.isInForeground }
             .distinctUntilChanged()
             .withPreviousValue()
             .onEach { (wasInForeground, isInForeground) ->
                 if (isInForeground && roomListService.state.value != RoomListService.State.Running) {
-                    analyticsService.startLongRunningTransaction(ResumeAppUntilNewRoomsReceived)
+                    analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.ResumeAppUntilNewRoomsReceived)
                 }
 
                 if (wasInForeground == false && isInForeground) {
@@ -64,7 +63,7 @@ class AnalyticsRoomListStateWatcher(
         roomListService.state
             .onEach { state ->
                 if (state == RoomListService.State.Running && isWarmState.get()) {
-                    analyticsService.removeLongRunningTransaction(ResumeAppUntilNewRoomsReceived)?.finish()
+                    analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.ResumeAppUntilNewRoomsReceived)?.finish()
                 }
             }
             .launchIn(coroutineScope)
@@ -72,7 +71,7 @@ class AnalyticsRoomListStateWatcher(
         currentCoroutineScope = coroutineScope
     }
 
-    fun stop() {
+    override fun stop() {
         currentCoroutineScope?.cancel()
         currentCoroutineScope = null
     }
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/analytics/DefaultAnalyticsColdStartWatcherTest.kt b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcherTest.kt
similarity index 98%
rename from appnav/src/test/kotlin/io/element/android/appnav/analytics/DefaultAnalyticsColdStartWatcherTest.kt
rename to services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcherTest.kt
index d71d51faba..325316b45c 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/analytics/DefaultAnalyticsColdStartWatcherTest.kt
+++ b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcherTest.kt
@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.appnav.analytics
+package io.element.android.services.analytics.impl.watchers
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcherTest.kt b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt
similarity index 97%
rename from appnav/src/test/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcherTest.kt
rename to services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt
index f05190acc7..3b1f562c67 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/analytics/AnalyticsRoomListStateWatcherTest.kt
+++ b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt
@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.appnav.analytics
+package io.element.android.services.analytics.impl.watchers
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
@@ -23,7 +23,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 @OptIn(ExperimentalCoroutinesApi::class)
-class AnalyticsRoomListStateWatcherTest {
+class DefaultAnalyticsRoomListStateWatcherTest {
     @Test
     fun `Opening the app in a warm state tracks the time until the room list is synced`() = runTest {
         val navigationStateService = FakeAppNavigationStateService()
@@ -160,7 +160,7 @@ class AnalyticsRoomListStateWatcherTest {
         appNavigationStateService: FakeAppNavigationStateService = FakeAppNavigationStateService(),
         roomListService: FakeRoomListService = FakeRoomListService(),
         analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
-    ) = AnalyticsRoomListStateWatcher(
+    ) = DefaultAnalyticsRoomListStateWatcher(
         appNavigationStateService = appNavigationStateService,
         roomListService = roomListService,
         analyticsService = analyticsService,
diff --git a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/watchers/FakeAnalyticsColdStartWatcher.kt b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/watchers/FakeAnalyticsColdStartWatcher.kt
new file mode 100644
index 0000000000..ad13c8422d
--- /dev/null
+++ b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/watchers/FakeAnalyticsColdStartWatcher.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.services.analytics.test.watchers
+
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
+
+class FakeAnalyticsColdStartWatcher : AnalyticsColdStartWatcher {
+    override fun start() {}
+    override fun whenLoggingIn() {}
+    override fun onRoomListVisible() {}
+}

From 1d77aa447d92fe349c82590a5b169130ee9fc214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 27 Nov 2025 12:17:51 +0100
Subject: [PATCH 095/113] Extract `from_notification` extra to a constant in
 `IntentNavigationExtras`

Allow `IntentProvider` to receive extras and `PendingIntentFactory` to send them.
---
 .../android/x/intent/DefaultIntentProvider.kt |  4 +++-
 .../io/element/android/appnav/RootFlowNode.kt |  5 +++--
 .../push/impl/intent/IntentProvider.kt        |  2 ++
 .../factories/NotificationCreator.kt          | 22 ++++++++++++++++---
 .../factories/PendingIntentFactory.kt         | 17 +++++++-------
 .../factories/FakeIntentProvider.kt           |  9 +++++++-
 .../appnavstate/api/IntentNavigationExtras.kt | 10 +++++++++
 7 files changed, 54 insertions(+), 15 deletions(-)
 create mode 100644 services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/IntentNavigationExtras.kt

diff --git a/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt b/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
index a4272063ba..0453fdf160 100644
--- a/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
+++ b/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
@@ -10,6 +10,7 @@ package io.element.android.x.intent
 
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
@@ -32,11 +33,12 @@ class DefaultIntentProvider(
         roomId: RoomId?,
         threadId: ThreadId?,
         eventId: EventId?,
+        extras: Bundle?,
     ): Intent {
         return Intent(context, MainActivity::class.java).apply {
             action = Intent.ACTION_VIEW
             data = deepLinkCreator.create(sessionId, roomId, threadId, eventId).toUri()
-            putExtra("from_notification", true)
+            extras?.let(::putExtras)
         }
     }
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
index 838804a055..4687946367 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -29,7 +29,6 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.annotations.ContributesNode
-import io.element.android.appnav.analytics.AnalyticsColdStartWatcher
 import io.element.android.appnav.di.MatrixSessionCache
 import io.element.android.appnav.intent.IntentResolver
 import io.element.android.appnav.intent.ResolvedIntent
@@ -66,6 +65,7 @@ import io.element.android.libraries.ui.common.nodes.emptyNode
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
+import io.element.android.services.appnavstate.api.ROOM_OPENED_FROM_NOTIFICATION
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -318,7 +318,8 @@ class RootFlowNode(
         val resolvedIntent = intentResolver.resolve(intent) ?: return
         when (resolvedIntent) {
             is ResolvedIntent.Navigation -> {
-                if (intent.getBooleanExtra("from_notification", false) && resolvedIntent.deeplinkData is DeeplinkData.Room) {
+                val openingRoomFromNotification = intent.getBooleanExtra(ROOM_OPENED_FROM_NOTIFICATION, false)
+                if (openingRoomFromNotification && resolvedIntent.deeplinkData is DeeplinkData.Room) {
                     analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.NotificationTapOpensTimeline)
                 }
                 navigateTo(resolvedIntent.deeplinkData)
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/intent/IntentProvider.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/intent/IntentProvider.kt
index b4b0d92888..82ee730d17 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/intent/IntentProvider.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/intent/IntentProvider.kt
@@ -9,6 +9,7 @@
 package io.element.android.libraries.push.impl.intent
 
 import android.content.Intent
+import android.os.Bundle
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -23,5 +24,6 @@ interface IntentProvider {
         roomId: RoomId?,
         threadId: ThreadId?,
         eventId: EventId?,
+        extras: Bundle? = null,
     ): Intent
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
index ff969c2b84..9533f6b0ac 100755
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
@@ -15,6 +15,7 @@ import androidx.annotation.ColorInt
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.MessagingStyle
 import androidx.core.app.Person
+import androidx.core.os.bundleOf
 import coil3.ImageLoader
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
@@ -44,6 +45,7 @@ import io.element.android.libraries.push.impl.notifications.model.NotifiableMess
 import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.shortcut.createShortcutId
 import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.services.appnavstate.api.ROOM_OPENED_FROM_NOTIFICATION
 import io.element.android.services.toolbox.api.strings.StringProvider
 
 interface NotificationCreator {
@@ -138,7 +140,12 @@ class DefaultNotificationCreator(
         val eventId = events.firstOrNull()?.eventId
         val openIntent = when {
             threadId != null -> pendingIntentFactory.createOpenThreadPendingIntent(roomInfo.sessionId, roomInfo.roomId, eventId, threadId)
-            else -> pendingIntentFactory.createOpenRoomPendingIntent(roomInfo.sessionId, roomInfo.roomId, eventId)
+            else -> pendingIntentFactory.createOpenRoomPendingIntent(
+                sessionId = roomInfo.sessionId,
+                roomId = roomInfo.roomId,
+                eventId = eventId,
+                extras = bundleOf(ROOM_OPENED_FROM_NOTIFICATION to true),
+            )
         }
         val containsMissedCall = events.any { it.type == EventType.RTC_NOTIFICATION }
         val channelId = if (containsMissedCall) {
@@ -233,7 +240,11 @@ class DefaultNotificationCreator(
             .addAction(rejectInvitationActionFactory.create(inviteNotifiableEvent))
             .addAction(acceptInvitationActionFactory.create(inviteNotifiableEvent))
             // Build the pending intent for when the notification is clicked
-            .setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(inviteNotifiableEvent.sessionId, inviteNotifiableEvent.roomId, null))
+            .setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(
+                sessionId = inviteNotifiableEvent.sessionId,
+                roomId = inviteNotifiableEvent.roomId,
+                eventId = null,
+            ))
             .apply {
                 if (inviteNotifiableEvent.noisy) {
                     // Compat
@@ -265,7 +276,12 @@ class DefaultNotificationCreator(
             .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL)
             .configureWith(notificationAccountParams)
             .setAutoCancel(true)
-            .setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(simpleNotifiableEvent.sessionId, simpleNotifiableEvent.roomId, null))
+            .setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(
+                sessionId = simpleNotifiableEvent.sessionId,
+                roomId = simpleNotifiableEvent.roomId,
+                eventId = null,
+                extras = bundleOf(ROOM_OPENED_FROM_NOTIFICATION to true),
+            ))
             .apply {
                 if (simpleNotifiableEvent.noisy) {
                     // Compat
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/PendingIntentFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/PendingIntentFactory.kt
index e68efebb14..07fa70a6c8 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/PendingIntentFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/PendingIntentFactory.kt
@@ -11,6 +11,7 @@ package io.element.android.libraries.push.impl.notifications.factories
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.uri.createIgnoredUri
 import io.element.android.libraries.di.annotations.ApplicationContext
@@ -31,20 +32,20 @@ class PendingIntentFactory(
     private val clock: SystemClock,
     private val actionIds: NotificationActionIds,
 ) {
-    fun createOpenSessionPendingIntent(sessionId: SessionId): PendingIntent? {
-        return createRoomPendingIntent(sessionId = sessionId, roomId = null, eventId = null, threadId = null)
+    fun createOpenSessionPendingIntent(sessionId: SessionId, extras: Bundle? = null): PendingIntent? {
+        return createRoomPendingIntent(sessionId = sessionId, roomId = null, eventId = null, threadId = null, extras = extras)
     }
 
-    fun createOpenRoomPendingIntent(sessionId: SessionId, roomId: RoomId, eventId: EventId?): PendingIntent? {
-        return createRoomPendingIntent(sessionId = sessionId, roomId = roomId, eventId = eventId, threadId = null)
+    fun createOpenRoomPendingIntent(sessionId: SessionId, roomId: RoomId, eventId: EventId?, extras: Bundle? = null): PendingIntent? {
+        return createRoomPendingIntent(sessionId = sessionId, roomId = roomId, eventId = eventId, threadId = null, extras = extras)
     }
 
-    fun createOpenThreadPendingIntent(sessionId: SessionId, roomId: RoomId, eventId: EventId?, threadId: ThreadId): PendingIntent? {
-        return createRoomPendingIntent(sessionId = sessionId, roomId = roomId, eventId = eventId, threadId = threadId)
+    fun createOpenThreadPendingIntent(sessionId: SessionId, roomId: RoomId, eventId: EventId?, threadId: ThreadId, extras: Bundle? = null): PendingIntent? {
+        return createRoomPendingIntent(sessionId = sessionId, roomId = roomId, eventId = eventId, threadId = threadId, extras = extras)
     }
 
-    private fun createRoomPendingIntent(sessionId: SessionId, roomId: RoomId?, eventId: EventId?, threadId: ThreadId?): PendingIntent? {
-        val intent = intentProvider.getViewRoomIntent(sessionId = sessionId, roomId = roomId, eventId = eventId, threadId = threadId)
+    private fun createRoomPendingIntent(sessionId: SessionId, roomId: RoomId?, eventId: EventId?, threadId: ThreadId?, extras: Bundle? = null): PendingIntent? {
+        val intent = intentProvider.getViewRoomIntent(sessionId = sessionId, roomId = roomId, eventId = eventId, threadId = threadId, extras = extras)
         return PendingIntent.getActivity(
             context,
             clock.epochMillis().toInt(),
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/FakeIntentProvider.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/FakeIntentProvider.kt
index fdbe927190..62ab850ae7 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/FakeIntentProvider.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/FakeIntentProvider.kt
@@ -9,6 +9,7 @@
 package io.element.android.libraries.push.impl.notifications.factories
 
 import android.content.Intent
+import android.os.Bundle
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -16,5 +17,11 @@ import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.push.impl.intent.IntentProvider
 
 class FakeIntentProvider : IntentProvider {
-    override fun getViewRoomIntent(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?, eventId: EventId?) = Intent(Intent.ACTION_VIEW)
+    override fun getViewRoomIntent(
+        sessionId: SessionId,
+        roomId: RoomId?,
+        threadId: ThreadId?,
+        eventId: EventId?,
+        extras: Bundle?,
+    ) = Intent(Intent.ACTION_VIEW)
 }
diff --git a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/IntentNavigationExtras.kt b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/IntentNavigationExtras.kt
new file mode 100644
index 0000000000..4851503984
--- /dev/null
+++ b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/IntentNavigationExtras.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.services.appnavstate.api
+
+const val ROOM_OPENED_FROM_NOTIFICATION = "opened_from_notification"

From 1c576fd42dabd1cc329a10d5bb95e2feacce2cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 27 Nov 2025 12:27:49 +0100
Subject: [PATCH 096/113] Add `AnalyticsService.cancelLongRunningTransaction`
 and `AnalyticsService.finishLongRunningTransaction`

---
 .../room/joined/JoinedRoomLoadedFlowNode.kt   |  3 ++-
 .../features/messages/impl/MessagesNode.kt    |  3 ++-
 .../impl/timeline/TimelinePresenter.kt        |  7 ++++---
 .../matrix/impl/roomlist/RoomListFactory.kt   |  3 ++-
 .../analytics/api/AnalyticsService.kt         | 21 +++++++++++++++++++
 .../DefaultAnalyticsColdStartWatcher.kt       |  6 ++++--
 .../DefaultAnalyticsRoomListStateWatcher.kt   |  3 ++-
 7 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
index 3ff8e16b49..5a6ef9133b 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
@@ -49,6 +49,7 @@ import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.LoadMessagesUi
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.OpenRoom
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.finishLongRunningTransaction
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
@@ -107,7 +108,7 @@ class JoinedRoomLoadedFlowNode(
                 trackVisitedRoom()
             },
             onResume = {
-                analyticsService.removeLongRunningTransaction(LoadJoinedRoomFlow)?.finish()
+                analyticsService.finishLongRunningTransaction(LoadJoinedRoomFlow)
                 sessionCoroutineScope.launch {
                     inputs.room.subscribeToSync()
                 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
index 2032d70d64..0692a98745 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
@@ -70,6 +70,7 @@ import io.element.android.libraries.mediaplayer.api.MediaPlayer
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.LoadMessagesUi
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.finishLongRunningTransaction
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
@@ -138,7 +139,7 @@ class MessagesNode(
                 sessionCoroutineScope.launch { analyticsService.capture(room.toAnalyticsViewRoom()) }
             },
             onResume = {
-                analyticsService.removeLongRunningTransaction(LoadMessagesUi)?.finish()
+                analyticsService.finishLongRunningTransaction(LoadMessagesUi)
             },
             onDestroy = {
                 mediaPlayer.close()
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
index 3044822256..127dab0345 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -59,6 +59,7 @@ import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.NotificationTapOpensTimeline
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.OpenRoom
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.finishLongRunningTransaction
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
@@ -239,9 +240,9 @@ class TimelinePresenter(
                     timelineItems = newTimelineItems
 
                     analyticsService.run {
-                        removeLongRunningTransaction(DisplayFirstTimelineItems)?.finish()
-                        removeLongRunningTransaction(OpenRoom)?.finish()
-                        removeLongRunningTransaction(NotificationTapOpensTimeline)?.finish()
+                        finishLongRunningTransaction(DisplayFirstTimelineItems)
+                        finishLongRunningTransaction(OpenRoom)
+                        finishLongRunningTransaction(NotificationTapOpensTimeline)
                     }
                 }
                 .launchIn(this)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
index 1fd0871019..b15411c382 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
@@ -14,6 +14,7 @@ import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.finishLongRunningTransaction
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -73,7 +74,7 @@ internal class RoomListFactory(
                     initialFilterKind = RoomListEntriesDynamicFilterKind.All(ROOM_LIST_RUST_FILTERS),
                 ).onEach { update ->
                     if (!firstRoomsTransaction.isFinished()) {
-                        analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.FirstRoomsDisplayed)?.finish()
+                        analyticsService.finishLongRunningTransaction(AnalyticsLongRunningTransaction.FirstRoomsDisplayed)
                         firstRoomsTransaction.finish()
                     }
                     processor.postUpdate(update)
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
index 1e95263509..08562b01ce 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
@@ -89,3 +89,24 @@ inline fun <T> AnalyticsService.recordTransaction(
         transaction.finish()
     }
 }
+
+/**
+ * Cancels a long running transaction. It behaves the same as [AnalyticsService.removeLongRunningTransaction],
+ * but it doesn't return the transaction so we can't finish it later.
+ */
+fun AnalyticsService.cancelLongRunningTransaction(
+    longRunningTransaction: AnalyticsLongRunningTransaction
+) = removeLongRunningTransaction(longRunningTransaction)
+
+/**
+ * Finishes a long running transaction if it exists. Optionally performs an [action] with the transaction before finishing it.
+ */
+fun AnalyticsService.finishLongRunningTransaction(
+    longRunningTransaction: AnalyticsLongRunningTransaction,
+    action: (AnalyticsTransaction) -> Unit = {},
+) {
+    removeLongRunningTransaction(longRunningTransaction)?.let {
+        action(it)
+        it.finish()
+    }
+}
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt
index f5ef72ba8d..c53e28918b 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt
@@ -13,6 +13,8 @@ import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.cancelLongRunningTransaction
+import io.element.android.services.analytics.api.finishLongRunningTransaction
 import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.catch
@@ -47,7 +49,7 @@ class DefaultAnalyticsColdStartWatcher(
 
     override fun whenLoggingIn() {
         if (isColdStart.getAndSet(false)) {
-            analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)
+            analyticsService.cancelLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)
             Timber.d("Canceled cold start check: user is logging in")
         }
     }
@@ -55,7 +57,7 @@ class DefaultAnalyticsColdStartWatcher(
     override fun onRoomListVisible() {
         if (isColdStart.getAndSet(false)) {
             Timber.d("Room list is visible, finishing cold start check")
-            analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)?.finish()
+            analyticsService.finishLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)
         }
     }
 }
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
index c2a82eb49b..cd1af657b2 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
@@ -16,6 +16,7 @@ import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.finishLongRunningTransaction
 import io.element.android.services.analytics.api.watchers.AnalyticsRoomListStateWatcher
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
@@ -63,7 +64,7 @@ class DefaultAnalyticsRoomListStateWatcher(
         roomListService.state
             .onEach { state ->
                 if (state == RoomListService.State.Running && isWarmState.get()) {
-                    analyticsService.removeLongRunningTransaction(AnalyticsLongRunningTransaction.ResumeAppUntilNewRoomsReceived)?.finish()
+                    analyticsService.finishLongRunningTransaction(AnalyticsLongRunningTransaction.ResumeAppUntilNewRoomsReceived)
                 }
             }
             .launchIn(coroutineScope)

From ed020114dc9edca15941a3f1cb6e0bd5b682b001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 27 Nov 2025 13:29:20 +0100
Subject: [PATCH 097/113] Add `Noop` variants for the new watcher interfaces in
 `:analytics:api`

---
 .../watchers/NoopAnalyticsColdStartWatcher.kt | 19 +++++++++++++++++++
 .../NoopAnalyticsRoomListStateWatcher.kt      | 18 ++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsColdStartWatcher.kt
 create mode 100644 services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsRoomListStateWatcher.kt

diff --git a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsColdStartWatcher.kt b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsColdStartWatcher.kt
new file mode 100644
index 0000000000..c24c98ebfe
--- /dev/null
+++ b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsColdStartWatcher.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.services.analytics.noop.watchers
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
+
+@ContributesBinding(AppScope::class)
+class NoopAnalyticsColdStartWatcher : AnalyticsColdStartWatcher {
+    override fun start() {}
+    override fun whenLoggingIn() {}
+    override fun onRoomListVisible() {}
+}
diff --git a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsRoomListStateWatcher.kt b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsRoomListStateWatcher.kt
new file mode 100644
index 0000000000..711947fb2c
--- /dev/null
+++ b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsRoomListStateWatcher.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.services.analytics.noop.watchers
+
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.di.SessionScope
+import io.element.android.services.analytics.api.watchers.AnalyticsRoomListStateWatcher
+
+@ContributesBinding(SessionScope::class)
+class NoopAnalyticsRoomListStateWatcher : AnalyticsRoomListStateWatcher {
+    override fun start() {}
+    override fun stop() {}
+}

From c6e0686dec287b0083cce49ffd16d7dc1df37021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Fri, 28 Nov 2025 08:22:36 +0100
Subject: [PATCH 098/113] Reuse coroutine in
 `DefaultAnalyticsRoomListStateWatcher` instead of creating and cancelling the
 same one

---
 .../DefaultAnalyticsRoomListStateWatcher.kt   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
index cd1af657b2..97e438fcee 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
@@ -20,7 +20,7 @@ import io.element.android.services.analytics.api.finishLongRunningTransaction
 import io.element.android.services.analytics.api.watchers.AnalyticsRoomListStateWatcher
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
@@ -33,19 +33,19 @@ class DefaultAnalyticsRoomListStateWatcher(
     private val appNavigationStateService: AppNavigationStateService,
     private val roomListService: RoomListService,
     private val analyticsService: AnalyticsService,
-    @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
-    private val dispatchers: CoroutineDispatchers,
+    @SessionCoroutineScope sessionCoroutineScope: CoroutineScope,
+    dispatchers: CoroutineDispatchers,
 ) : AnalyticsRoomListStateWatcher {
-    private var currentCoroutineScope: CoroutineScope? = null
+    private val coroutineScope: CoroutineScope = sessionCoroutineScope.childScope(dispatchers.computation, "AnalyticsRoomListStateWatcher")
+    private val isStarted = AtomicBoolean(false)
     private val isWarmState = AtomicBoolean(false)
 
     override fun start() {
-        if (currentCoroutineScope != null) {
+        if (isStarted.getAndSet(true)) {
             Timber.w("Can't start RoomListStateWatcher, it's already running.")
             return
         }
 
-        val coroutineScope = sessionCoroutineScope.childScope(dispatchers.computation, "AnalyticsRoomListStateWatcher")
         appNavigationStateService.appNavigationState
             .map { it.isInForeground }
             .distinctUntilChanged()
@@ -68,12 +68,11 @@ class DefaultAnalyticsRoomListStateWatcher(
                 }
             }
             .launchIn(coroutineScope)
-
-        currentCoroutineScope = coroutineScope
     }
 
     override fun stop() {
-        currentCoroutineScope?.cancel()
-        currentCoroutineScope = null
+        if (isStarted.getAndSet(false)) {
+            coroutineScope.coroutineContext.cancelChildren()
+        }
     }
 }

From f265a47243157c9abc769a65905658571cd3e688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Fri, 28 Nov 2025 08:25:26 +0100
Subject: [PATCH 099/113] Make sure we don't finish
 `NotificationTapOpensTimeline` until we've actually rendered the timeline
 event we need to focus on

---
 .../features/messages/impl/timeline/TimelinePresenter.kt      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
index 127dab0345..7b8ff837c1 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -206,6 +206,9 @@ class TimelinePresenter(
                     focusOnEvent(event.eventId, focusRequestState)
                 }.start()
                 is TimelineEvents.OnFocusEventRender -> {
+                    // If there was a pending 'notification tap opens timeline' transaction, finish it now we're focused in the required event
+                    analyticsService.finishLongRunningTransaction(NotificationTapOpensTimeline)
+
                     focusRequestState.value = focusRequestState.value.onFocusEventRender()
                 }
                 is TimelineEvents.ClearFocusRequestState -> {
@@ -242,7 +245,6 @@ class TimelinePresenter(
                     analyticsService.run {
                         finishLongRunningTransaction(DisplayFirstTimelineItems)
                         finishLongRunningTransaction(OpenRoom)
-                        finishLongRunningTransaction(NotificationTapOpensTimeline)
                     }
                 }
                 .launchIn(this)

From 32d56ea92db68d82a45f701c2a3e2fc89e1a4102 Mon Sep 17 00:00:00 2001
From: bmarty <3940906+bmarty@users.noreply.github.com>
Date: Mon, 1 Dec 2025 00:23:54 +0000
Subject: [PATCH 100/113] Sync Strings from Localazy

---
 .../src/main/res/values-it/translations.xml   |   11 +
 .../main/res/values-pt-rBR/translations.xml   |   11 +
 .../src/main/res/values-zh/translations.xml   |    6 +
 .../src/main/res/values-fi/translations.xml   |    2 +-
 .../main/res/values-pt-rBR/translations.xml   |    1 +
 .../src/main/res/values-fa/translations.xml   |    1 +
 .../src/main/res/values-it/translations.xml   |    2 +
 .../main/res/values-pt-rBR/translations.xml   |    3 +
 .../src/main/res/values-uz/translations.xml   |    4 +
 .../src/main/res/values-zh/translations.xml   |    2 +
 .../src/main/res/values-uz/translations.xml   |    6 +
 .../src/main/res/values-it/translations.xml   |   13 +-
 .../main/res/values-pt-rBR/translations.xml   |   13 +-
 .../src/main/res/values-uz/translations.xml   |   14 +
 .../src/main/res/values-zh/translations.xml   |   12 +-
 .../src/main/res/values-uz/translations.xml   |   31 +
 .../src/main/res/values-uz/translations.xml   |    3 +
 .../src/main/res/values-fa/translations.xml   |    8 +
 .../src/main/res/values-uz/translations.xml   |    1 +
 .../src/main/res/values-uz/translations.xml   |   10 +
 .../src/main/res/values-fa/translations.xml   |    1 +
 .../src/main/res/values-fa/translations.xml   |    4 +
 .../src/main/res/values-it/translations.xml   |    2 +
 .../main/res/values-pt-rBR/translations.xml   |    5 +
 .../src/main/res/values-uz/translations.xml   |   22 +
 .../src/main/res/values-uz/translations.xml   |    4 +
 .../src/main/res/values-uz/translations.xml   |    1 +
 .../src/main/res/values-it/translations.xml   |    6 +
 .../main/res/values-pt-rBR/translations.xml   |   13 +
 .../src/main/res/values-uz/translations.xml   |   16 +
 .../src/main/res/values-zh/translations.xml   |    4 +
 .../src/main/res/values-it/translations.xml   |    2 +
 .../main/res/values-pt-rBR/translations.xml   |    2 +
 .../src/main/res/values-uz/translations.xml   |    1 +
 .../src/main/res/values-uz/translations.xml   |    4 +
 .../src/main/res/values-cs/translations.xml   |   33 +-
 .../src/main/res/values-fa/translations.xml   |    4 +
 .../src/main/res/values-fi/translations.xml   |   16 +-
 .../src/main/res/values-fr/translations.xml   |   15 +-
 .../src/main/res/values-it/translations.xml   |   35 +-
 .../main/res/values-pt-rBR/translations.xml   |   31 +-
 .../src/main/res/values-uz/translations.xml   |    8 +
 .../src/main/res/values-zh/translations.xml   |    3 +-
 .../src/main/res/values-uz/translations.xml   |    1 +
 .../src/main/res/values-bg/translations.xml   |    2 +-
 .../src/main/res/values-cs/translations.xml   |   65 +-
 .../src/main/res/values-cy/translations.xml   |    2 +-
 .../src/main/res/values-da/translations.xml   |    2 +-
 .../src/main/res/values-de/translations.xml   |    2 +-
 .../src/main/res/values-el/translations.xml   |    2 +-
 .../src/main/res/values-es/translations.xml   |    2 +-
 .../src/main/res/values-et/translations.xml   |    2 +-
 .../src/main/res/values-eu/translations.xml   |    2 +-
 .../src/main/res/values-fa/translations.xml   |    6 +-
 .../src/main/res/values-fi/translations.xml   |   44 +-
 .../src/main/res/values-fr/translations.xml   |   18 +-
 .../src/main/res/values-hu/translations.xml   |    2 +-
 .../src/main/res/values-in/translations.xml   |    2 +-
 .../src/main/res/values-it/translations.xml   |   64 +-
 .../src/main/res/values-ko/translations.xml   |    2 +-
 .../src/main/res/values-nb/translations.xml   |    2 +-
 .../src/main/res/values-pl/translations.xml   |    2 +-
 .../main/res/values-pt-rBR/translations.xml   |   60 +-
 .../src/main/res/values-pt/translations.xml   |    2 +-
 .../src/main/res/values-ro/translations.xml   |    2 +-
 .../src/main/res/values-ru/translations.xml   |    2 +-
 .../src/main/res/values-sk/translations.xml   |    2 +-
 .../src/main/res/values-sv/translations.xml   |    2 +-
 .../src/main/res/values-tr/translations.xml   |    2 +-
 .../src/main/res/values-uk/translations.xml   |    2 +-
 .../src/main/res/values-uz/translations.xml   |   37 +
 .../main/res/values-zh-rTW/translations.xml   |    2 +-
 .../src/main/res/values-zh/translations.xml   |    4 +-
 .../impl/src/main/res/values/localazy.xml     |    6 +-
 .../src/main/res/values-cs/translations.xml   |    2 +
 .../src/main/res/values-fi/translations.xml   |    4 +-
 .../src/main/res/values-it/translations.xml   |    4 +-
 .../main/res/values-pt-rBR/translations.xml   |    4 +-
 .../src/main/res/values-uz/translations.xml   |    5 +
 .../src/main/res/values-zh/translations.xml   |    4 +-
 .../src/main/res/values-be/translations.xml   |    3 +-
 .../src/main/res/values-bg/translations.xml   |   11 +-
 .../src/main/res/values-cs/translations.xml   |   37 +-
 .../src/main/res/values-cy/translations.xml   |   16 +-
 .../src/main/res/values-da/translations.xml   |   16 +-
 .../src/main/res/values-de/translations.xml   |   16 +-
 .../src/main/res/values-el/translations.xml   |   15 +-
 .../src/main/res/values-es/translations.xml   |   16 +-
 .../src/main/res/values-et/translations.xml   |   27 +-
 .../src/main/res/values-eu/translations.xml   |   12 +-
 .../src/main/res/values-fa/translations.xml   |   12 +-
 .../src/main/res/values-fi/translations.xml   |   35 +-
 .../src/main/res/values-fr/translations.xml   |   62 +-
 .../src/main/res/values-hu/translations.xml   |   27 +-
 .../src/main/res/values-in/translations.xml   |   16 +-
 .../src/main/res/values-it/translations.xml   |   35 +-
 .../src/main/res/values-ko/translations.xml   |   16 +-
 .../src/main/res/values-nb/translations.xml   |   16 +-
 .../src/main/res/values-nl/translations.xml   |    3 +-
 .../src/main/res/values-pl/translations.xml   |   18 +-
 .../main/res/values-pt-rBR/translations.xml   |   38 +-
 .../src/main/res/values-pt/translations.xml   |   14 +-
 .../src/main/res/values-ro/translations.xml   |   16 +-
 .../src/main/res/values-ru/translations.xml   |   25 +-
 .../src/main/res/values-sk/translations.xml   |   16 +-
 .../src/main/res/values-sv/translations.xml   |   15 +-
 .../src/main/res/values-tr/translations.xml   |   18 +-
 .../src/main/res/values-uk/translations.xml   |   18 +-
 .../src/main/res/values-uz/translations.xml   |   30 +-
 .../main/res/values-zh-rTW/translations.xml   |   35 +-
 .../src/main/res/values-zh/translations.xml   |   16 +-
 .../impl/src/main/res/values/localazy.xml     |   24 +-
 .../src/main/res/values-cs/translations.xml   |    2 +-
 .../src/main/res/values-it/translations.xml   |   11 +
 .../main/res/values-pt-rBR/translations.xml   |   11 +
 .../src/main/res/values-uz/translations.xml   |    1 +
 .../src/main/res/values-uz/translations.xml   |    6 +
 .../main/res/values-pt-rBR/translations.xml   |    6 +-
 .../src/main/res/values-uz/translations.xml   |   12 +
 .../src/main/res/values-zh/translations.xml   |    6 +-
 .../src/main/res/values-uz/translations.xml   |    4 +
 .../src/main/res/values-uz/translations.xml   |    3 +
 .../src/main/res/values-uz/translations.xml   |   21 +
 .../src/main/res/values-cs/translations.xml   |    1 +
 .../src/main/res/values-fa/translations.xml   |   24 +
 .../src/main/res/values-fi/translations.xml   |    1 +
 .../src/main/res/values-it/translations.xml   |   13 +
 .../main/res/values-pt-rBR/translations.xml   |   13 +
 .../src/main/res/values-uz/translations.xml   |    2 +
 .../src/main/res/values-zh/translations.xml   |    8 +
 .../src/main/res/values-uz/translations.xml   |    7 +
 .../src/main/res/values-uz/translations.xml   |    1 +
 .../src/main/res/values-cs/translations.xml   |    4 +
 .../src/main/res/values-fa/translations.xml   |   18 +-
 .../src/main/res/values-fi/translations.xml   |    7 +-
 .../src/main/res/values-it/translations.xml   |   27 +-
 .../main/res/values-pt-rBR/translations.xml   |   46 +-
 .../src/main/res/values-uz/translations.xml   |   76 +-
 .../src/main/res/values-zh/translations.xml   |    7 +
 .../src/main/res/values/localazy.xml          |    7 +
 screenshots/html/data.js                      | 1873 +++++++++--------
 141 files changed, 2195 insertions(+), 1453 deletions(-)
 create mode 100644 features/announcement/impl/src/main/res/values-it/translations.xml
 create mode 100644 features/announcement/impl/src/main/res/values-pt-rBR/translations.xml
 create mode 100644 libraries/mediaviewer/impl/src/main/res/values-uz/translations.xml

diff --git a/features/announcement/impl/src/main/res/values-it/translations.xml b/features/announcement/impl/src/main/res/values-it/translations.xml
new file mode 100644
index 0000000000..584ddcdf21
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-it/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_space_announcement_item1">"Visualizza gli spazi che hai creato o a cui partecipi"</string>
+  <string name="screen_space_announcement_item2">"Accetta o rifiuta gli inviti agli spazi"</string>
+  <string name="screen_space_announcement_item3">"Scopri tutte le stanze a cui puoi partecipare nei tuoi spazi"</string>
+  <string name="screen_space_announcement_item4">"Unisciti agli spazi pubblici"</string>
+  <string name="screen_space_announcement_item5">"Lascia tutti gli spazi a cui ti sei unito"</string>
+  <string name="screen_space_announcement_notice">"A breve saranno disponibili le funzionalità di filtraggio, creazione e gestione degli spazi."</string>
+  <string name="screen_space_announcement_subtitle">"Benvenuti alla versione beta degli Spazi! Con questa prima versione potrete:"</string>
+  <string name="screen_space_announcement_title">"Ti presentiamo gli Spazi"</string>
+</resources>
diff --git a/features/announcement/impl/src/main/res/values-pt-rBR/translations.xml b/features/announcement/impl/src/main/res/values-pt-rBR/translations.xml
new file mode 100644
index 0000000000..32a9bf85af
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-pt-rBR/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_space_announcement_item1">"Visualizar espaços que criou ou entrou"</string>
+  <string name="screen_space_announcement_item2">"Aceitar ou recusar convites aos espaços"</string>
+  <string name="screen_space_announcement_item3">"Descobrir quaisquer salas que você pode entrar nos espaços"</string>
+  <string name="screen_space_announcement_item4">"Entrar espaços públicos"</string>
+  <string name="screen_space_announcement_item5">"Sair de quaisquer espaços que entrou"</string>
+  <string name="screen_space_announcement_notice">"Filtrar, criar, e gerenciar espaços virão em breve."</string>
+  <string name="screen_space_announcement_subtitle">"Boas-vindas à versão beta dos Espaços! Com essa primeira versão, você pode:"</string>
+  <string name="screen_space_announcement_title">"Apresentando Espaços"</string>
+</resources>
diff --git a/features/announcement/impl/src/main/res/values-zh/translations.xml b/features/announcement/impl/src/main/res/values-zh/translations.xml
index 66608eb6e5..e01e63b2ae 100644
--- a/features/announcement/impl/src/main/res/values-zh/translations.xml
+++ b/features/announcement/impl/src/main/res/values-zh/translations.xml
@@ -2,4 +2,10 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_space_announcement_item1">"查看您创建或加入的空间"</string>
   <string name="screen_space_announcement_item2">"接受或拒绝空间邀请"</string>
+  <string name="screen_space_announcement_item3">"发现您可以加入空间的所有房间"</string>
+  <string name="screen_space_announcement_item4">"加入公共空间"</string>
+  <string name="screen_space_announcement_item5">"离开你加入的所有空间"</string>
+  <string name="screen_space_announcement_notice">"筛选、创建及管理空间功能即将上线。"</string>
+  <string name="screen_space_announcement_subtitle">"欢迎使用 Spaces 测试版！使用首个版本，您可以："</string>
+  <string name="screen_space_announcement_title">"Spaces 简介"</string>
 </resources>
diff --git a/features/createroom/impl/src/main/res/values-fi/translations.xml b/features/createroom/impl/src/main/res/values-fi/translations.xml
index 31589ab997..df541d3dee 100644
--- a/features/createroom/impl/src/main/res/values-fi/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fi/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Uusi huone"</string>
-  <string name="screen_create_room_add_people_title">"Kutsu ihmisiä"</string>
+  <string name="screen_create_room_add_people_title">"Kutsu henkilöitä"</string>
   <string name="screen_create_room_error_creating_room">"Huoneen luomisessa tapahtui virhe"</string>
   <string name="screen_create_room_private_option_description">"Vain kutsutut henkilöt pääsevät tähän huoneeseen. Kaikki viestit ovat päästä päähän salattuja."</string>
   <string name="screen_create_room_private_option_title">"Yksityinen huone"</string>
diff --git a/features/createroom/impl/src/main/res/values-pt-rBR/translations.xml b/features/createroom/impl/src/main/res/values-pt-rBR/translations.xml
index 73aaaa503e..399c9fec17 100644
--- a/features/createroom/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/createroom/impl/src/main/res/values-pt-rBR/translations.xml
@@ -14,6 +14,7 @@ Você pode mudar isso a qualquer momento nas configurações da sala."</string>
   <string name="screen_create_room_room_access_section_knocking_option_description">"Qualquer pessoa pode pedir para entrar na sala, mas um administrador ou moderador terá de aceitar a solicitação"</string>
   <string name="screen_create_room_room_access_section_knocking_option_title">"Pedir para entrar"</string>
   <string name="screen_create_room_room_address_section_footer">"Para que esta sala fique visível no diretório público de salas, você precisará de um endereço de sala."</string>
+  <string name="screen_create_room_room_address_section_title">"Endereço da sala"</string>
   <string name="screen_create_room_room_name_label">"Nome da sala"</string>
   <string name="screen_create_room_room_visibility_section_title">"Visibilidade da sala"</string>
   <string name="screen_create_room_title">"Criar uma sala"</string>
diff --git a/features/home/impl/src/main/res/values-fa/translations.xml b/features/home/impl/src/main/res/values-fa/translations.xml
index 7e3658e0eb..aec50309d8 100644
--- a/features/home/impl/src/main/res/values-fa/translations.xml
+++ b/features/home/impl/src/main/res/values-fa/translations.xml
@@ -6,6 +6,7 @@
   <string name="banner_set_up_recovery_content">"بازگردانی تاریخچهٔ پیام‌ها و هویت رمزنگاشته‌تان با کلید بازیابی در صورت از دست دادن همهٔ افزاره‌های موجودتان."</string>
   <string name="banner_set_up_recovery_submit">"برپایی بازیابی"</string>
   <string name="banner_set_up_recovery_title">"برپایی بازیابی"</string>
+  <string name="confirm_recovery_key_banner_message">"کلید بازیابی خود را تأیید کنید تا دسترسی به حافظه کلیدها و تاریخچه پیام‌هایتان حفظ شود ."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"ورود کلید بازیابیتان"</string>
   <string name="confirm_recovery_key_banner_title">"ذخیره‌ساز کلیدتان از هم‌گام بودن در آمده"</string>
   <string name="full_screen_intent_banner_title">"بهبود تجریهٔ تماستان"</string>
diff --git a/features/home/impl/src/main/res/values-it/translations.xml b/features/home/impl/src/main/res/values-it/translations.xml
index 74f8d4abac..932545c7b0 100644
--- a/features/home/impl/src/main/res/values-it/translations.xml
+++ b/features/home/impl/src/main/res/values-it/translations.xml
@@ -3,6 +3,8 @@
   <string name="banner_battery_optimization_content_android">"Disabilita l\'ottimizzazione della batteria per questa app, per assicurarti che tutte le notifiche vengano ricevute."</string>
   <string name="banner_battery_optimization_submit_android">"Disabilita l\'ottimizzazione"</string>
   <string name="banner_battery_optimization_title_android">"Le notifiche non arrivano?"</string>
+  <string name="banner_new_sound_message">"Il ping delle notifiche è stato aggiornato: ora è più chiaro, più rapido e meno fastidioso."</string>
+  <string name="banner_new_sound_title">"Abbiamo rinnovato i tuoi suoni"</string>
   <string name="banner_set_up_recovery_content">"Recupera la tua identità crittografica e la cronologia dei messaggi con una chiave di recupero se hai perso tutti i tuoi dispositivi."</string>
   <string name="banner_set_up_recovery_submit">"Configura il recupero"</string>
   <string name="banner_set_up_recovery_title">"Configura il ripristino"</string>
diff --git a/features/home/impl/src/main/res/values-pt-rBR/translations.xml b/features/home/impl/src/main/res/values-pt-rBR/translations.xml
index 7aab508a38..10f5cf9585 100644
--- a/features/home/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/home/impl/src/main/res/values-pt-rBR/translations.xml
@@ -3,6 +3,8 @@
   <string name="banner_battery_optimization_content_android">"Desative a otimização de bateria para este app, para que tenha certeza que todas as notificações sejam recebidas."</string>
   <string name="banner_battery_optimization_submit_android">"Desativar otimização"</string>
   <string name="banner_battery_optimization_title_android">"As notificações não chegam?"</string>
+  <string name="banner_new_sound_message">"O seu ping de notificação foi atualizado—mais suave, mais rápido, e menos disruptivo."</string>
+  <string name="banner_new_sound_title">"Recarregamos seus sons"</string>
   <string name="banner_set_up_recovery_content">"Recupere sua identidade criptográfica e o histórico de mensagens com uma chave de recuperação caso você perda todos os dispositivos existentes."</string>
   <string name="banner_set_up_recovery_submit">"Configurar a recuperação"</string>
   <string name="banner_set_up_recovery_title">"Configure a recuperação para proteger sua conta"</string>
@@ -33,6 +35,7 @@ Por enquanto, você pode desmarcar os filtros para ver suas outras conversas"</s
   <string name="screen_roomlist_filter_invites">"Convites"</string>
   <string name="screen_roomlist_filter_invites_empty_state_title">"Você não tem nenhum convite pendente."</string>
   <string name="screen_roomlist_filter_low_priority">"Baixa prioridade"</string>
+  <string name="screen_roomlist_filter_low_priority_empty_state_title">"Você ainda não tem nenhuma conversa de baixa prioridade"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Você pode desmarcar filtros para ver suas outras conversas"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Você não tem conversas para esta seleção"</string>
   <string name="screen_roomlist_filter_people">"Pessoas"</string>
diff --git a/features/home/impl/src/main/res/values-uz/translations.xml b/features/home/impl/src/main/res/values-uz/translations.xml
index fbfeca156a..2de9b1b266 100644
--- a/features/home/impl/src/main/res/values-uz/translations.xml
+++ b/features/home/impl/src/main/res/values-uz/translations.xml
@@ -13,6 +13,7 @@
   <string name="full_screen_intent_banner_message">"Muhim qoʻngʻiroqlarni oʻtkazib yubormasligingiz uchun telefoningiz qulflangan holatida toʻliq ekranli bildirishnomalarni ko‘rsatishga ruxsat beradigan qilib sozlamalaringizni oʻzgartiring."</string>
   <string name="full_screen_intent_banner_title">"Qoʻngʻiroq tajribangizni yaxshilang"</string>
   <string name="screen_home_tab_chats">"Suhbatlar"</string>
+  <string name="screen_home_tab_spaces">"Bo‘shliqlar"</string>
   <string name="screen_invites_decline_chat_message">"Haqiqatan ham qo\'shilish taklifini rad qilmoqchimisiz%1$s ?"</string>
   <string name="screen_invites_decline_chat_title">"Taklifni rad etish"</string>
   <string name="screen_invites_decline_direct_chat_message">"Haqiqatan ham bu shaxsiy chatni rad qilmoqchimisiz%1$s ?"</string>
@@ -22,6 +23,7 @@
   <string name="screen_migration_message">"Bu bir martalik jarayon, kutganingiz uchun rahmat."</string>
   <string name="screen_migration_title">"Hisobingiz sozlanmoqda."</string>
   <string name="screen_roomlist_a11y_create_message">"Yangi suhbat yoki xona yarating"</string>
+  <string name="screen_roomlist_clear_filters">"Filtrlarni tozalash"</string>
   <string name="screen_roomlist_empty_message">"Kimgadir xabar yuborishdan boshlang."</string>
   <string name="screen_roomlist_empty_title">"Hozircha chatlar yo‘q."</string>
   <string name="screen_roomlist_filter_favourites">"Sevimlilar"</string>
@@ -31,6 +33,7 @@ Hozircha, boshqa suhbatlaringizni ko‘rish uchun filtrlarni bekor qilishingiz m
   <string name="screen_roomlist_filter_invites">"Takliflar"</string>
   <string name="screen_roomlist_filter_invites_empty_state_title">"Sizda hech qanday kutilayotgan takliflar yoʻq."</string>
   <string name="screen_roomlist_filter_low_priority">"Past darajali"</string>
+  <string name="screen_roomlist_filter_low_priority_empty_state_title">"Sizda hali past ustuvor chatlar yoʻq"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Boshqa suhbatlaringizni koʻrish uchun filtrlarni bekor qilishingiz mumkin"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Sizda bu tanlov uchun chatlar yo‘q"</string>
   <string name="screen_roomlist_filter_people">"Odamlar"</string>
@@ -44,6 +47,7 @@ Sizda oʻqilmagan xabarlar yoʻq!"</string>
   <string name="screen_roomlist_main_space_title">"Suhbatlar"</string>
   <string name="screen_roomlist_mark_as_read">"Oʻqilgan deb belgilash"</string>
   <string name="screen_roomlist_mark_as_unread">"Oʻqilmagan deb belgilash"</string>
+  <string name="screen_roomlist_tombstoned_room_description">"Bu xona yangilandi"</string>
   <string name="session_verification_banner_message">"Siz yangi qurilmadan foydalanayotganga o‘xshaysiz. Shifrlangan xabarlaringizga kirish uchun boshqa qurilma bilan tasdiqlang."</string>
   <string name="session_verification_banner_title">"Siz ekanligingizni tasdiqlang"</string>
 </resources>
diff --git a/features/home/impl/src/main/res/values-zh/translations.xml b/features/home/impl/src/main/res/values-zh/translations.xml
index 805b56de5c..748159d80f 100644
--- a/features/home/impl/src/main/res/values-zh/translations.xml
+++ b/features/home/impl/src/main/res/values-zh/translations.xml
@@ -3,6 +3,8 @@
   <string name="banner_battery_optimization_content_android">"请关闭本应用的电池优化设置，确保不错过任何消息通知。"</string>
   <string name="banner_battery_optimization_submit_android">"禁用优化"</string>
   <string name="banner_battery_optimization_title_android">"通知未送达？"</string>
+  <string name="banner_new_sound_message">"您的通知提示音已升级 - 更清晰、更快速、干扰更少。"</string>
+  <string name="banner_new_sound_title">"我们已更新您的声音"</string>
   <string name="banner_set_up_recovery_content">"生成新的恢复密钥，该密钥可用于在您无法访问设备时恢复加密的消息历史记录。"</string>
   <string name="banner_set_up_recovery_submit">"设置恢复"</string>
   <string name="banner_set_up_recovery_title">"设置恢复"</string>
diff --git a/features/invite/impl/src/main/res/values-uz/translations.xml b/features/invite/impl/src/main/res/values-uz/translations.xml
index bdefbd31d3..ab20b58101 100644
--- a/features/invite/impl/src/main/res/values-uz/translations.xml
+++ b/features/invite/impl/src/main/res/values-uz/translations.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Siz bu foydalanuvchidan hech qanday xabar yoki xonaga taklif ko‘rmaysiz"</string>
   <string name="screen_decline_and_block_block_user_option_title">"Foydalanuvchini bloklash"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Bu xona haqida hisobingiz provayderiga xabar bering."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Xabar berish sababini tushuntiring…"</string>
   <string name="screen_decline_and_block_title">"Rad etish va bloklash"</string>
   <string name="screen_invites_decline_chat_message">"Haqiqatan ham qo\'shilish taklifini rad qilmoqchimisiz%1$s ?"</string>
   <string name="screen_invites_decline_chat_title">"Taklifni rad etish"</string>
@@ -8,5 +11,8 @@
   <string name="screen_invites_decline_direct_chat_title">"Chatni rad etish"</string>
   <string name="screen_invites_empty_list">"Takliflar yo\'q"</string>
   <string name="screen_invites_invited_you">"%1$s(%2$s ) sizni taklif qildi"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Ha, rad etish va bloklash"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Ushbu xonaga qo‘shilish taklifini rad etishga ishonchingiz komilmi? Bu %1$sning siz bilan bog‘lanishiga yoki sizni xonalarga taklif qilishiga ham to‘sqinlik qiladi."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Taklifni rad etish va bloklash"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Rad etish va bloklash"</string>
 </resources>
diff --git a/features/joinroom/impl/src/main/res/values-it/translations.xml b/features/joinroom/impl/src/main/res/values-it/translations.xml
index deb025db27..756d6edc40 100644
--- a/features/joinroom/impl/src/main/res/values-it/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-it/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_join_room_ban_by_message">"Sei stato bandito da questa stanza da %1$s."</string>
-  <string name="screen_join_room_ban_message">"Sei stato bandito da questa stanza"</string>
+  <string name="screen_join_room_ban_by_message">"Sei stato bannato da %1$s ."</string>
+  <string name="screen_join_room_ban_message">"Sei stato bannato"</string>
   <string name="screen_join_room_ban_reason">"Motivo: %1$s"</string>
   <string name="screen_join_room_cancel_knock_action">"Cancella richiesta"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Sì, annulla"</string>
@@ -11,10 +11,11 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Sei sicuro di voler rifiutare l\'invito a entrare in questa stanza? Ciò impedirà a %1$s di contattarti o invitarti nuovamente in una stanza."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Rifiuta invito e blocca"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Rifiuta e blocca"</string>
-  <string name="screen_join_room_fail_message">"L\'accesso alla stanza non è riuscito."</string>
-  <string name="screen_join_room_fail_reason">"Questa stanza è solo su invito o potrebbero esserci delle restrizioni all\'accesso al livello dello spazio."</string>
-  <string name="screen_join_room_forget_action">"Dimentica questa stanza"</string>
-  <string name="screen_join_room_invite_required_message">"Hai bisogno di un invito per entrare in questa stanza"</string>
+  <string name="screen_join_room_fail_message">"Partecipazione non riuscita"</string>
+  <string name="screen_join_room_fail_reason">"Devi essere invitato per partecipare o potrebbero esserci delle restrizioni di accesso."</string>
+  <string name="screen_join_room_forget_action">"Dimentica"</string>
+  <string name="screen_join_room_invite_required_message">"Per partecipare è necessario un invito"</string>
+  <string name="screen_join_room_invited_by">"Invitato da"</string>
   <string name="screen_join_room_join_action">"Entra"</string>
   <string name="screen_join_room_join_restricted_message">"Potrebbe essere necessario essere invitati o essere membro di uno spazio per partecipare."</string>
   <string name="screen_join_room_knock_action">"Bussa per partecipare"</string>
diff --git a/features/joinroom/impl/src/main/res/values-pt-rBR/translations.xml b/features/joinroom/impl/src/main/res/values-pt-rBR/translations.xml
index ed553bd93a..247532946f 100644
--- a/features/joinroom/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-pt-rBR/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_join_room_ban_by_message">"Você foi banido desta sala por %1$s."</string>
-  <string name="screen_join_room_ban_message">"Você foi banido desta sala"</string>
+  <string name="screen_join_room_ban_by_message">"Você foi banido por %1$s."</string>
+  <string name="screen_join_room_ban_message">"Você foi banido"</string>
   <string name="screen_join_room_ban_reason">"Motivo: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Cancelar pedido"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Sim, cancelar"</string>
@@ -11,10 +11,11 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Tem certeza de que quer recusar o convite para entrar nesta sala? Isso também impedirá que %1$s entre em contato com você ou o convide para salas."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Recusar convite e bloquear"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Recusar e bloquear"</string>
-  <string name="screen_join_room_fail_message">"A entrada na sala falhou."</string>
-  <string name="screen_join_room_fail_reason">"Esta sala é apenas para convidados ou pode haver restrições de acesso a nível do espaço."</string>
-  <string name="screen_join_room_forget_action">"Esquecer esta sala"</string>
-  <string name="screen_join_room_invite_required_message">"Você precisa de um convite para entrar nesta sala"</string>
+  <string name="screen_join_room_fail_message">"Falha ao entrar"</string>
+  <string name="screen_join_room_fail_reason">"Você precisa ser convidado ou pode haver restrições ao acesso."</string>
+  <string name="screen_join_room_forget_action">"Esquecer"</string>
+  <string name="screen_join_room_invite_required_message">"Você precisa de um convite para entrar"</string>
+  <string name="screen_join_room_invited_by">"Convidado por"</string>
   <string name="screen_join_room_join_action">"Entrar"</string>
   <string name="screen_join_room_join_restricted_message">"Talvez você precise ser convidado ou ser membro de um espaço para participar."</string>
   <string name="screen_join_room_knock_action">"Enviar solicitação para entrar"</string>
diff --git a/features/joinroom/impl/src/main/res/values-uz/translations.xml b/features/joinroom/impl/src/main/res/values-uz/translations.xml
index e8c50922c4..de8b10f2b1 100644
--- a/features/joinroom/impl/src/main/res/values-uz/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-uz/translations.xml
@@ -1,15 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_ban_by_message">"Siz %1$s tomonidan ushbu xonadan ban qilingansiz."</string>
+  <string name="screen_join_room_ban_message">"Siz bu xonadan chetlashtirilgansiz"</string>
+  <string name="screen_join_room_ban_reason">"Sababi: %1$s ."</string>
   <string name="screen_join_room_cancel_knock_action">"So‘rovni bekor qilish"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Ha, bekor qiling"</string>
   <string name="screen_join_room_cancel_knock_alert_description">"Bu xonaga qo‘shilish so‘rovingizni bekor qilishni xohlayotganingizga ishonchingiz komilmi?"</string>
   <string name="screen_join_room_cancel_knock_alert_title">"Qo‘shilish so‘rovini bekor qilish"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Ha, rad etish va bloklash"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Ushbu xonaga qo‘shilish taklifini rad etishga ishonchingiz komilmi? Bu %1$sning siz bilan bog‘lanishiga yoki sizni xonalarga taklif qilishiga ham to‘sqinlik qiladi."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Taklifni rad etish va bloklash"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Rad etish va bloklash"</string>
+  <string name="screen_join_room_fail_message">"Xonaga qo‘shilish amalga oshmadi"</string>
+  <string name="screen_join_room_fail_reason">"Bu xona faqat taklif etilganlar uchun yoki bu maydonga kirish huquqi cheklangan bo‘lishi mumkin."</string>
+  <string name="screen_join_room_forget_action">"Bu xonani esdan chiqarish"</string>
+  <string name="screen_join_room_invite_required_message">"Bu xonaga kirish uchun taklifnoma kerak"</string>
   <string name="screen_join_room_join_action">"Qo\'shilish"</string>
+  <string name="screen_join_room_join_restricted_message">"Qo‘shilish uchun sizga taklif kerak yoki siz maydonga a’zo bo‘lishingiz kerak."</string>
   <string name="screen_join_room_knock_action">"Qoʻshilish soʻrovini yuborish"</string>
+  <string name="screen_join_room_knock_message_characters_count">"Ruxsat etilgan belgilar: %1$d / %2$d"</string>
   <string name="screen_join_room_knock_message_description">"Xabar (ixtiyoriy)"</string>
   <string name="screen_join_room_knock_sent_description">"Agar so‘rovingiz qabul qilinsa, xonaga qo‘shilish taklifini olasiz."</string>
   <string name="screen_join_room_knock_sent_title">"Qo‘shilish so‘rovi yuborildi"</string>
+  <string name="screen_join_room_loading_alert_message">"Xona ko‘rinishini namoyish eta olmadik. Bu tarmoq yoki server muammolari tufayli yuz bergan bo‘lishi mumkin."</string>
+  <string name="screen_join_room_loading_alert_title">"Biz bu xonani oldindan ko‘rishni ko‘rsata olmadik "</string>
   <string name="screen_join_room_space_not_supported_description">"%1$s hali maydon xizmatini qoʻllab-quvvatlamaydi. maydonga veb-sayt orqali kirishingiz mumkin."</string>
   <string name="screen_join_room_space_not_supported_title">"Maydonlar hali qoʻllab-quvvatlanmaydi"</string>
   <string name="screen_join_room_subtitle_knock">"Quyidagi tugmani bosing va xona administratoriga xabar beriladi. Ruxsat berilgandan soʻng suhbatga qoʻshilishingiz mumkin boʻladi."</string>
diff --git a/features/joinroom/impl/src/main/res/values-zh/translations.xml b/features/joinroom/impl/src/main/res/values-zh/translations.xml
index 52361e01aa..7bea362c81 100644
--- a/features/joinroom/impl/src/main/res/values-zh/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-zh/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_join_room_ban_by_message">"你被 %1$s 从此房间封禁。"</string>
-  <string name="screen_join_room_ban_message">"你已被此房间封禁"</string>
+  <string name="screen_join_room_ban_by_message">"您已被禁止访问%1$s。"</string>
+  <string name="screen_join_room_ban_message">"你已被禁止访问"</string>
   <string name="screen_join_room_ban_reason">"理由：%1$s。"</string>
   <string name="screen_join_room_cancel_knock_action">"取消请求"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"是的，取消"</string>
@@ -11,10 +11,10 @@
   <string name="screen_join_room_decline_and_block_alert_message">"您确定要拒绝加入此房间的邀请吗？这也将阻止%1$s 与您联系或邀请您加入房间。"</string>
   <string name="screen_join_room_decline_and_block_alert_title">"拒绝邀请并屏蔽"</string>
   <string name="screen_join_room_decline_and_block_button_title">"拒绝并屏蔽"</string>
-  <string name="screen_join_room_fail_message">"加入房间失败。"</string>
-  <string name="screen_join_room_fail_reason">"要么此房间仅限受邀者，要么可能在空间层级有加入限制。"</string>
-  <string name="screen_join_room_forget_action">"忘记这个房间"</string>
-  <string name="screen_join_room_invite_required_message">"你需要邀请才能加入这个房间"</string>
+  <string name="screen_join_room_fail_message">"加入失败"</string>
+  <string name="screen_join_room_fail_reason">"您需要被邀请加入，否则可能会受到访问限制。"</string>
+  <string name="screen_join_room_forget_action">"忘记"</string>
+  <string name="screen_join_room_invite_required_message">"您需要邀请才能加入"</string>
   <string name="screen_join_room_invited_by">"受邀于"</string>
   <string name="screen_join_room_join_action">"加入"</string>
   <string name="screen_join_room_join_restricted_message">"您可能需要受到邀请或成为某个空间的成员才能加入。"</string>
diff --git a/features/knockrequests/impl/src/main/res/values-uz/translations.xml b/features/knockrequests/impl/src/main/res/values-uz/translations.xml
index 8cad1166df..24d8fb3fac 100644
--- a/features/knockrequests/impl/src/main/res/values-uz/translations.xml
+++ b/features/knockrequests/impl/src/main/res/values-uz/translations.xml
@@ -1,5 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_knock_requests_list_accept_all_alert_confirm_button_title">"Ha, hammasini qabul qiling"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_description">"Barcha qo‘shilish so‘rovlarini qabul qilishga ishonchingiz komilmi?"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_title">"Barcha so‘rovlarni qabul qilish"</string>
+  <string name="screen_knock_requests_list_accept_all_button_title">"Hammasini qabul qiling"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"Biz barcha so‘rovlarni qabul qila olmadik. Qayta urinib koʻrmoqchimisiz?"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_title">"Barcha so‘rovlar qabul qilinmadi"</string>
+  <string name="screen_knock_requests_list_accept_all_loading_title">"Qo‘shilish so‘rovi qabul qilinmoqda"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_description">"Biz bu so‘rovni qabul qila olmadik. Yana bir bor urinib ko‘rishni xohlaysizmi?"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_title">"So‘rovni qabul qilib bo‘lmadi"</string>
+  <string name="screen_knock_requests_list_accept_loading_title">"Qo‘shilish so‘rovi qabul qilinmoqda"</string>
+  <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"Ha, rad eting va taqiqlang"</string>
+  <string name="screen_knock_requests_list_ban_alert_description">"Siz %1$sʼni rad etib, taqiqlashni xohlayotganingizga ishonchingiz komilmi? Bu foydalanuvchi ushbu xonaga qayta kirish uchun ruxsat so‘ray olmaydi."</string>
+  <string name="screen_knock_requests_list_ban_alert_title">"Rad etish va kirishni taqiqlash"</string>
+  <string name="screen_knock_requests_list_ban_loading_title">"Kirishni rad etish va taqiqlash"</string>
+  <string name="screen_knock_requests_list_decline_alert_confirm_button_title">"Ha, rad etish"</string>
+  <string name="screen_knock_requests_list_decline_alert_description">"%1$sning bu xonaga qo‘shilish so‘rovini rad etasizmi?"</string>
+  <string name="screen_knock_requests_list_decline_alert_title">"Kirishni rad etish"</string>
+  <string name="screen_knock_requests_list_decline_and_ban_action_title">"Rad etish va taqiqlash"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_description">"Biz bu iltimosni rad etolmasdik. Yana bir bor urinib ko‘rishni xohlaysizmi?"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_title">"So‘rovni rad etib bo‘lmadi"</string>
+  <string name="screen_knock_requests_list_decline_loading_title">"Qo‘shilish so‘rovi rad etilayapti"</string>
+  <string name="screen_knock_requests_list_empty_state_description">"Kimdir xonaga qo‘shilishni so‘raganda, uning iltimosini shu yerda ko‘rishingiz mumkin."</string>
+  <string name="screen_knock_requests_list_empty_state_title">"Qo‘shilish so‘rovi kutilmayapti"</string>
+  <string name="screen_knock_requests_list_initial_loading_title">"Qo‘shilish uchun so‘rovlar yuklanmoqda…"</string>
+  <string name="screen_knock_requests_list_title">"Qo‘shilish uchun so‘rovlar"</string>
+  <plurals name="screen_room_multiple_knock_requests_title">
+    <item quantity="one">"%1$s + %2$d kishi bu xonaga qo‘shilmoqchi"</item>
+    <item quantity="other">"%1$s + %2$d kishi bu xonaga qo‘shilmoqchi"</item>
+  </plurals>
+  <string name="screen_room_multiple_knock_requests_view_all_button_title">"Hammasini ko\'rish"</string>
   <string name="screen_room_single_knock_request_accept_button_title">"Qabul qiling"</string>
+  <string name="screen_room_single_knock_request_title">"%1$s bu xonaga qo‘shilmoqchi"</string>
   <string name="screen_room_single_knock_request_view_button_title">"Ko\'rish"</string>
 </resources>
diff --git a/features/leaveroom/api/src/main/res/values-uz/translations.xml b/features/leaveroom/api/src/main/res/values-uz/translations.xml
index 374fd347fc..e04bbf4b7f 100644
--- a/features/leaveroom/api/src/main/res/values-uz/translations.xml
+++ b/features/leaveroom/api/src/main/res/values-uz/translations.xml
@@ -3,5 +3,8 @@
   <string name="leave_conversation_alert_subtitle">"Bu suhbatni tark etmoqchi ekanligingizga ishonchingiz komilmi? Bu suhbat hammaga ochiq emas va siz taklifsiz qayta qo‘shila olmaysiz."</string>
   <string name="leave_room_alert_empty_subtitle">"Bu xonani tark etmoqchi ekanligingizga ishonchingiz komilmi? Siz bu yerda yagona odamsiz. Agar siz tark etsangiz, kelajakda hech kim qo\'shila olmaydi, jumladan siz ham."</string>
   <string name="leave_room_alert_private_subtitle">"Bu xonani tark etmoqchi ekanligingizga ishonchingiz komilmi? Bu xona ochiq emas va siz taklifsiz qayta qo‘shila olmaysiz."</string>
+  <string name="leave_room_alert_select_new_owner_action">"Egalarni tanlang"</string>
+  <string name="leave_room_alert_select_new_owner_subtitle">"Siz bu xonaning yagona egasisiz. Xonadan chiqishdan oldin egalikni boshqaga topshirishingiz kerak."</string>
+  <string name="leave_room_alert_select_new_owner_title">"Egalikni topshirish"</string>
   <string name="leave_room_alert_subtitle">"Xonani tark etmoqchi ekanligingizga ishonchingiz komilmi?"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-fa/translations.xml b/features/lockscreen/impl/src/main/res/values-fa/translations.xml
index 8e57ec8d68..56dc91e835 100644
--- a/features/lockscreen/impl/src/main/res/values-fa/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-fa/translations.xml
@@ -24,6 +24,14 @@
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"پین‌ها مطابق نیستند"</string>
   <string name="screen_app_lock_signout_alert_message">"برای ادامه باید دوباره وارد شده و پینی جدید ایجاد کنید"</string>
   <string name="screen_app_lock_signout_alert_title">"دارید خارج می‌شوید"</string>
+  <plurals name="screen_app_lock_subtitle">
+    <item quantity="one">"شما %1$d تلاش برای باز کردن قفل دارید"</item>
+    <item quantity="other">"شما %1$d تلاش برای باز کردن قفل دارید"</item>
+  </plurals>
+  <plurals name="screen_app_lock_subtitle_wrong_pin">
+    <item quantity="one">"پین اشتباه است. شما %1$d شانس دیگر دارید"</item>
+    <item quantity="other">"پین اشتباه است. شما %1$d شانس دیگر دارید"</item>
+  </plurals>
   <string name="screen_app_lock_use_biometric_android">"استفاده از زیست‌سنجی"</string>
   <string name="screen_app_lock_use_pin_android">"استفاده از پین"</string>
   <string name="screen_signout_in_progress_dialog_content">"خارج شدن…"</string>
diff --git a/features/lockscreen/impl/src/main/res/values-uz/translations.xml b/features/lockscreen/impl/src/main/res/values-uz/translations.xml
index 9981cf3bce..8cd0a57b94 100644
--- a/features/lockscreen/impl/src/main/res/values-uz/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-uz/translations.xml
@@ -3,6 +3,7 @@
   <string name="screen_app_lock_biometric_authentication">"biometrik autentifikatsiya"</string>
   <string name="screen_app_lock_biometric_unlock">"biometrik qulf ochish"</string>
   <string name="screen_app_lock_biometric_unlock_title_android">"Biometrik bilan qulfni oching"</string>
+  <string name="screen_app_lock_confirm_biometric_authentication_android">"Biometrikni tasdiqlang"</string>
   <string name="screen_app_lock_forgot_pin">"PIN kodni unutdingizmi?"</string>
   <string name="screen_app_lock_settings_change_pin">"PIN kodni o\'zgartirish"</string>
   <string name="screen_app_lock_settings_enable_biometric_unlock">"Biometrik qulfni ochishga ruxsat bering"</string>
diff --git a/features/login/impl/src/main/res/values-uz/translations.xml b/features/login/impl/src/main/res/values-uz/translations.xml
index 373081f3c3..9c6c297b20 100644
--- a/features/login/impl/src/main/res/values-uz/translations.xml
+++ b/features/login/impl/src/main/res/values-uz/translations.xml
@@ -13,9 +13,17 @@
   <string name="screen_change_account_provider_other">"Boshqa"</string>
   <string name="screen_change_account_provider_subtitle">"Shaxsiy serveringiz yoki ishchi hisob qaydnomangiz kabi boshqa hisob provayderidan foydalaning."</string>
   <string name="screen_change_account_provider_title">"Hisob provayderini o\'zgartiring"</string>
+  <string name="screen_change_server_error_element_pro_required_action_android">"Google Play"</string>
+  <string name="screen_change_server_error_element_pro_required_message">"%1$s da Element Pro ilovasi talab qilinadi. Iltimos, do‘kondan yuklab oling."</string>
+  <string name="screen_change_server_error_element_pro_required_title">"Element Pro talab qilinadi"</string>
   <string name="screen_change_server_error_invalid_homeserver">"Bu uy serveriga kira olmadik. Iltimos, uy serverining URL manzilini to\'ri kiritganingizni tekshiring. Agar URL toʻgʻri boʻlsa, qoʻshimcha yordam olish uchun uy serveri administratoriga murojaat qiling."</string>
   <string name="screen_change_server_error_invalid_well_known">".well-known faylidagi muammo tufayli server mavjud emas: %1$s"</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Tanlangan hisob provayderi siljitish sinxronizatsiyasini qo‘llab-quvvatlamaydi. %1$s ishlatish uchun serverni yangilash zarur."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver">"%1$s uchun %2$s bilan ulanishga ruxsat berilmagan."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_content">"Bu ilova quyidagilarga ruxsat berish uchun sozlangan: %1$s ."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_title">"Hisob provayderi %1$s ga ruxsat berilmagan."</string>
   <string name="screen_change_server_form_header">"Uy serverining URL manzili"</string>
+  <string name="screen_change_server_form_notice">"Domen manzilini kiriting."</string>
   <string name="screen_change_server_subtitle">"Serveringizning manzili nima?"</string>
   <string name="screen_change_server_title">"Serveringizni tanlang"</string>
   <string name="screen_create_account_title">"Hisob yaratish"</string>
@@ -28,6 +36,7 @@
   <string name="screen_login_subtitle">"Matrix xavfsiz, markazlashmagan aloqa uchun ochiq tarmoqdir."</string>
   <string name="screen_login_title">"Qaytib kelganingizdan xursandmiz!"</string>
   <string name="screen_login_title_with_homeserver">"Kirish%1$s"</string>
+  <string name="screen_onboarding_app_version">"%1$s versiya"</string>
   <string name="screen_onboarding_sign_in_manually">"Qo\'lda tizimga kiring"</string>
   <string name="screen_onboarding_sign_in_to">"Kirish%1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"QR kod bilan tizimga kiring"</string>
@@ -83,5 +92,6 @@ Oddiy usulda kiring yoki boshqa qurilma bilan QR kodni skanerlang."</string>
   <string name="screen_server_confirmation_message_login_matrix_dot_org">"Matrix xavfsiz, markazlashmagan aloqa uchun ochiq tarmoqdir."</string>
   <string name="screen_server_confirmation_message_register">"Bu sizning suhbatlaringiz yashaydigan joy - xuddi siz elektron pochta xabarlaringizni saqlash uchun elektron pochta provayderidan foydalanganingiz kabi."</string>
   <string name="screen_server_confirmation_title_login">"Siz tizimga kirmoqchisiz%1$s"</string>
+  <string name="screen_server_confirmation_title_picker_mode">"Hisob provayderini tanlang"</string>
   <string name="screen_server_confirmation_title_register">"Hisob yaratmoqchisiz%1$s"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-fa/translations.xml b/features/logout/impl/src/main/res/values-fa/translations.xml
index c4c6e823d0..8dfaad8580 100644
--- a/features/logout/impl/src/main/res/values-fa/translations.xml
+++ b/features/logout/impl/src/main/res/values-fa/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_signout_in_progress_dialog_content">"خارج شدن…"</string>
   <string name="screen_signout_key_backup_disabled_subtitle">"دارید از واپسین نشستتان خارج می‌شوید. اگر اکنون خارج شوید پیام‌های رمزنگاشته‌تان را از دست خواهید داد."</string>
   <string name="screen_signout_key_backup_disabled_title">"پشتیبان را خاموش کرده‌اید"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"در هنگامی که آفلاین شدید، کلیدهای شما هنوز در حال پشتیبان‌گیری بودند. دوباره متصل شوید ، تا قبل از خروج از کلیدهایتان نسخه پشتیبان‌ گرفته شود."</string>
   <string name="screen_signout_key_backup_offline_title">"کلیدهایتان هنوز در حال پشتیبان گیریند"</string>
   <string name="screen_signout_key_backup_ongoing_subtitle">"لطفاً پیش از خروج منتظر پایانش شوید."</string>
   <string name="screen_signout_key_backup_ongoing_title">"کلیدهایتان هنوز در حال پشتیبان گیریند"</string>
diff --git a/features/messages/impl/src/main/res/values-fa/translations.xml b/features/messages/impl/src/main/res/values-fa/translations.xml
index 56913e2f19..b102f82a98 100644
--- a/features/messages/impl/src/main/res/values-fa/translations.xml
+++ b/features/messages/impl/src/main/res/values-fa/translations.xml
@@ -42,6 +42,10 @@
   <string name="screen_room_timeline_reactions_show_more">"نمایش بیش‌تر"</string>
   <string name="screen_room_timeline_reactions_show_reactions_summary">"نمایش خلاصهٔ واکنش‌ها"</string>
   <string name="screen_room_timeline_read_marker_title">"جدید"</string>
+  <plurals name="screen_room_timeline_state_changes">
+    <item quantity="one">"%1$dتغییر اتاق"</item>
+    <item quantity="other">"%1$dتغییر اتاق"</item>
+  </plurals>
   <string name="screen_room_timeline_tombstoned_room_action">"پرش به اتاق جدید"</string>
   <string name="screen_room_timeline_tombstoned_room_message">"این اتاق جایگزین شده و دیگر فعّال نیست"</string>
   <string name="screen_room_timeline_upgraded_room_action">"دیدن پیام‌های قدیمی"</string>
diff --git a/features/messages/impl/src/main/res/values-it/translations.xml b/features/messages/impl/src/main/res/values-it/translations.xml
index 87a7a05c93..c5b98c8178 100644
--- a/features/messages/impl/src/main/res/values-it/translations.xml
+++ b/features/messages/impl/src/main/res/values-it/translations.xml
@@ -7,6 +7,7 @@
   <string name="emoji_picker_category_objects">"Oggetti"</string>
   <string name="emoji_picker_category_people">"Faccine &amp; Persone"</string>
   <string name="emoji_picker_category_places">"Viaggi &amp; Luoghi"</string>
+  <string name="emoji_picker_category_recent">"Emoji recenti"</string>
   <string name="emoji_picker_category_symbols">"Simboli"</string>
   <string name="screen_media_upload_preview_caption_warning">"Le didascalie potrebbero non essere visibili agli utenti di app meno recenti."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Tocca per modificare la qualità di caricamento del video"</string>
@@ -15,6 +16,7 @@
   <string name="screen_media_upload_preview_error_failed_sending">"Caricamento del file multimediale fallito, riprova."</string>
   <string name="screen_media_upload_preview_error_too_large_message">"La dimensione massima consentita del file è %1$s ."</string>
   <string name="screen_media_upload_preview_error_too_large_title">"Il file è troppo grande per essere caricato"</string>
+  <string name="screen_media_upload_preview_item_count">"Elemento %1$d di %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Ottimizza la qualità delle immagini"</string>
   <string name="screen_media_upload_preview_processing">"Elaborazione…"</string>
   <string name="screen_report_content_block_user">"Blocca utente"</string>
diff --git a/features/messages/impl/src/main/res/values-pt-rBR/translations.xml b/features/messages/impl/src/main/res/values-pt-rBR/translations.xml
index c85f17bdb3..6098fd0889 100644
--- a/features/messages/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/messages/impl/src/main/res/values-pt-rBR/translations.xml
@@ -7,13 +7,18 @@
   <string name="emoji_picker_category_objects">"Objetos"</string>
   <string name="emoji_picker_category_people">"Sorrisos &amp; Pessoas"</string>
   <string name="emoji_picker_category_places">"Viagens &amp; Lugares"</string>
+  <string name="emoji_picker_category_recent">"Emojis recentes"</string>
   <string name="emoji_picker_category_symbols">"Símbolos"</string>
   <string name="screen_media_upload_preview_caption_warning">"As legendas podem não ser visíveis para pessoas que usam apps mais antigos."</string>
+  <string name="screen_media_upload_preview_change_video_quality_prompt">"Toque para alterar a qualidade do envio do vídeo"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"O arquivo não pôde ser enviado."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Falha ao processar a mídia para o envio. Tente novamente."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Falha ao enviar mídia. Tente novamente."</string>
   <string name="screen_media_upload_preview_error_too_large_message">"O tamanho de arquivo máximo permitido é %1$s."</string>
   <string name="screen_media_upload_preview_error_too_large_title">"O arquivo é muito grande para enviar"</string>
+  <string name="screen_media_upload_preview_item_count">"%1$d de %2$d itens"</string>
+  <string name="screen_media_upload_preview_optimize_image_quality_title">"Otimizar qualidade da imagem"</string>
+  <string name="screen_media_upload_preview_processing">"Processando…"</string>
   <string name="screen_report_content_block_user">"Bloquear usuário"</string>
   <string name="screen_report_content_block_user_hint">"Marque se você deseja ocultar todas as mensagens atuais e futuras desse usuário"</string>
   <string name="screen_report_content_explanation">"Essa mensagem será reportada ao administrador do seu servidor-casa. Eles não conseguirão ler nenhuma mensagem criptografada."</string>
diff --git a/features/messages/impl/src/main/res/values-uz/translations.xml b/features/messages/impl/src/main/res/values-uz/translations.xml
index e48de2b6ad..8f75212a31 100644
--- a/features/messages/impl/src/main/res/values-uz/translations.xml
+++ b/features/messages/impl/src/main/res/values-uz/translations.xml
@@ -8,8 +8,15 @@
   <string name="emoji_picker_category_people">"Smayllar va odamlar"</string>
   <string name="emoji_picker_category_places">"Sayohat va Joylar"</string>
   <string name="emoji_picker_category_symbols">"Belgilar"</string>
+  <string name="screen_media_upload_preview_caption_warning">"Taglavhalar eski ilovalardan foydalanuvchilarga ko‘rinmasligi mumkin."</string>
+  <string name="screen_media_upload_preview_change_video_quality_prompt">"Video yuklash sifatini oʻzgartirish uchun bosing"</string>
+  <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Faylni yuklab boʻlmadi."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Mediani yuklab bo‘lmadi, qayta urinib ko‘ring."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Media yuklanmadi, qayta urinib ko‘ring."</string>
+  <string name="screen_media_upload_preview_error_too_large_message">"Ruxsat etilgan maksimal fayl hajmi %1$s ."</string>
+  <string name="screen_media_upload_preview_error_too_large_title">"Fayl yuklash uchun juda katta"</string>
+  <string name="screen_media_upload_preview_optimize_image_quality_title">"Tasvir sifatini optimallashtirish"</string>
+  <string name="screen_media_upload_preview_processing">"Qayta ishlanmoqda…"</string>
   <string name="screen_report_content_block_user">"Foydalanuvchini bloklash"</string>
   <string name="screen_report_content_block_user_hint">"Ushbu foydalanuvchidan barcha joriy va kelajakdagi xabarlarni yashirishni xohlayotganingizni tekshiring"</string>
   <string name="screen_report_content_explanation">"Bu xabar uy serveringiz administratoriga xabar qilinadi. Ular hech qanday shifrlangan xabarlarni o\'qiy olmaydi."</string>
@@ -33,16 +40,31 @@
   <string name="screen_room_timeline_add_reaction">"Emoji qo\'shmoq"</string>
   <string name="screen_room_timeline_beginning_of_room">"Bu %1$sni boshlanishi"</string>
   <string name="screen_room_timeline_beginning_of_room_no_name">"Bu suhbatning boshlanishi."</string>
+  <string name="screen_room_timeline_legacy_call">"Chaqiruv qabul qilinmaydi. Chaqiruvchidan yangi Element X ilovasidan foydalanishi mumkinligini so‘rang."</string>
   <string name="screen_room_timeline_less_reactions">"Kamroq ko\'rsatish"</string>
   <string name="screen_room_timeline_message_copied">"Xabar nusxalandi"</string>
   <string name="screen_room_timeline_no_permission_to_post">"Sizda bu xonaga post yozishga ruxsat yo‘q"</string>
+  <plurals name="screen_room_timeline_reaction_a11y">
+    <item quantity="one">"%1$d ta a’zo %2$s bilan munosabat bildirdi"</item>
+    <item quantity="other">"%1$d ta a’zo %2$s bilan munosabat bildirdi"</item>
+  </plurals>
+  <plurals name="screen_room_timeline_reaction_including_you_a11y">
+    <item quantity="one">"Siz va %1$d ta a’zo %2$s bilan munosabat bildirdi"</item>
+    <item quantity="other">"Siz va %1$d ta a’zo %2$s bilan munosabat bildirdi"</item>
+  </plurals>
+  <string name="screen_room_timeline_reaction_you_a11y">"%1$s bilan munosabat bildirdingiz"</string>
   <string name="screen_room_timeline_reactions_show_less">"Kamroq ko\'rsatish"</string>
   <string name="screen_room_timeline_reactions_show_more">"Ko\'proq ko\'rsatish"</string>
+  <string name="screen_room_timeline_reactions_show_reactions_summary">"Reaksiyalar xulosasini chiqarish"</string>
   <string name="screen_room_timeline_read_marker_title">"Yangi"</string>
   <plurals name="screen_room_timeline_state_changes">
     <item quantity="one">"%1$dxonani almashtirish"</item>
     <item quantity="other">"%1$dxona o\'zgarishi"</item>
   </plurals>
+  <string name="screen_room_timeline_tombstoned_room_action">"Yangi xonaga o‘tish"</string>
+  <string name="screen_room_timeline_tombstoned_room_message">"Bu room almashtirildi va endi faol emas"</string>
+  <string name="screen_room_timeline_upgraded_room_action">"Eski xabarlarni ko‘rish"</string>
+  <string name="screen_room_timeline_upgraded_room_message">"Bu xona boshqa xonaning davomi"</string>
   <plurals name="screen_room_typing_many_members">
     <item quantity="one">"%1$s, %2$s va %3$d boshqalar"</item>
     <item quantity="other">"%1$s, %2$s va %3$d boshqalar"</item>
diff --git a/features/poll/api/src/main/res/values-uz/translations.xml b/features/poll/api/src/main/res/values-uz/translations.xml
index 6e1a16a013..8446135f20 100644
--- a/features/poll/api/src/main/res/values-uz/translations.xml
+++ b/features/poll/api/src/main/res/values-uz/translations.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <plurals name="a11y_polls_percent_of_total">
+    <item quantity="one">"Jami ovozlarning %1$d foizi"</item>
+    <item quantity="other">"Jami ovozlarning %1$d foizi"</item>
+  </plurals>
   <string name="a11y_polls_will_remove_selection">"Oldingi tanlov olib tashlanadi"</string>
   <string name="a11y_polls_winning_answer">"Bu g\'alaba qozongan javob"</string>
 </resources>
diff --git a/features/poll/impl/src/main/res/values-uz/translations.xml b/features/poll/impl/src/main/res/values-uz/translations.xml
index 8ea1c4b827..28f496f3dd 100644
--- a/features/poll/impl/src/main/res/values-uz/translations.xml
+++ b/features/poll/impl/src/main/res/values-uz/translations.xml
@@ -5,6 +5,7 @@
   <string name="screen_create_poll_anonymous_headline">"Ovozlarni yashirish"</string>
   <string name="screen_create_poll_answer_hint">"Variant%1$d"</string>
   <string name="screen_create_poll_cancel_confirmation_content_android">"Oʻzgarishlar saqlanmadi. Haqiqatan ham orqaga qaytmoqchimisiz?"</string>
+  <string name="screen_create_poll_delete_option_a11y">"%1$s variantini o‘chirish"</string>
   <string name="screen_create_poll_question_desc">"Savol yoki mavzu"</string>
   <string name="screen_create_poll_question_hint">"So\'rovnoma nima haqida?"</string>
   <string name="screen_create_poll_title">"So‘rovnoma yaratish"</string>
diff --git a/features/preferences/impl/src/main/res/values-it/translations.xml b/features/preferences/impl/src/main/res/values-it/translations.xml
index 0a37b0d394..a10dcc9594 100644
--- a/features/preferences/impl/src/main/res/values-it/translations.xml
+++ b/features/preferences/impl/src/main/res/values-it/translations.xml
@@ -10,6 +10,7 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"URL non valido, assicurati di includere il protocollo (http/https) e l\'indirizzo corretto."</string>
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Nascondi gli avatar nelle richieste di invito alle stanze"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Nascondi le anteprime dei media nelle conversazioni"</string>
+  <string name="screen_advanced_settings_labs">"Labs"</string>
   <string name="screen_advanced_settings_media_compression_description">"Carica foto e video più velocemente e riduci l\'utilizzo dei dati"</string>
   <string name="screen_advanced_settings_media_compression_title">"Ottimizza la qualità dei contenuti multimediali"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderazione e Sicurezza"</string>
@@ -43,6 +44,11 @@
   <string name="screen_edit_profile_error_title">"Impossibile aggiornare il profilo"</string>
   <string name="screen_edit_profile_title">"Modifica profilo"</string>
   <string name="screen_edit_profile_updating_details">"Aggiornamento del profilo…"</string>
+  <string name="screen_labs_enable_threads">"Abilita le risposte alle discussioni"</string>
+  <string name="screen_labs_enable_threads_description">"L\'app si riavvierà per applicare questa modifica."</string>
+  <string name="screen_labs_header_description">"Prova le nostre ultime idee in fase di sviluppo. Queste funzionalità non sono definitive; potrebbero essere instabili e soggette a modifiche."</string>
+  <string name="screen_labs_header_title">"Hai voglia di sperimentare?"</string>
+  <string name="screen_labs_title">"Labs"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Impostazioni aggiuntive"</string>
   <string name="screen_notification_settings_calls_label">"Chiamate audio e video"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Mancata corrispondenza di configurazione"</string>
diff --git a/features/preferences/impl/src/main/res/values-pt-rBR/translations.xml b/features/preferences/impl/src/main/res/values-pt-rBR/translations.xml
index 5b3e75e7ec..f6e1bc90ba 100644
--- a/features/preferences/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/preferences/impl/src/main/res/values-pt-rBR/translations.xml
@@ -10,9 +10,17 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"URL inválida, por favor verifique se o protocolo (http/https) está incluso e o endereço correto."</string>
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Ocultar avatares em solicitações de convite para salas"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Ocultar pré-visualizações de mídia na linha do tempo"</string>
+  <string name="screen_advanced_settings_labs">"Experimentos"</string>
   <string name="screen_advanced_settings_media_compression_description">"Envie fotos e vídeos com mais rapidez e reduza o uso de dados"</string>
   <string name="screen_advanced_settings_media_compression_title">"Otimizar a qualidade da mídia"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderação e segurança"</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Otimizar automaticamente as imagens para envios mais rápidos e arquivos com tamanhos menores."</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Otimizar qualidade de envio de imagens"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s. Toque aqui para alterar."</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"Alta (1080p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"Baixa (480p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"Normal (720p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_title">"Qualidade de envio de vídeos"</string>
   <string name="screen_advanced_settings_push_provider_android">"Provedor de notificações push"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"Desative o editor de rich text para digitar Markdown manualmente."</string>
   <string name="screen_advanced_settings_send_read_receipts">"Confirmações de leitura"</string>
@@ -36,6 +44,11 @@
   <string name="screen_edit_profile_error_title">"Não foi possível atualizar o perfil"</string>
   <string name="screen_edit_profile_title">"Editar perfil"</string>
   <string name="screen_edit_profile_updating_details">"Atualizando o perfil…"</string>
+  <string name="screen_labs_enable_threads">"Ativar respostas de tópicos"</string>
+  <string name="screen_labs_enable_threads_description">"O app será reiniciado para aplicar esta mudança."</string>
+  <string name="screen_labs_header_description">"Teste as nossas mais novas ideias em desenvolvimento. Esses recursos não estão finalizados; podem estar instáveis, e podem mudar."</string>
+  <string name="screen_labs_header_title">"Se sentindo experimental?"</string>
+  <string name="screen_labs_title">"Experimentos"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Configurações adicionais"</string>
   <string name="screen_notification_settings_calls_label">"Chamadas de áudio e vídeo"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Não correspondência de configuração"</string>
diff --git a/features/preferences/impl/src/main/res/values-uz/translations.xml b/features/preferences/impl/src/main/res/values-uz/translations.xml
index b01bd11fbd..82e9b24e98 100644
--- a/features/preferences/impl/src/main/res/values-uz/translations.xml
+++ b/features/preferences/impl/src/main/res/values-uz/translations.xml
@@ -8,14 +8,29 @@
   <string name="screen_advanced_settings_element_call_base_url">"Maxsus element qo‘ng‘iroqlar bazasi URL manzili"</string>
   <string name="screen_advanced_settings_element_call_base_url_description">"Element qo\'ng\'irog\'iga maxsus asosiy url or\'natish"</string>
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"URL noto‘g‘ri, iltimos, protokol (http/https) va to‘g‘ri manzilni kiritganingizga ishonch hosil qiling."</string>
+  <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Xonaga taklif so‘rovlarida avatarlarni berkitish"</string>
+  <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Vaqt jadvalida mediaga razm solishlarni berkitish"</string>
   <string name="screen_advanced_settings_media_compression_description">"Rasm va videolarni tezroq yuklang va trafik sarfini kamaytiring"</string>
   <string name="screen_advanced_settings_media_compression_title">"Media sifatini yaxshilash"</string>
+  <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderatsiya va xavfsizlik"</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Tezroq yuklash va kichikroq fayl hajmi uchun rasmlarni avtomatik optimallashtirish."</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Rasm yuklash sifatini optimallashtirish"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s. Oʻzgartirish uchun bu yerga bosing."</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"Yuqori (1080p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"Past (480p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"Standart (720p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_title">"Video yuklash sifati"</string>
   <string name="screen_advanced_settings_push_provider_android">"Push bildirishnoma provayderi"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"Boy matn muharriri o\'chiring Markdown bilan qo\'lda yozish uchun"</string>
   <string name="screen_advanced_settings_send_read_receipts">"Kvitansiyalarni oʻqish"</string>
   <string name="screen_advanced_settings_send_read_receipts_description">"Agar oʻchirib qo‘yilsa, sizning oʻqilganlik bildirishnomangiz hech kimga yuborilmaydi. Siz boshqa foydalanuvchilardan oʻqilganlik bildirishnomalarini olishda davom etasiz."</string>
   <string name="screen_advanced_settings_share_presence">"Mavjudligini ulashish"</string>
   <string name="screen_advanced_settings_share_presence_description">"Agar oʻchirib qoʻyilsa, siz oʻqilganlik haqidagi bildirishnomalarni yoki yozayotganingiz haqidagi xabarlarni yubora olmaysiz va qabul qila olmaysiz."</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_hide">"Doim berkitilsin"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_show">"Har doim ko‘rsatish"</string>
+  <string name="screen_advanced_settings_show_media_timeline_private_rooms">"Shaxsiy xonalarda"</string>
+  <string name="screen_advanced_settings_show_media_timeline_subtitle">"Yashirin media har doim unga bosish orqali ko‘rsatilishi mumkin"</string>
+  <string name="screen_advanced_settings_show_media_timeline_title">"Vaqt jadvalida media ko‘rsatish"</string>
   <string name="screen_advanced_settings_view_source_description">"Xabar manbasini vaqt jadvalida ko‘rish imkoniyatini yoqing."</string>
   <string name="screen_blocked_users_empty">"Sizda bloklangan foydalanuvchi yo‘q"</string>
   <string name="screen_blocked_users_unblock_alert_action">"Blokdan chiqarish"</string>
@@ -55,6 +70,7 @@ Davom ettirsangiz, baʼzi sozlamalaringiz oʻzgarishi mumkin."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"tizim sozlamalari"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Tizim bildirishnomalari o\'chirilgan"</string>
   <string name="screen_notification_settings_title">"Bildirishnomalar"</string>
+  <string name="troubleshoot_notifications_entry_point_push_history_title">"Bildirishnoma tarixi"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Muammolarni bartaraf etish"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Bildirishnomalar bilan bog‘liq muammolarni bartaraf etish"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-zh/translations.xml b/features/preferences/impl/src/main/res/values-zh/translations.xml
index 7ac8952090..0c576b58b6 100644
--- a/features/preferences/impl/src/main/res/values-zh/translations.xml
+++ b/features/preferences/impl/src/main/res/values-zh/translations.xml
@@ -44,6 +44,10 @@
   <string name="screen_edit_profile_error_title">"无法更新个人资料"</string>
   <string name="screen_edit_profile_title">"编辑个人资料"</string>
   <string name="screen_edit_profile_updating_details">"更新个人资料……"</string>
+  <string name="screen_labs_enable_threads">"启用主题回复"</string>
+  <string name="screen_labs_enable_threads_description">"应用将重启以应用此更改。"</string>
+  <string name="screen_labs_header_description">"尝试我们最新的开发理念。这些功能尚未最终确定，可能不稳定，也可能会发生变化。"</string>
+  <string name="screen_labs_header_title">"想尝试新功能？"</string>
   <string name="screen_labs_title">"实验室"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"更多设置"</string>
   <string name="screen_notification_settings_calls_label">"音视频通话"</string>
diff --git a/features/rageshake/impl/src/main/res/values-it/translations.xml b/features/rageshake/impl/src/main/res/values-it/translations.xml
index 8709881709..31fb95f9f6 100644
--- a/features/rageshake/impl/src/main/res/values-it/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-it/translations.xml
@@ -14,5 +14,7 @@
   <string name="screen_bug_report_include_screenshot">"Invia istantanea schermo"</string>
   <string name="screen_bug_report_logs_description">"Per verificare che le cose funzionino come previsto, i log verranno inviati con il tuo messaggio. Per inviare solo il tuo messaggio, disattiva questa impostazione."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s si è chiuso inaspettatamente l\'ultima volta che è stato usato. Vuoi condividere con noi un rapporto sull\'arresto anomalo?"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Se riscontri problemi con le notifiche, caricare le regole per le notifiche push può aiutarci a individuare la causa principale. Tieni presente che queste regole possono contenere informazioni private, come il tuo nome visualizzato o le parole chiave per cui ricevere notifiche."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Invia impostazioni di notifica"</string>
   <string name="screen_bug_report_view_logs">"Visualizza i log"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/res/values-pt-rBR/translations.xml b/features/rageshake/impl/src/main/res/values-pt-rBR/translations.xml
index 046c1b30d7..7495d5946e 100644
--- a/features/rageshake/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-pt-rBR/translations.xml
@@ -14,5 +14,7 @@
   <string name="screen_bug_report_include_screenshot">"Enviar captura de tela"</string>
   <string name="screen_bug_report_logs_description">"Os registros serão incluídos com sua mensagem para garantir que tudo esteja funcionando corretamente. Para enviar sua mensagem sem registros, desative essa configuração."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s falhou inesperadamente na última vez que foi usado. Gostaria de compartilhar um relatório de falhas conosco?"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Se estiver enfrentando problemas com as notificações, enviar as regras de notificações push pode ajudar-nos a descobrir o que está errado. Observe que as regras podem conter informações privadas, como o seu nome de exibição ou palavras chaves de notificação."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Enviar configurações de notificação"</string>
   <string name="screen_bug_report_view_logs">"Ver registros"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/res/values-uz/translations.xml b/features/rageshake/impl/src/main/res/values-uz/translations.xml
index fbeb0d3271..e3aceaa7d6 100644
--- a/features/rageshake/impl/src/main/res/values-uz/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-uz/translations.xml
@@ -10,6 +10,7 @@
   <string name="screen_bug_report_error_description_too_short">"Tavsif juda qisqa, nima boʻlganligi haqida batafsilroq maʼlumot bering. Rahmat!"</string>
   <string name="screen_bug_report_include_crash_logs">"Buzilish jurnallarini yuboring"</string>
   <string name="screen_bug_report_include_logs">"Jurnallarga ruxsat bering"</string>
+  <string name="screen_bug_report_include_logs_error">"Sizning jurnallaringiz juda katta, shuning uchun bu hisobotga kiritilmaydi, iltimos ularni bizga boshqa usulda yuboring."</string>
   <string name="screen_bug_report_include_screenshot">"Ekran tasvirini yuboring"</string>
   <string name="screen_bug_report_logs_description">"Har bir narsa to\'ri ishlayotganiga ishonch hosil qilish uchun xabaringizga jurnallar kiritiladi. Xabarni jurnallarsiz yuborish uchun ushbu sozlamani oʻchiring."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$soxirgi marta ishlatilganda qulab tushdi. Biz bilan nosozlik hisobotini baham ko\'rmoqchimisiz?"</string>
diff --git a/features/reportroom/impl/src/main/res/values-uz/translations.xml b/features/reportroom/impl/src/main/res/values-uz/translations.xml
index b10ea22735..e7424ade8f 100644
--- a/features/reportroom/impl/src/main/res/values-uz/translations.xml
+++ b/features/reportroom/impl/src/main/res/values-uz/translations.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Hisobotingiz muvaffaqiyatli yuborildi, ammo xonadan chiqishda muammo yuzaga keldi. Iltimos, qaytadan urinib ko‘ring."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Xonani tark etish imkonsiz"</string>
+  <string name="screen_report_room_reason_footer">"Bu xona haqida administratoringizga xabar bering. Agar xabarlar shifrlangan bo‘lsa, administratoringiz ularni o‘qiy olmaydi."</string>
+  <string name="screen_report_room_reason_placeholder">"Xabar berish sababini tushuntiring…"</string>
   <string name="screen_report_room_title">"Xona ustidan shikoyat qilish"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
index 67e65142d8..3df8e0afbb 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_room_change_permissions_administrators">"Pouze správci"</string>
+  <string name="screen_room_change_permissions_administrators">"Správce"</string>
   <string name="screen_room_change_permissions_ban_people">"Vykázat lidi"</string>
   <string name="screen_room_change_permissions_delete_messages">"Odstranit zprávy"</string>
-  <string name="screen_room_change_permissions_invite_people">"Pozvěte lidi a přijímejte žádosti o připojení"</string>
+  <string name="screen_room_change_permissions_everyone">"Člen"</string>
+  <string name="screen_room_change_permissions_invite_people">"Pozvat přátele"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Spravovat členy"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Zprávy a obsah"</string>
-  <string name="screen_room_change_permissions_moderators">"Správci a moderátoři"</string>
-  <string name="screen_room_change_permissions_remove_people">"Odeberte lidi a odmítněte žádosti o připojení"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderátor"</string>
+  <string name="screen_room_change_permissions_remove_people">"Odebrat osoby"</string>
   <string name="screen_room_change_permissions_room_avatar">"Změnit avatar místnosti"</string>
-  <string name="screen_room_change_permissions_room_details">"Upravit místnost"</string>
+  <string name="screen_room_change_permissions_room_details">"Upravit podrobnosti"</string>
   <string name="screen_room_change_permissions_room_name">"Změnit název místnosti"</string>
   <string name="screen_room_change_permissions_room_topic">"Změnit téma místnosti"</string>
   <string name="screen_room_change_permissions_send_messages">"Odeslat zprávy"</string>
@@ -32,6 +34,13 @@
   <string name="screen_room_change_role_unsaved_changes_description">"Máte neuložené změny."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Uložit změny?"</string>
   <string name="screen_room_member_list_banned_empty">"V této místnosti nejsou žádní vykázaní uživatelé."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d vykázán(a)"</item>
+    <item quantity="few">"%1$d vykázáni"</item>
+    <item quantity="other">"%1$d vykázáných"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Zkontrolujte pravopis nebo zkuste nové vyhledávání"</string>
+  <string name="screen_room_member_list_empty_search_title">"Žádné výsledky pro “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d osoba"</item>
     <item quantity="few">"%1$d osoby"</item>
@@ -44,8 +53,14 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Zrušit vykázání z místnosti"</string>
   <string name="screen_room_member_list_mode_banned">"Vykázaní"</string>
   <string name="screen_room_member_list_mode_members">"Členové"</string>
-  <string name="screen_room_member_list_role_administrator">"Pouze správci"</string>
-  <string name="screen_room_member_list_role_moderator">"Správci a moderátoři"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d pozván(a)"</item>
+    <item quantity="few">"%1$d pozváni"</item>
+    <item quantity="other">"%1$d pozvaných"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Čekající"</string>
+  <string name="screen_room_member_list_role_administrator">"Správce"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_role_owner">"Vlastník"</string>
   <string name="screen_room_member_list_room_members_header_title">"Členové místnosti"</string>
   <string name="screen_room_member_list_unbanning_user">"Rušení vykázání %1$s"</string>
@@ -58,10 +73,12 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Zprávy a obsah"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderátoři"</string>
   <string name="screen_room_roles_and_permissions_owners">"Vlastníci"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Oprávnění"</string>
   <string name="screen_room_roles_and_permissions_reset">"Obnovit oprávnění"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Po obnovení oprávnění ztratíte aktuální nastavení."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Obnovit oprávnění?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Role"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Podrobnosti místnosti"</string>
-  <string name="screen_room_roles_and_permissions_title">"Role a oprávnění"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"Detaily prostoru"</string>
+  <string name="screen_room_roles_and_permissions_title">"Role a oprávnění"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
index 996b50bf62..c526d059bc 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
@@ -33,6 +33,10 @@
   <string name="screen_room_change_role_unsaved_changes_description">"تغییراتی ذخیره نشده دارید."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"ذخیرهٔ تغییرات؟"</string>
   <string name="screen_room_member_list_banned_empty">"هیچ کاربر محرومی در این اتاق نیست."</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"%1$d نفر"</item>
+    <item quantity="other">"%1$d نفر"</item>
+  </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"برداشت و تحریم عضو"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"تنها برداشتن عضو"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"رفع انسداد"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
index 658828ae41..1322089dc8 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_room_change_permissions_administrators">"Vain ylläpitäjät"</string>
+  <string name="screen_room_change_permissions_administrators">"Ylläpitäjä"</string>
   <string name="screen_room_change_permissions_ban_people">"Porttikieltojen antaminen"</string>
   <string name="screen_room_change_permissions_delete_messages">"Viestien poistaminen"</string>
+  <string name="screen_room_change_permissions_everyone">"Jäsen"</string>
   <string name="screen_room_change_permissions_invite_people">"Ihmisten kutsuminen ja liittymispyyntöjen hyväksyminen"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Jäsenien hallinta"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Viestit ja sisältö"</string>
-  <string name="screen_room_change_permissions_moderators">"Ylläpitäjät ja valvojat"</string>
+  <string name="screen_room_change_permissions_moderators">"Valvoja"</string>
   <string name="screen_room_change_permissions_remove_people">"Henkilöiden poistaminen ja liittymispyyntöjen hylkääminen"</string>
   <string name="screen_room_change_permissions_room_avatar">"Huoneen avatarin vaihtaminen"</string>
-  <string name="screen_room_change_permissions_room_details">"Muokkaa huonetta"</string>
+  <string name="screen_room_change_permissions_room_details">"Muokkaa tietoja"</string>
   <string name="screen_room_change_permissions_room_name">"Huoneen nimen vaihtaminen"</string>
   <string name="screen_room_change_permissions_room_topic">"Huoneen aiheen vaihtaminen"</string>
   <string name="screen_room_change_permissions_send_messages">"Viestien lähettäminen"</string>
@@ -31,7 +33,7 @@
   <string name="screen_room_change_role_section_users">"Jäsenet"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Sinulla on tallentamattomia muutoksia"</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Tallennetaanko muutokset?"</string>
-  <string name="screen_room_member_list_banned_empty">"Tässä huoneessa ei ole porttikieltoja"</string>
+  <string name="screen_room_member_list_banned_empty">"Porttikiellettyjä käyttäjiä ei ole."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d henkilö"</item>
     <item quantity="other">"%1$d henkilöä"</item>
@@ -43,8 +45,8 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Poista porttikielto huoneesta"</string>
   <string name="screen_room_member_list_mode_banned">"Porttikiellot"</string>
   <string name="screen_room_member_list_mode_members">"Jäsenet"</string>
-  <string name="screen_room_member_list_role_administrator">"Vain ylläpitäjät"</string>
-  <string name="screen_room_member_list_role_moderator">"Ylläpitäjät ja valvojat"</string>
+  <string name="screen_room_member_list_role_administrator">"Ylläpitäjä"</string>
+  <string name="screen_room_member_list_role_moderator">"Valvoja"</string>
   <string name="screen_room_member_list_role_owner">"Omistaja"</string>
   <string name="screen_room_member_list_room_members_header_title">"Huoneen jäsenet"</string>
   <string name="screen_room_member_list_unbanning_user">"Poistetaan käyttäjän %1$s porttikieltoa"</string>
@@ -57,10 +59,12 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Viestit ja sisältö"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Valvojat"</string>
   <string name="screen_room_roles_and_permissions_owners">"Omistajat"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Oikeudet"</string>
   <string name="screen_room_roles_and_permissions_reset">"Nollaa oikeudet"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Kun nollaat käyttöoikeudet, menetät nykyiset asetukset."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Nollataanko oikeudet?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Roolit"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Huoneen tiedot"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"Tilan tiedot"</string>
   <string name="screen_room_roles_and_permissions_title">"Roolit ja oikeudet"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
index 36add59a2d..f44072366d 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
@@ -34,9 +34,15 @@
   <string name="screen_room_change_role_unsaved_changes_description">"Vous avez des modifications non-enregistrées."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Enregistrer les changements ?"</string>
   <string name="screen_room_member_list_banned_empty">"Il n’y a pas d’utilisateur banni."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Banni(e)"</item>
+    <item quantity="other">"%1$d Banni(e)s"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Vérifiez la saisie ou effectuez une nouvelle recherche"</string>
+  <string name="screen_room_member_list_empty_search_title">"Aucun résultat pour «%1$s»"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d personne"</item>
-    <item quantity="other">"%1$d personnes"</item>
+    <item quantity="one">"%1$d Personne"</item>
+    <item quantity="other">"%1$d Personnes"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Bannir du salon"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Retirer le membre uniquement"</string>
@@ -45,6 +51,11 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Débannir du salon"</string>
   <string name="screen_room_member_list_mode_banned">"Bannis"</string>
   <string name="screen_room_member_list_mode_members">"Membres"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invité(e)"</item>
+    <item quantity="other">"%1$d Invité(e)s"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"En attente"</string>
   <string name="screen_room_member_list_role_administrator">"Administrateurs"</string>
   <string name="screen_room_member_list_role_moderator">"Modérateurs"</string>
   <string name="screen_room_member_list_role_owner">"Propriétaire"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
index 6b11b7946b..2b439a6c61 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_room_change_permissions_administrators">"Solo amministratori"</string>
+  <string name="screen_room_change_permissions_administrators">"Amministratore"</string>
   <string name="screen_room_change_permissions_ban_people">"Escludi membri"</string>
   <string name="screen_room_change_permissions_delete_messages">"Rimuovi messaggi"</string>
-  <string name="screen_room_change_permissions_invite_people">"Invita persone e accetta richieste di partecipazione"</string>
+  <string name="screen_room_change_permissions_everyone">"Membro"</string>
+  <string name="screen_room_change_permissions_invite_people">"Invita persone"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Gestisci membri"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Messaggi e contenuti"</string>
-  <string name="screen_room_change_permissions_moderators">"Amministratori e moderatori"</string>
-  <string name="screen_room_change_permissions_remove_people">"Rimuovi le persone e rifiuta le richieste di partecipazione"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderatore"</string>
+  <string name="screen_room_change_permissions_remove_people">"Rimuovi membri"</string>
   <string name="screen_room_change_permissions_room_avatar">"Cambia avatar della stanza"</string>
-  <string name="screen_room_change_permissions_room_details">"Modifica stanza"</string>
+  <string name="screen_room_change_permissions_room_details">"Modifica dettagli"</string>
   <string name="screen_room_change_permissions_room_name">"Cambia il nome della stanza"</string>
   <string name="screen_room_change_permissions_room_topic">"Cambiare l\'argomento della stanza"</string>
   <string name="screen_room_change_permissions_send_messages">"Inviare messaggi"</string>
@@ -31,10 +33,16 @@
   <string name="screen_room_change_role_section_users">"Membri"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Hai delle modifiche non salvate."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Salvare le modifiche?"</string>
-  <string name="screen_room_member_list_banned_empty">"Non ci sono utenti esclusi in questa stanza."</string>
+  <string name="screen_room_member_list_banned_empty">"Non ci sono utenti bannati."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Bannato"</item>
+    <item quantity="other">"%1$d Bannati"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Controlla l\'ortografia o prova una nuova ricerca"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nessun risultato per “%1$s ”"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d persona"</item>
-    <item quantity="other">"%1$d persone"</item>
+    <item quantity="one">"%1$d Persona"</item>
+    <item quantity="other">"%1$d Persone"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Rimuovi ed escludi"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Rimuovi soltanto"</string>
@@ -43,8 +51,13 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Riammetti nella stanza"</string>
   <string name="screen_room_member_list_mode_banned">"Esclusi"</string>
   <string name="screen_room_member_list_mode_members">"Membri"</string>
-  <string name="screen_room_member_list_role_administrator">"Solo amministratori"</string>
-  <string name="screen_room_member_list_role_moderator">"Amministratori e moderatori"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invitato"</item>
+    <item quantity="other">"%1$d Invitati"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"In attesa"</string>
+  <string name="screen_room_member_list_role_administrator">"Amministratore"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderatore"</string>
   <string name="screen_room_member_list_role_owner">"Proprietario"</string>
   <string name="screen_room_member_list_room_members_header_title">"Membri della stanza"</string>
   <string name="screen_room_member_list_unbanning_user">"Riammissione di %1$s"</string>
@@ -57,10 +70,12 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Messaggi e contenuti"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatori"</string>
   <string name="screen_room_roles_and_permissions_owners">"Proprietari"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Autorizzazioni"</string>
   <string name="screen_room_roles_and_permissions_reset">"Reimpostare le autorizzazioni"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Una volta reimpostate le autorizzazioni, perderai le impostazioni correnti."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Reimpostare autorizzazioni?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Ruoli"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Dettagli della stanza"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"Dettagli dello spazio"</string>
   <string name="screen_room_roles_and_permissions_title">"Ruoli e autorizzazioni"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-pt-rBR/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-pt-rBR/translations.xml
index ec2e5bc558..886d3c541d 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-pt-rBR/translations.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_room_change_permissions_administrators">"Somente administradores"</string>
+  <string name="screen_room_change_permissions_administrators">"Administradores"</string>
   <string name="screen_room_change_permissions_ban_people">"Banir pessoas"</string>
   <string name="screen_room_change_permissions_delete_messages">"Remover mensagens"</string>
-  <string name="screen_room_change_permissions_invite_people">"Convide pessoas e aceite solicitações de entrada"</string>
+  <string name="screen_room_change_permissions_everyone">"Membro"</string>
+  <string name="screen_room_change_permissions_invite_people">"Convidar pessoas"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Gerenciar membros"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mensagens e conteúdo"</string>
-  <string name="screen_room_change_permissions_moderators">"Administradores e moderadores"</string>
-  <string name="screen_room_change_permissions_remove_people">"Remover pessoas e recusar solicitações de entrada"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderador"</string>
+  <string name="screen_room_change_permissions_remove_people">"Remover pessoas"</string>
   <string name="screen_room_change_permissions_room_avatar">"Alterar avatar da sala"</string>
-  <string name="screen_room_change_permissions_room_details">"Editar sala"</string>
+  <string name="screen_room_change_permissions_room_details">"Editar detalhes"</string>
   <string name="screen_room_change_permissions_room_name">"Alterar nome da sala"</string>
   <string name="screen_room_change_permissions_room_topic">"Alterar tópico da sala"</string>
   <string name="screen_room_change_permissions_send_messages">"Enviar mensagens"</string>
@@ -31,7 +33,13 @@
   <string name="screen_room_change_role_section_users">"Membros"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Você tem alterações não salvas."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Salvar alterações?"</string>
-  <string name="screen_room_member_list_banned_empty">"Não há usuários banidos nesta sala."</string>
+  <string name="screen_room_member_list_banned_empty">"Não há usuários banidos."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d banido"</item>
+    <item quantity="other">"%1$d banidos"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Confira a ortografia ou tente uma nova busca"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nenhum resultado para “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d pessoa"</item>
     <item quantity="other">"%1$d pessoas"</item>
@@ -43,8 +51,13 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Desbanir da sala"</string>
   <string name="screen_room_member_list_mode_banned">"Banidos"</string>
   <string name="screen_room_member_list_mode_members">"Membros"</string>
-  <string name="screen_room_member_list_role_administrator">"Somente administradores"</string>
-  <string name="screen_room_member_list_role_moderator">"Administradores e moderadores"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d convidado"</item>
+    <item quantity="other">"%1$d convidados"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Pendente"</string>
+  <string name="screen_room_member_list_role_administrator">"Administradores"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderador"</string>
   <string name="screen_room_member_list_role_owner">"Proprietário"</string>
   <string name="screen_room_member_list_room_members_header_title">"Membros da sala"</string>
   <string name="screen_room_member_list_unbanning_user">"Desbanindo %1$s"</string>
@@ -57,10 +70,12 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Mensagens e conteúdo"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderadores"</string>
   <string name="screen_room_roles_and_permissions_owners">"Proprietários"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Permissões"</string>
   <string name="screen_room_roles_and_permissions_reset">"Redefinir permissões"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Depois de redefinir as permissões, você perderá as configurações atuais."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Redefinir permissões?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Cargos"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Detalhes da sala"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"Detalhes do espaço"</string>
   <string name="screen_room_roles_and_permissions_title">"Cargos e permissões"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
index 61329b8577..f56210a29a 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
@@ -15,13 +15,17 @@
   <string name="screen_room_change_role_administrators_title">"Administratorlarni tahrirlash"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Bu amalni bekor qila olmaysiz. Siz foydalanuvchini o‘zingiz bilan bir xil quvvat darajasiga ega bo‘lishga undayapsiz."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Admin qo‘shilsinmi?"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"Bu amalni bekor qila olmaysiz. Siz egalikni tanlangan foydalanuvchilarga o‘tkazmoqdasiz. Tark etsangiz, bu doimiy bo‘ladi."</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"Egalik huquqini o‘tkazasizmi?"</string>
   <string name="screen_room_change_role_confirm_demote_self_action">"Pastga tushirish"</string>
   <string name="screen_room_change_role_confirm_demote_self_description">"Siz oʻzingizni imtiyozlardan mahrum qilayotganingiz sababli, bu o‘zgarishni bekor qila olmaysiz. Agar xonadagi so‘nggi imtiyozli foydalanuvchi bo‘lsangiz, imtiyozlarni qayta tiklash imkonsiz bo‘ladi."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"O‘z darajangizni pasaytirmoqchimisiz?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (Jarayonda)"</string>
   <string name="screen_room_change_role_invited_member_name_android">"(Kutilmoqda)"</string>
   <string name="screen_room_change_role_moderators_admin_section_footer">"Administratorlar avtomatik ravishda moderator imtiyozlariga ega"</string>
+  <string name="screen_room_change_role_moderators_owner_section_footer">"Egalar avtomatik ravishda administrator huquqlariga ega."</string>
   <string name="screen_room_change_role_moderators_title">"Moderatorlarni tahrirlash"</string>
+  <string name="screen_room_change_role_owners_title">"Egalarni tanlang"</string>
   <string name="screen_room_change_role_section_administrators">"Adminlar"</string>
   <string name="screen_room_change_role_section_moderators">"Moderatorlar"</string>
   <string name="screen_room_change_role_section_users">"Azolar"</string>
@@ -36,19 +40,23 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Faqat aʻzoni olib tashlash"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Taqiqni bekor qilish"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Agar taklif qilinsa, ular bu xonaga qayta qo‘shilishlari mumkin."</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Xonadan taqiqni olib tashlash"</string>
   <string name="screen_room_member_list_mode_banned">"Taqiqlangan"</string>
   <string name="screen_room_member_list_mode_members">"Azolar"</string>
   <string name="screen_room_member_list_role_administrator">"Faqat adminlar"</string>
   <string name="screen_room_member_list_role_moderator">"Adminlar va moderatorlar"</string>
+  <string name="screen_room_member_list_role_owner">"Egasi"</string>
   <string name="screen_room_member_list_room_members_header_title">"Xona a\'zolari"</string>
   <string name="screen_room_member_list_unbanning_user">"Taqiqni bekor qilish %1$s"</string>
   <string name="screen_room_roles_and_permissions_admins">"Adminlar"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"Adminlar va egalari"</string>
   <string name="screen_room_roles_and_permissions_change_my_role">"Rolimni o‘zgartirish"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Aʼzolikka tushirish"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Moderatorga pasaytirish"</string>
   <string name="screen_room_roles_and_permissions_member_moderation">"Aʻzo moderatsiyasi"</string>
   <string name="screen_room_roles_and_permissions_messages_and_content">"Xabarlar va kontent"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatorlar"</string>
+  <string name="screen_room_roles_and_permissions_owners">"Egalari"</string>
   <string name="screen_room_roles_and_permissions_reset">"Ruxsatlarni tiklash"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Ruxsatlarni asliga qaytargach, joriy sozlamalarni yoʻqotasiz."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Ruxsatlar asliga qaytarilsinmi?"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
index 3a11398599..d2882d8ab4 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
@@ -31,7 +31,7 @@
   <string name="screen_room_change_role_section_users">"成员"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"您有未保存的更改。"</string>
   <string name="screen_room_change_role_unsaved_changes_title">"保存更改？"</string>
-  <string name="screen_room_member_list_banned_empty">"此聊天室里没有被封禁的用户。"</string>
+  <string name="screen_room_member_list_banned_empty">"没有被封禁的用户。"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="other">"%1$d 人"</item>
   </plurals>
@@ -61,5 +61,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"重置权限？"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"角色"</string>
   <string name="screen_room_roles_and_permissions_room_details">"聊天室详情"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"空间详情"</string>
   <string name="screen_room_roles_and_permissions_title">"角色与权限"</string>
 </resources>
diff --git a/features/roomaliasresolver/impl/src/main/res/values-uz/translations.xml b/features/roomaliasresolver/impl/src/main/res/values-uz/translations.xml
index 0499fed4f5..d79cdadcc2 100644
--- a/features/roomaliasresolver/impl/src/main/res/values-uz/translations.xml
+++ b/features/roomaliasresolver/impl/src/main/res/values-uz/translations.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_loading_alert_title">"Biz bu xonani oldindan ko‘rishni ko‘rsata olmadik "</string>
   <string name="screen_room_alias_resolver_resolve_alias_failure">"Xona taxalluslari yechilmadi."</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-bg/translations.xml b/features/roomdetails/impl/src/main/res/values-bg/translations.xml
index e23ba71ff0..4ea6d24af6 100644
--- a/features/roomdetails/impl/src/main/res/values-bg/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-bg/translations.xml
@@ -90,8 +90,8 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Хората могат да се присъединят само ако са поканени"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Само с покана"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Достъп до стаята"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Пространствата в момента не се поддържат"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Членове на пространството"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Пространствата в момента не се поддържат"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Видима в директорията на обществените стаи"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Всеки"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Кой може да чете историята"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-cs/translations.xml b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
index 6e1214eea0..fc19bf400e 100644
--- a/features/roomdetails/impl/src/main/res/values-cs/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Aby byla místnost v adresáři viditelná, je třeba zadat její adresu."</string>
-  <string name="screen_edit_room_address_title">"Adresa místnosti"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Budete potřebovat adresu místnosti, aby byla viditelná v adresáři místností."</string>
+  <string name="screen_edit_room_address_title">"Upravit adresu"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Při aktualizaci nastavení oznámení došlo k chybě."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Váš domovský server tuto možnost v zašifrovaných místnostech nepodporuje, v některých místnostech nemusíte být upozorněni."</string>
   <string name="screen_polls_history_title">"Hlasování"</string>
-  <string name="screen_room_change_permissions_administrators">"Pouze správci"</string>
+  <string name="screen_room_change_permissions_administrators">"Správce"</string>
   <string name="screen_room_change_permissions_ban_people">"Vykázat lidi"</string>
   <string name="screen_room_change_permissions_delete_messages">"Odstranit zprávy"</string>
-  <string name="screen_room_change_permissions_invite_people">"Pozvěte lidi a přijímejte žádosti o připojení"</string>
+  <string name="screen_room_change_permissions_everyone">"Člen"</string>
+  <string name="screen_room_change_permissions_invite_people">"Pozvat přátele"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Spravovat členy"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Zprávy a obsah"</string>
-  <string name="screen_room_change_permissions_moderators">"Správci a moderátoři"</string>
-  <string name="screen_room_change_permissions_remove_people">"Odeberte lidi a odmítněte žádosti o připojení"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderátor"</string>
+  <string name="screen_room_change_permissions_remove_people">"Odebrat osoby"</string>
   <string name="screen_room_change_permissions_room_avatar">"Změnit avatar místnosti"</string>
-  <string name="screen_room_change_permissions_room_details">"Upravit místnost"</string>
+  <string name="screen_room_change_permissions_room_details">"Upravit podrobnosti"</string>
   <string name="screen_room_change_permissions_room_name">"Změnit název místnosti"</string>
   <string name="screen_room_change_permissions_room_topic">"Změnit téma místnosti"</string>
   <string name="screen_room_change_permissions_send_messages">"Odeslat zprávy"</string>
@@ -40,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Šifrováno"</string>
   <string name="screen_room_details_badge_not_encrypted">"Není šifrováno"</string>
   <string name="screen_room_details_badge_public">"Veřejná místnost"</string>
-  <string name="screen_room_details_edit_room_title">"Upravit místnost"</string>
+  <string name="screen_room_details_edit_room_title">"Upravit podrobnosti"</string>
   <string name="screen_room_details_edition_error">"Došlo k neznámé chybě a informace nebylo možné změnit."</string>
   <string name="screen_room_details_edition_error_title">"Nelze aktualizovat místnost"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Zprávy jsou zabezpečeny zámky. Pouze vy a příjemci máte jedinečné klíče k jejich odemčení."</string>
@@ -60,7 +62,7 @@
   <string name="screen_room_details_pinned_events_row_title">"Připnuté zprávy"</string>
   <string name="screen_room_details_profile_row_title">"Profil"</string>
   <string name="screen_room_details_requests_to_join_title">"Žádosti o vstup"</string>
-  <string name="screen_room_details_roles_and_permissions">"Role a oprávnění"</string>
+  <string name="screen_room_details_roles_and_permissions">"Role a oprávnění"</string>
   <string name="screen_room_details_room_name_label">"Název místnosti"</string>
   <string name="screen_room_details_security_and_privacy_title">"Zabezpečení a soukromí"</string>
   <string name="screen_room_details_security_title">"Zabezpečení"</string>
@@ -69,6 +71,13 @@
   <string name="screen_room_details_topic_title">"Téma"</string>
   <string name="screen_room_details_updating_room">"Aktualizace místnosti…"</string>
   <string name="screen_room_member_list_banned_empty">"V této místnosti nejsou žádní vykázaní uživatelé."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d vykázán(a)"</item>
+    <item quantity="few">"%1$d vykázáni"</item>
+    <item quantity="other">"%1$d vykázáných"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Zkontrolujte pravopis nebo zkuste nové vyhledávání"</string>
+  <string name="screen_room_member_list_empty_search_title">"Žádné výsledky pro “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d osoba"</item>
     <item quantity="few">"%1$d osoby"</item>
@@ -81,8 +90,14 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Zrušit vykázání z místnosti"</string>
   <string name="screen_room_member_list_mode_banned">"Vykázaní"</string>
   <string name="screen_room_member_list_mode_members">"Členové"</string>
-  <string name="screen_room_member_list_role_administrator">"Pouze správci"</string>
-  <string name="screen_room_member_list_role_moderator">"Správci a moderátoři"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d pozván(a)"</item>
+    <item quantity="few">"%1$d pozváni"</item>
+    <item quantity="other">"%1$d pozvaných"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Čekající"</string>
+  <string name="screen_room_member_list_role_administrator">"Správce"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_role_owner">"Vlastník"</string>
   <string name="screen_room_member_list_room_members_header_title">"Členové místnosti"</string>
   <string name="screen_room_member_list_unbanning_user">"Rušení vykázání %1$s"</string>
@@ -109,14 +124,15 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Zprávy a obsah"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderátoři"</string>
   <string name="screen_room_roles_and_permissions_owners">"Vlastníci"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Oprávnění"</string>
   <string name="screen_room_roles_and_permissions_reset">"Obnovit oprávnění"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Po obnovení oprávnění ztratíte aktuální nastavení."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Obnovit oprávnění?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Role"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Podrobnosti místnosti"</string>
-  <string name="screen_room_roles_and_permissions_title">"Role a oprávnění"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Přidat adresu místnosti"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kdokoli může požádat o vstup do místnosti, ale správce nebo moderátor bude muset žádost přijmout."</string>
+  <string name="screen_room_roles_and_permissions_title">"Role a oprávnění"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Přidat adresu"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Všichni musí požádat o přístup."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Požádat o připojení"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ano, povolit šifrování"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po aktivaci nelze šifrování místnosti deaktivovat. Historie zpráv bude viditelná pouze pro členy místnosti od doby, kdy byli pozváni nebo od té doby, co do místnosti vstoupili.
@@ -126,17 +142,21 @@ Nedoporučujeme povolovat šifrování pro místnosti, které může kdokoli naj
   <string name="screen_security_and_privacy_encryption_section_footer">"Jakmile je povoleno, šifrování nelze zakázat."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Šifrování"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Povolit koncové šifrování"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Každý může najít a vstoupit"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Vstoupit může kdokoli."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kdokoliv"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Lidé mohou vstoupit, pouze pokud jsou pozváni"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Vyberte, kteří členové prostorů se k této místnosti mohou připojit bez pozvánky. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vstoupit mohou pouze pozvaní lidé."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Pouze pro zvané"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Přístup do místnosti"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Prostory nejsou aktuálně podporovány"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Přístup"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Vstoupit může kdokoli z autorizovaných prostorů."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Vstoupit může kdokoli v %1$s."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Členové prostoru"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Aby byla místnost v adresáři viditelná, je třeba zadat její adresu."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Adresa místnosti"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Prostory nejsou aktuálně podporovány"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Budete potřebovat adresu místnosti, aby byla viditelná v adresáři místností."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresa"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Umožněte nalezení této místnosti prohledáním adresáře veřejných místností na %1$s"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditelné v adresáři veřejných místností"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Umožnit nalezení vyhledáváním ve veřejném adresáři."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditelné ve veřejném adresáři"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kdokoliv"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kdo může číst historii"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Pouze členové od té doby, co byli pozváni"</string>
@@ -144,6 +164,7 @@ Nedoporučujeme povolovat šifrování pro místnosti, které může kdokoli naj
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy místností představují způsoby, jak najít místnosti a získat k nim přístup. Díky tomu můžete svoji místnost snadno sdílet s ostatními.
 Můžete se rozhodnout publikovat svou místnost ve veřejném adresáři místnosti vašeho domovského serveru."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publikování místnosti"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditelnost místnosti"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy slouží k vyhledávání a přístupu do místností a prostorů. Díky tomu je také můžete snadno sdílet s ostatními."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditelnost"</string>
   <string name="screen_security_and_privacy_title">"Zabezpečení a soukromí"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-cy/translations.xml b/features/roomdetails/impl/src/main/res/values-cy/translations.xml
index 0a3c05285a..97d39509fa 100644
--- a/features/roomdetails/impl/src/main/res/values-cy/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cy/translations.xml
@@ -136,8 +136,8 @@ Nid ydym yn argymell galluogi amgryptio ar gyfer ystafelloedd y gall unrhyw un d
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Dim ond os cawn nhw wahoddiad gall pobl ymuno"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Gwahoddiad yn unig"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Mynediad ystafell"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Nid yw gofodau\'n cael eu cefnogi ar hyn o bryd"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Aelodau gofod"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Nid yw gofodau\'n cael eu cefnogi ar hyn o bryd"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch i\'w wneud yn weladwy yn y cyfeiriadur."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Cyfeiriad yr ystafell"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Caniatáu i\'r ystafell hon gael ei chanfod trwy chwilio cyfeiriadur ystafelloedd cyhoeddus %1$s"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-da/translations.xml b/features/roomdetails/impl/src/main/res/values-da/translations.xml
index 63a20e51ec..c2ed3caaca 100644
--- a/features/roomdetails/impl/src/main/res/values-da/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-da/translations.xml
@@ -130,8 +130,8 @@ Vi anbefaler ikke at aktivere kryptering for rum, som alle kan finde og deltage
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Andre kan kun deltage, hvis de bliver inviteret"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun med invitation"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Adgang til rummet"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Grupper understøttes ikke i øjeblikket"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer af gruppen"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Grupper understøttes ikke i øjeblikket"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Du skal bruge en rum-adresse for at gøre den synlig i kataloget."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillad, at dette rum kan findes ved at søge i %1$s fortegnelse over offentlige rum"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i det offentlige register over rum"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-de/translations.xml b/features/roomdetails/impl/src/main/res/values-de/translations.xml
index ec71ebc015..89ef69c173 100644
--- a/features/roomdetails/impl/src/main/res/values-de/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-de/translations.xml
@@ -130,8 +130,8 @@ Wir empfehlen keine Verschlüsselung für Chats zu aktivieren, die jeder finden
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Personen können nur beitreten, wenn sie eingeladen werden."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Nur auf Einladung"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Chat Zugang"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spaces werden zur Zeit nicht unterstützt."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Spacemitglieder"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spaces werden zur Zeit nicht unterstützt."</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Du benötigst eine Chat-Adresse, um den Chat im Verzeichnis sichtbar zu machen."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Chatroomadresse"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Erlaube das Auffinden dieses Chats durch Suche im öffentlichen Verzeichnis von %1$s"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-el/translations.xml b/features/roomdetails/impl/src/main/res/values-el/translations.xml
index 0eadb5f775..a2deb1c706 100644
--- a/features/roomdetails/impl/src/main/res/values-el/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-el/translations.xml
@@ -121,8 +121,8 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Τα άτομα μπορούν να συμμετάσχουν μόνο εάν έχουν προσκληθεί"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Μόνο πρόσκληση"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Πρόσβαση στην αίθουσα"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Οι χώροι δεν υποστηρίζονται προς το παρόν"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Μέλη χώρου"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Οι χώροι δεν υποστηρίζονται προς το παρόν"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Θα χρειαστείτε μια διεύθυνση αίθουσας για να την κάνετε ορατή στον κατάλογο."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Επιστρέψτε την εύρεση αυτής της αίθουσας με αναζήτηση στον κατάλογο %1$s δημοσίων αιθουσών"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Ορατή στον κατάλογο δημόσιων αιθουσών"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-es/translations.xml b/features/roomdetails/impl/src/main/res/values-es/translations.xml
index d58ddcd598..c179a4d16e 100644
--- a/features/roomdetails/impl/src/main/res/values-es/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-es/translations.xml
@@ -121,8 +121,8 @@ No recomendamos habilitar el cifrado para las salas que cualquiera pueda encontr
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Las personas solo pueden unirse si están invitadas"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Solo por invitación"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Acceso a la sala"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"No se admiten los espacios por el momento."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Miembros del espacio"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"No se admiten los espacios por el momento."</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Necesitarás una dirección de sala para que sea visible en el directorio."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permite encontrar esta sala buscando en el directorio de salas públicas de %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible en el directorio de salas públicas"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-et/translations.xml b/features/roomdetails/impl/src/main/res/values-et/translations.xml
index 331bce4ba5..7a315de168 100644
--- a/features/roomdetails/impl/src/main/res/values-et/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-et/translations.xml
@@ -136,8 +136,8 @@ Me ei soovita krüptimise kasutamist selliste avalike jututubade puhul, millega
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Liituda saab vaid kutse olemasolul"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vaid kutsega"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Ligipääs"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Kogukondade tugi veel puudub"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Kogukonna liikmed"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Kogukondade tugi veel puudub"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade avalikus kataloogis, vajab ta aadressi."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Aadress"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Võimalda leida seda jututuba avalikust kataloogist otsides „%1$s“"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-eu/translations.xml b/features/roomdetails/impl/src/main/res/values-eu/translations.xml
index 89a77bd4c8..5d0f61fb40 100644
--- a/features/roomdetails/impl/src/main/res/values-eu/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-eu/translations.xml
@@ -108,8 +108,8 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Gonbidatutako pertsonak bakarrik sartu ahal izango dira"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Gonbidapen bidez"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Gelarako sarbidea"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Gaur-gaurkoz ez da guneekin bateragarria"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Guneko kideak"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Gaur-gaurkoz ez da guneekin bateragarria"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Gelaren helbidea"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Gela publikoen direktorioan ikusgai"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Edonork"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-fa/translations.xml b/features/roomdetails/impl/src/main/res/values-fa/translations.xml
index 3243eff70f..c04650417c 100644
--- a/features/roomdetails/impl/src/main/res/values-fa/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fa/translations.xml
@@ -69,6 +69,10 @@
   <string name="screen_room_details_topic_title">"موضوع"</string>
   <string name="screen_room_details_updating_room">"به‌روز کردن اتاق…"</string>
   <string name="screen_room_member_list_banned_empty">"هیچ کاربر محرومی در این اتاق نیست."</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"%1$d نفر"</item>
+    <item quantity="other">"%1$d نفر"</item>
+  </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"برداشت و تحریم عضو"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"تنها برداشتن عضو"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"رفع انسداد"</string>
@@ -120,8 +124,8 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"افراد فقط در صورت دعوت می‌توانند بپیوندند"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"فقط دعوتی"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"دسترسی اتاق"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"در حال حاضر فضاها پشتیبانی نمی‌شوند"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"اعضای فضا"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"در حال حاضر فضاها پشتیبانی نمی‌شوند"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"نشانی اتاق"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"هرکسی"</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"انتشار اتاق"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-fi/translations.xml b/features/roomdetails/impl/src/main/res/values-fi/translations.xml
index f1cf00453a..b696660b62 100644
--- a/features/roomdetails/impl/src/main/res/values-fi/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fi/translations.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Tarvitset huoneen osoitteen, jotta se näkyy hakemistossa."</string>
-  <string name="screen_edit_room_address_title">"Huoneen osoite"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Tarvitset osoitteen, jotta se näkyy julkisessa hakemistossa."</string>
+  <string name="screen_edit_room_address_title">"Muokkaa osoitetta"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Ilmoitusasetusten muokkaamisessa tapahtui virhe."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Kotipalvelimesi ei tue tätä vaihtoehtoa salatuissa huoneissa, joten et ehkä saa ilmoitusta joissakin huoneissa."</string>
   <string name="screen_polls_history_title">"Kyselyt"</string>
-  <string name="screen_room_change_permissions_administrators">"Vain ylläpitäjät"</string>
+  <string name="screen_room_change_permissions_administrators">"Ylläpitäjä"</string>
   <string name="screen_room_change_permissions_ban_people">"Porttikieltojen antaminen"</string>
   <string name="screen_room_change_permissions_delete_messages">"Viestien poistaminen"</string>
+  <string name="screen_room_change_permissions_everyone">"Jäsen"</string>
   <string name="screen_room_change_permissions_invite_people">"Ihmisten kutsuminen ja liittymispyyntöjen hyväksyminen"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Jäsenien hallinta"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Viestit ja sisältö"</string>
-  <string name="screen_room_change_permissions_moderators">"Ylläpitäjät ja valvojat"</string>
+  <string name="screen_room_change_permissions_moderators">"Valvoja"</string>
   <string name="screen_room_change_permissions_remove_people">"Henkilöiden poistaminen ja liittymispyyntöjen hylkääminen"</string>
   <string name="screen_room_change_permissions_room_avatar">"Huoneen avatarin vaihtaminen"</string>
-  <string name="screen_room_change_permissions_room_details">"Muokkaa huonetta"</string>
+  <string name="screen_room_change_permissions_room_details">"Muokkaa tietoja"</string>
   <string name="screen_room_change_permissions_room_name">"Huoneen nimen vaihtaminen"</string>
   <string name="screen_room_change_permissions_room_topic">"Huoneen aiheen vaihtaminen"</string>
   <string name="screen_room_change_permissions_send_messages">"Viestien lähettäminen"</string>
@@ -40,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Salattu"</string>
   <string name="screen_room_details_badge_not_encrypted">"Ei salattu"</string>
   <string name="screen_room_details_badge_public">"Julkinen huone"</string>
-  <string name="screen_room_details_edit_room_title">"Muokkaa huonetta"</string>
+  <string name="screen_room_details_edit_room_title">"Muokkaa tietoja"</string>
   <string name="screen_room_details_edition_error">"Tuntematon virhe tapahtui, eikä tietoja voitu muuttaa."</string>
   <string name="screen_room_details_edition_error_title">"Huoneen muokkaaminen ei onnistunut"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Viestisi suojataan lukoilla. Vain sinulla ja viesiten vastaanottajilla on uniikit avaimet niiden avaamiseen."</string>
@@ -50,7 +52,7 @@
   <string name="screen_room_details_error_unmuting">"Tämän huoneen mykistyksen poistaminen epäonnistui, yritä uudelleen."</string>
   <string name="screen_room_details_invite_people_dont_close">"Älä sulje sovellusta ennen kuin se on valmis."</string>
   <string name="screen_room_details_invite_people_preparing">"Valmistellaan kutsuja…"</string>
-  <string name="screen_room_details_invite_people_title">"Kutsu ihmisiä"</string>
+  <string name="screen_room_details_invite_people_title">"Kutsu henkilöitä"</string>
   <string name="screen_room_details_leave_conversation_title">"Poistu keskustelusta"</string>
   <string name="screen_room_details_leave_room_title">"Poistu huoneesta"</string>
   <string name="screen_room_details_media_gallery_title">"Media ja tiedostot"</string>
@@ -68,7 +70,7 @@
   <string name="screen_room_details_title">"Huoneen tiedot"</string>
   <string name="screen_room_details_topic_title">"Aihe"</string>
   <string name="screen_room_details_updating_room">"Muokataan huonetta…"</string>
-  <string name="screen_room_member_list_banned_empty">"Tässä huoneessa ei ole porttikieltoja"</string>
+  <string name="screen_room_member_list_banned_empty">"Porttikiellettyjä käyttäjiä ei ole."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d henkilö"</item>
     <item quantity="other">"%1$d henkilöä"</item>
@@ -80,8 +82,8 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Poista porttikielto huoneesta"</string>
   <string name="screen_room_member_list_mode_banned">"Porttikiellot"</string>
   <string name="screen_room_member_list_mode_members">"Jäsenet"</string>
-  <string name="screen_room_member_list_role_administrator">"Vain ylläpitäjät"</string>
-  <string name="screen_room_member_list_role_moderator">"Ylläpitäjät ja valvojat"</string>
+  <string name="screen_room_member_list_role_administrator">"Ylläpitäjä"</string>
+  <string name="screen_room_member_list_role_moderator">"Valvoja"</string>
   <string name="screen_room_member_list_role_owner">"Omistaja"</string>
   <string name="screen_room_member_list_room_members_header_title">"Huoneen jäsenet"</string>
   <string name="screen_room_member_list_unbanning_user">"Poistetaan käyttäjän %1$s porttikieltoa"</string>
@@ -108,14 +110,15 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Viestit ja sisältö"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Valvojat"</string>
   <string name="screen_room_roles_and_permissions_owners">"Omistajat"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Oikeudet"</string>
   <string name="screen_room_roles_and_permissions_reset">"Nollaa oikeudet"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Kun nollaat käyttöoikeudet, menetät nykyiset asetukset."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Nollataanko oikeudet?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Roolit"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Huoneen tiedot"</string>
   <string name="screen_room_roles_and_permissions_title">"Roolit ja oikeudet"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Lisää huoneen osoite"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kuka tahansa voi pyytää saada liittyä huoneeseen, mutta ylläpitäjän tai valvojan on hyväksyttävä pyyntö."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Lisää osoite"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kaikkien on pyydettävä pääsyä."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Pyydä liittymistä"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Kyllä, ota salaus käyttöön"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä. Viestihistoria näkyy vain huoneen jäsenille kutsusta tai liittymisestä lähtien.
@@ -125,17 +128,18 @@ Emme suosittele salauksen ottamista käyttöön huoneissa, jotka kuka tahansa vo
   <string name="screen_security_and_privacy_encryption_section_footer">"Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Salaus"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Ota päästä päähän -salaus käyttöön"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kuka tahansa voi löytää ja liittyä."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kuka tahansa voi liittyä."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kuka tahansa"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vain kutsutut henkilöt voivat liittyä"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vain kutsutut henkilöt voivat liittyä."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vain kutsutut"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Huoneeseen pääsy"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Tiloja ei tällä hetkellä tueta"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Pääsy"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Tilan jäsenet"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Tarvitset huoneen osoitteen, jotta se näkyy hakemistossa."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Huoneen osoite"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Tiloja ei tällä hetkellä tueta"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Tarvitset osoitteen, jotta se näkyy julkisessa hakemistossa."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Osoite"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Salli tämän huoneen löytäminen hakemalla %1$s -palvelimen julkisesta huonehakemistosta."</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Näkyy julkisessa huonehakemistossa"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Anna muiden löytää tämä julkisen hakemiston kautta."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Näkyy julkisessa hakemistossa"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kuka tahansa"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kuka voi lukea viestihistoriaa"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Jäsenet vasta kutsusta lähtien"</string>
@@ -143,6 +147,6 @@ Emme suosittele salauksen ottamista käyttöön huoneissa, jotka kuka tahansa vo
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Huoneosoitteet ovat tapoja löytää ja käyttää huoneita. Näin voit myös helposti jakaa huoneesi muiden kanssa.
 Voit halutessasi julkaista huoneesi kotipalvelimesi julkisessa huonehakemistossa."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Huoneen julkaiseminen"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Huoneen näkyvyys"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Näkyvyys"</string>
   <string name="screen_security_and_privacy_title">"Turvallisuus ja yksityisyys"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-fr/translations.xml b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
index 4868d1413b..79af58f0e3 100644
--- a/features/roomdetails/impl/src/main/res/values-fr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
@@ -71,9 +71,15 @@
   <string name="screen_room_details_topic_title">"Sujet"</string>
   <string name="screen_room_details_updating_room">"Mise à jour du salon…"</string>
   <string name="screen_room_member_list_banned_empty">"Il n’y a pas d’utilisateur banni."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Banni(e)"</item>
+    <item quantity="other">"%1$d Banni(e)s"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Vérifiez la saisie ou effectuez une nouvelle recherche"</string>
+  <string name="screen_room_member_list_empty_search_title">"Aucun résultat pour «%1$s»"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d personne"</item>
-    <item quantity="other">"%1$d personnes"</item>
+    <item quantity="one">"%1$d Personne"</item>
+    <item quantity="other">"%1$d Personnes"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Bannir du salon"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Retirer le membre uniquement"</string>
@@ -82,6 +88,11 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Débannir du salon"</string>
   <string name="screen_room_member_list_mode_banned">"Bannis"</string>
   <string name="screen_room_member_list_mode_members">"Membres"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invité(e)"</item>
+    <item quantity="other">"%1$d Invité(e)s"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"En attente"</string>
   <string name="screen_room_member_list_role_administrator">"Administrateurs"</string>
   <string name="screen_room_member_list_role_moderator">"Modérateurs"</string>
   <string name="screen_room_member_list_role_owner">"Propriétaire"</string>
@@ -133,8 +144,8 @@ Nous ne recommandons pas d’activer le chiffrement pour les salons que tout le
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Seules les personnes invitées peuvent rejoindre."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Sur invitation uniquement"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Accès"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Les Espaces ne sont pas encore supportés"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membres de l’espace"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Les Espaces ne sont pas encore supportés"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Vous aurez besoin d’une adresse pour le rendre visible dans l’annuaire public."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresse"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Autoriser le salon à apparaître dans les résultats de recherche dans le répertoire %1$s des salons publics"</string>
@@ -147,6 +158,7 @@ Nous ne recommandons pas d’activer le chiffrement pour les salons que tout le
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Les adresses de salon sont un moyen de trouver et d’accéder aux salons. Cela vous permet également de partager facilement votre salon avec d’autres personnes.
 Vous pouvez choisir de publier votre salon dans l’annuaire des salons publics de votre serveur d’accueil."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publication du salon"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Les adresses permettent de trouver et d’accéder aux salons et aux espaces. Elles facilitent également leur partage avec d’autres personnes."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilité"</string>
   <string name="screen_security_and_privacy_title">"Sécurité &amp; confidentialité"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-hu/translations.xml b/features/roomdetails/impl/src/main/res/values-hu/translations.xml
index f105fc6262..bbcf93fcf7 100644
--- a/features/roomdetails/impl/src/main/res/values-hu/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-hu/translations.xml
@@ -134,8 +134,8 @@ Nem javasoljuk a titkosítás engedélyezését az olyan szobákban, amelyeket b
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Csak a meghívott emberek léphetnek be."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Csak meghívásos"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Hozzáférés"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"A terek jelenleg nem támogatottak"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"A tér tagjai"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"A terek jelenleg nem támogatottak"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Cím"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"A szoba megtalálhatóvá tétele a(z) %1$s nyilvános szobakatalógusában való kereséssel."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-in/translations.xml b/features/roomdetails/impl/src/main/res/values-in/translations.xml
index 431c4e66f1..097cd371f6 100644
--- a/features/roomdetails/impl/src/main/res/values-in/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-in/translations.xml
@@ -120,8 +120,8 @@ Kami tidak menyarankan untuk mengaktifkan enkripsi untuk ruangan yang dapat dite
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Orang hanya dapat bergabung jika mereka diundang"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Hanya undangan"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Akses ruangan"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Space saat ini tidak didukung"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Anggota space"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Space saat ini tidak didukung"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Anda akan memerlukan alamat ruangan untuk membuatnya terlihat dalam direktori."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Izinkan ruangan ini ditemukan dengan mencari direktori ruangan %1$s publik"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Terlihat di direktori ruangan publik"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-it/translations.xml b/features/roomdetails/impl/src/main/res/values-it/translations.xml
index 1a315d8de0..3d83dba3cb 100644
--- a/features/roomdetails/impl/src/main/res/values-it/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-it/translations.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Avrai bisogno di un indirizzo della stanza per renderla visibile nell\'elenco."</string>
-  <string name="screen_edit_room_address_title">"Indirizzo della stanza"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Per renderlo visibile nell\'elenco pubblico, avrai bisogno di un indirizzo."</string>
+  <string name="screen_edit_room_address_title">"Modifica indirizzo"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Si è verificato un errore durante l\'aggiornamento delle impostazioni di notifica."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Il tuo homeserver non supporta questa opzione nelle stanze crifrate, quindi potresti non ricevere notifiche in alcune stanze."</string>
   <string name="screen_polls_history_title">"Sondaggi"</string>
-  <string name="screen_room_change_permissions_administrators">"Solo amministratori"</string>
+  <string name="screen_room_change_permissions_administrators">"Amministratore"</string>
   <string name="screen_room_change_permissions_ban_people">"Escludi membri"</string>
   <string name="screen_room_change_permissions_delete_messages">"Rimuovi messaggi"</string>
-  <string name="screen_room_change_permissions_invite_people">"Invita persone e accetta richieste di partecipazione"</string>
+  <string name="screen_room_change_permissions_everyone">"Membro"</string>
+  <string name="screen_room_change_permissions_invite_people">"Invita persone"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Gestisci membri"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Messaggi e contenuti"</string>
-  <string name="screen_room_change_permissions_moderators">"Amministratori e moderatori"</string>
-  <string name="screen_room_change_permissions_remove_people">"Rimuovi le persone e rifiuta le richieste di partecipazione"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderatore"</string>
+  <string name="screen_room_change_permissions_remove_people">"Rimuovi membri"</string>
   <string name="screen_room_change_permissions_room_avatar">"Cambia avatar della stanza"</string>
-  <string name="screen_room_change_permissions_room_details">"Modifica stanza"</string>
+  <string name="screen_room_change_permissions_room_details">"Modifica dettagli"</string>
   <string name="screen_room_change_permissions_room_name">"Cambia il nome della stanza"</string>
   <string name="screen_room_change_permissions_room_topic">"Cambiare l\'argomento della stanza"</string>
   <string name="screen_room_change_permissions_send_messages">"Inviare messaggi"</string>
@@ -40,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Cifrata"</string>
   <string name="screen_room_details_badge_not_encrypted">"Non cifrata"</string>
   <string name="screen_room_details_badge_public">"Stanza pubblica"</string>
-  <string name="screen_room_details_edit_room_title">"Modifica stanza"</string>
+  <string name="screen_room_details_edit_room_title">"Modifica dettagli"</string>
   <string name="screen_room_details_edition_error">"Si è verificato un errore sconosciuto e non è stato possibile modificare le informazioni."</string>
   <string name="screen_room_details_edition_error_title">"Impossibile aggiornare la stanza"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"I messaggi sono protetti da lucchetti. Solo tu e i destinatari avete le chiavi univoche per sbloccarli."</string>
@@ -48,6 +50,8 @@
   <string name="screen_room_details_error_loading_notification_settings">"Si è verificato un errore durante il caricamento delle impostazioni di notifica."</string>
   <string name="screen_room_details_error_muting">"Impostazione del silenzioso fallita per questa stanza, riprova."</string>
   <string name="screen_room_details_error_unmuting">"Disattivazione del silenzioso di questa stanza fallita, riprova."</string>
+  <string name="screen_room_details_invite_people_dont_close">"Non chiudere l\'app fino al completamento."</string>
+  <string name="screen_room_details_invite_people_preparing">"Preparazione degli inviti…"</string>
   <string name="screen_room_details_invite_people_title">"Invita persone"</string>
   <string name="screen_room_details_leave_conversation_title">"Abbandona la conversazione"</string>
   <string name="screen_room_details_leave_room_title">"Esci dalla stanza"</string>
@@ -66,10 +70,16 @@
   <string name="screen_room_details_title">"Informazioni sulla stanza"</string>
   <string name="screen_room_details_topic_title">"Argomento"</string>
   <string name="screen_room_details_updating_room">"Aggiornamento della stanza…"</string>
-  <string name="screen_room_member_list_banned_empty">"Non ci sono utenti esclusi in questa stanza."</string>
+  <string name="screen_room_member_list_banned_empty">"Non ci sono utenti bannati."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Bannato"</item>
+    <item quantity="other">"%1$d Bannati"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Controlla l\'ortografia o prova una nuova ricerca"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nessun risultato per “%1$s ”"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d persona"</item>
-    <item quantity="other">"%1$d persone"</item>
+    <item quantity="one">"%1$d Persona"</item>
+    <item quantity="other">"%1$d Persone"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Rimuovi ed escludi"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Rimuovi soltanto"</string>
@@ -78,8 +88,13 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Riammetti nella stanza"</string>
   <string name="screen_room_member_list_mode_banned">"Esclusi"</string>
   <string name="screen_room_member_list_mode_members">"Membri"</string>
-  <string name="screen_room_member_list_role_administrator">"Solo amministratori"</string>
-  <string name="screen_room_member_list_role_moderator">"Amministratori e moderatori"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invitato"</item>
+    <item quantity="other">"%1$d Invitati"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"In attesa"</string>
+  <string name="screen_room_member_list_role_administrator">"Amministratore"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderatore"</string>
   <string name="screen_room_member_list_role_owner">"Proprietario"</string>
   <string name="screen_room_member_list_room_members_header_title">"Membri della stanza"</string>
   <string name="screen_room_member_list_unbanning_user">"Riammissione di %1$s"</string>
@@ -106,14 +121,15 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Messaggi e contenuti"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatori"</string>
   <string name="screen_room_roles_and_permissions_owners">"Proprietari"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Autorizzazioni"</string>
   <string name="screen_room_roles_and_permissions_reset">"Reimpostare le autorizzazioni"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Una volta reimpostate le autorizzazioni, perderai le impostazioni correnti."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Reimpostare autorizzazioni?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Ruoli"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Dettagli della stanza"</string>
   <string name="screen_room_roles_and_permissions_title">"Ruoli e autorizzazioni"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Aggiungi l\'indirizzo della stanza"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Chiunque può chiedere di entrare nella stanza, ma un amministratore o un moderatore dovrà accettare la richiesta."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Aggiungi indirizzo"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Chiunque deve richiedere l\'accesso."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Chiedi di entrare"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sì, attiva la crittografia"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Una volta attivata, la crittografia di una stanza non può essere disattivata, la cronologia dei messaggi sarà visibile solo ai membri della stanza da quando sono stati invitati o da quando sono entrati nella stanza.
@@ -123,17 +139,18 @@ Non consigliamo di attivare la crittografia per le stanze che chiunque può trov
   <string name="screen_security_and_privacy_encryption_section_footer">"Una volta attivata, la crittografia non può essere disattivata."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Crittografia"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Attiva la crittografia end-to-end"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Chiunque può trovare ed entrare"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Chiunque può partecipare."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Chiunque"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Le persone possono partecipare solo se invitate"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Solo le persone invitate possono entrare."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Solo su invito"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Accesso alla stanza"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Gli spazi non sono attualmente supportati"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Accesso"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membri dello spazio"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Avrai bisogno di un indirizzo della stanza per renderla visibile nell\'elenco."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Indirizzo della stanza"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Gli spazi non sono attualmente supportati"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Per renderlo visibile nell\'elenco pubblico, avrai bisogno di un indirizzo."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Indirizzo"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Consenti la ricerca di questa stanza effettuando una ricerca nell\'elenco delle stanze pubbliche di %1$s"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visibile nell\'elenco delle stanze pubbliche"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Consenti di essere trovato effettuando una ricerca nell\'elenco pubblico."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visibile nell\'elenco pubblico"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Chiunque"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Chi può leggere la cronologia messaggi"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Solo membri da quando sono stati invitati"</string>
@@ -141,6 +158,7 @@ Non consigliamo di attivare la crittografia per le stanze che chiunque può trov
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Gli indirizzi delle stanze sono modi per trovare e accedervi. In questo modo puoi anche condividere facilmente la tua stanze con altri.
 Puoi scegliere di pubblicare la tua stanza nell\'elenco delle stanza pubbliche dell\'homeserver."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Pubblicazione della stanza"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilità della stanza"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Gli indirizzi sono un modo per trovare e accedere a stanze e spazi. Questo ti consente anche di condividerli facilmente con altri."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilità"</string>
   <string name="screen_security_and_privacy_title">"Sicurezza e privacy"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-ko/translations.xml b/features/roomdetails/impl/src/main/res/values-ko/translations.xml
index c025fdbf49..22f3fe99e6 100644
--- a/features/roomdetails/impl/src/main/res/values-ko/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ko/translations.xml
@@ -127,8 +127,8 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"초대받은 사용자만 가입할 수 있습니다."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"초대 전용"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"방 액세스"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"스페이스는 현재 지원되지 않습니다"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"스페이스 멤버들"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"스페이스는 현재 지원되지 않습니다"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"디렉토리에 표시하려면 방 주소가 필요합니다."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"%1$s 공개 방 디렉토리에서 이 방을 검색할 수 있도록 허용합니다"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"공개 룸 디렉토리에 표시됨"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-nb/translations.xml b/features/roomdetails/impl/src/main/res/values-nb/translations.xml
index 4fa2154462..7d23507a8b 100644
--- a/features/roomdetails/impl/src/main/res/values-nb/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-nb/translations.xml
@@ -130,8 +130,8 @@ Vi anbefaler ikke å aktivere kryptering for rom som hvem som helst kan finne og
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Folk kan bare bli med hvis de er invitert"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun for inviterte"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Tilgang til rom"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Områder støttes ikke for øyeblikket"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer av område"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Områder støttes ikke for øyeblikket"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Du trenger en adresse til rommet for å gjøre det synlig i katalogen."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillat at dette rommet blir funnet ved å søke %1$s offentlig romkatalog"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i offentlig romkatalog"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-pl/translations.xml b/features/roomdetails/impl/src/main/res/values-pl/translations.xml
index b7382e8d90..a24774c736 100644
--- a/features/roomdetails/impl/src/main/res/values-pl/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pl/translations.xml
@@ -131,8 +131,8 @@ Odradzamy włączanie szyfrowania dla pokoi, które każdy może znaleźć i do
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Tylko osoby z zaproszeniem mogą dołączyć"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Tylko zaproszenie"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Dostęp do pokoju"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Przestrzenie nie są obecnie wspierane"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Członkowie przestrzeni"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Przestrzenie nie są obecnie wspierane"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Aby pokój był widoczny w katalogu, potrzebny jest adres pokoju."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adres pokoju"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Zezwól na znalezienie tego pokoju wyszukując %1$s w katalogu pokoi publicznych"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml b/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
index 4eb9da3062..da19da98ed 100644
--- a/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Você precisará de um endereço de sala para torná-la visível no diretório."</string>
-  <string name="screen_edit_room_address_title">"Endereço da sala"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Você precisará de um endereço para torná-la visível no diretório."</string>
+  <string name="screen_edit_room_address_title">"Editar endereço"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Ocorreu um erro ao atualizar a configuração de notificação."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Seu servidor-casa não suporta esta opção em salas criptografadas. Você pode não ser notificado em algumas salas."</string>
   <string name="screen_polls_history_title">"Enquetes"</string>
-  <string name="screen_room_change_permissions_administrators">"Somente administradores"</string>
+  <string name="screen_room_change_permissions_administrators">"Administradores"</string>
   <string name="screen_room_change_permissions_ban_people">"Banir pessoas"</string>
   <string name="screen_room_change_permissions_delete_messages">"Remover mensagens"</string>
-  <string name="screen_room_change_permissions_invite_people">"Convide pessoas e aceite solicitações de entrada"</string>
+  <string name="screen_room_change_permissions_everyone">"Membro"</string>
+  <string name="screen_room_change_permissions_invite_people">"Convidar pessoas"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Gerenciar membros"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mensagens e conteúdo"</string>
-  <string name="screen_room_change_permissions_moderators">"Administradores e moderadores"</string>
-  <string name="screen_room_change_permissions_remove_people">"Remover pessoas e recusar solicitações de entrada"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderador"</string>
+  <string name="screen_room_change_permissions_remove_people">"Remover pessoas"</string>
   <string name="screen_room_change_permissions_room_avatar">"Alterar avatar da sala"</string>
-  <string name="screen_room_change_permissions_room_details">"Editar sala"</string>
+  <string name="screen_room_change_permissions_room_details">"Editar detalhes"</string>
   <string name="screen_room_change_permissions_room_name">"Alterar nome da sala"</string>
   <string name="screen_room_change_permissions_room_topic">"Alterar tópico da sala"</string>
   <string name="screen_room_change_permissions_send_messages">"Enviar mensagens"</string>
@@ -40,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Criptografado"</string>
   <string name="screen_room_details_badge_not_encrypted">"Não criptografado"</string>
   <string name="screen_room_details_badge_public">"Sala pública"</string>
-  <string name="screen_room_details_edit_room_title">"Editar sala"</string>
+  <string name="screen_room_details_edit_room_title">"Editar detalhes"</string>
   <string name="screen_room_details_edition_error">"Ocorreu um erro desconhecido e as informações não puderam ser alteradas."</string>
   <string name="screen_room_details_edition_error_title">"Não foi possível atualizar a sala"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"As mensagens são protegidas com cadeados. Somente você e os destinatários têm as chaves exclusivas para desbloqueá-los."</string>
@@ -48,6 +50,8 @@
   <string name="screen_room_details_error_loading_notification_settings">"Ocorreu um erro ao carregar as configurações de notificação."</string>
   <string name="screen_room_details_error_muting">"Falha ao silenciar esta sala, tente novamente."</string>
   <string name="screen_room_details_error_unmuting">"Falha ao desilenciar esta sala. Tente novamente."</string>
+  <string name="screen_room_details_invite_people_dont_close">"Não feche o aplicativo até terminar."</string>
+  <string name="screen_room_details_invite_people_preparing">"Preparando convites…"</string>
   <string name="screen_room_details_invite_people_title">"Convidar pessoas"</string>
   <string name="screen_room_details_leave_conversation_title">"Sair da conversa"</string>
   <string name="screen_room_details_leave_room_title">"Sair da sala"</string>
@@ -66,7 +70,13 @@
   <string name="screen_room_details_title">"Informação da sala"</string>
   <string name="screen_room_details_topic_title">"Tópico"</string>
   <string name="screen_room_details_updating_room">"Atualizando a sala…"</string>
-  <string name="screen_room_member_list_banned_empty">"Não há usuários banidos nesta sala."</string>
+  <string name="screen_room_member_list_banned_empty">"Não há usuários banidos."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d banido"</item>
+    <item quantity="other">"%1$d banidos"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Confira a ortografia ou tente uma nova busca"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nenhum resultado para “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d pessoa"</item>
     <item quantity="other">"%1$d pessoas"</item>
@@ -78,8 +88,13 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Desbanir da sala"</string>
   <string name="screen_room_member_list_mode_banned">"Banidos"</string>
   <string name="screen_room_member_list_mode_members">"Membros"</string>
-  <string name="screen_room_member_list_role_administrator">"Somente administradores"</string>
-  <string name="screen_room_member_list_role_moderator">"Administradores e moderadores"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d convidado"</item>
+    <item quantity="other">"%1$d convidados"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Pendente"</string>
+  <string name="screen_room_member_list_role_administrator">"Administradores"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderador"</string>
   <string name="screen_room_member_list_role_owner">"Proprietário"</string>
   <string name="screen_room_member_list_room_members_header_title">"Membros da sala"</string>
   <string name="screen_room_member_list_unbanning_user">"Desbanindo %1$s"</string>
@@ -106,14 +121,15 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Mensagens e conteúdo"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderadores"</string>
   <string name="screen_room_roles_and_permissions_owners">"Proprietários"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Permissões"</string>
   <string name="screen_room_roles_and_permissions_reset">"Redefinir permissões"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Depois de redefinir as permissões, você perderá as configurações atuais."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Redefinir permissões?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Cargos"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Detalhes da sala"</string>
   <string name="screen_room_roles_and_permissions_title">"Cargos e permissões"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Adicionar endereço da sala"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Qualquer pessoa pode pedir para entrar na sala, mas um administrador ou moderador terá que aceitar o pedido."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Adicionar endereço"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Qualquer um pode pedir acesso, mas um administrador terá que aceitar o pedido."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para entrar"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sim, ativar a criptografia"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Uma vez ativada, a criptografia de uma sala não pode ser desativada. O histórico de mensagens só será visível para os membros da sala desde que foram convidados ou desde que entraram na sala.
@@ -123,16 +139,18 @@ Não recomendamos que você ative a criptografia para salas que qualquer pessoa
   <string name="screen_security_and_privacy_encryption_section_footer">"Uma vez ativada, a criptografia não poderá ser desativada."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Criptografia"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Ativar a criptografia de ponta a ponta"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer um pode encontrar e entrar"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer um pode entrar"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Qualquer pessoa"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"As pessoas só podem participar se forem convidadas"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Somente para convidados"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Acesso à sala"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"No momento, não há suporte aos espaços"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Apenas pessoas convidadas podem entrar."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Privado"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Acesso"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membros do espaço"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Você precisará de um endereço de sala para torná-la visível no diretório."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"No momento, não há suporte aos espaços"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Você precisará de um endereço para torná-la visível no diretório."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Endereço publicado"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permitir que esta sala seja encontrada pesquisando diretório de salas públicas de %1$s"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório de salas públicas"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Permite que seja encontrada ao buscar no diretório público."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório público"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Qualquer pessoa"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Quem pode ler o histórico"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Somente membros, desde que foram convidados"</string>
@@ -140,5 +158,7 @@ Não recomendamos que você ative a criptografia para salas que qualquer pessoa
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhar facilmente sua sala com outras pessoas.
 Você pode optar por publicar sua sala no diretório público de salas do seu servidor-casa."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicação da sala"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhá-las facilmente com outras pessoas."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade"</string>
   <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-pt/translations.xml b/features/roomdetails/impl/src/main/res/values-pt/translations.xml
index 7f9aca6ea1..b682c0597d 100644
--- a/features/roomdetails/impl/src/main/res/values-pt/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pt/translations.xml
@@ -130,8 +130,8 @@ Não recomendamos ativar a cifragem em salas que qualquer pessoa possa encontrar
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Só é possível entrar tendo um convite"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Apenas por convite"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Acesso à sala"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Os espaços ainda não estão implementados"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membros do espaço"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Os espaços ainda não estão implementados"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"É necessário um endereço para tornar a sala visível no diretório."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Endereço da sala"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permite que esta sala seja encontrada através do diretório público do %1$s."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-ro/translations.xml b/features/roomdetails/impl/src/main/res/values-ro/translations.xml
index 682f312c84..f0c43e53a5 100644
--- a/features/roomdetails/impl/src/main/res/values-ro/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ro/translations.xml
@@ -130,8 +130,8 @@ Nu recomandăm activarea criptării pentru camerele pe care oricine le poate gă
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Persoanele se pot alătura numai dacă invitate"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Doar pe bază de invitație"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Acces la cameră"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spațiile nu sunt momentan suportate."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membrii spațiului"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spațiile nu sunt momentan suportate."</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Veți avea nevoie de o adresă de cameră pentru a o face vizibilă în director."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permiteți găsirea acestei camere prin căutarea în directorul de camere publice al %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Vizibilă în directorul de camere publice"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-ru/translations.xml b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
index 324caed3dc..47de4c388c 100644
--- a/features/roomdetails/impl/src/main/res/values-ru/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
@@ -137,8 +137,8 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Присоединиться могут только приглашенные люди."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Только по приглашению"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Доступ"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Пространства в настоящее время не поддерживаются."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Участники пространства"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Пространства в настоящее время не поддерживаются."</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Вам понадобится адрес комнаты, чтобы сделать ее видимой в каталоге."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Адрес"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Опубликовать %1$s в каталоге публичных комнат"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-sk/translations.xml b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
index 662a7c166a..477b419788 100644
--- a/features/roomdetails/impl/src/main/res/values-sk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
@@ -131,8 +131,8 @@ To môže brániť správnemu fungovaniu robotov a premostení. Neodporúčame p
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Ľudia sa môžu pripojiť len vtedy, ak sú pozvaní"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Iba na pozvánku"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Prístup do miestnosti"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Priestory momentálne nie sú podporované"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Členovia priestoru"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Priestory momentálne nie sú podporované"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Budete potrebovať adresu miestnosti, aby bola viditeľná v adresári."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresa miestnosti"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Umožniť vyhľadanie tejto miestnosti v adresári verejných miestností %1$s"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-sv/translations.xml b/features/roomdetails/impl/src/main/res/values-sv/translations.xml
index 8e2df0138e..2dc590c2f4 100644
--- a/features/roomdetails/impl/src/main/res/values-sv/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sv/translations.xml
@@ -128,8 +128,8 @@ Vi rekommenderar inte att aktivera kryptering för rum som vem som helst kan hit
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Användare kan bara gå med om de är inbjudna"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Endast inbjudan"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Tillgång till rum"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Utrymmen stöds för närvarande inte"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Utrymmesmedlemmar"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Utrymmen stöds för närvarande inte"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Du behöver en rumsadress för att göra den synlig i katalogen."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillåt att detta rum hittas genom att söka i den offentliga rumskatalogen på %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i katalogen för offentliga rum"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-tr/translations.xml b/features/roomdetails/impl/src/main/res/values-tr/translations.xml
index 11201d0da0..01cac3a6cb 100644
--- a/features/roomdetails/impl/src/main/res/values-tr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-tr/translations.xml
@@ -120,8 +120,8 @@ Herkesin bulabileceği ve katılabileceği odalar için şifrelemenin etkinleşt
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"İnsanlar yalnızca davet edildiklerinde katılabilirler"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Yalnızca davet"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Oda Erişimi"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Alanlar şu anda desteklenmiyor"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Alan üyeleri"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Alanlar şu anda desteklenmiyor"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Dizinde görünür hale getirmek için bir oda adresine ihtiyacınız olacak."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Oda adresi"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Bu odanın %1$s genel oda dizininde arama yapılarak bulunmasına izin verin"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-uk/translations.xml b/features/roomdetails/impl/src/main/res/values-uk/translations.xml
index 34663f9db9..57a604bfe8 100644
--- a/features/roomdetails/impl/src/main/res/values-uk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-uk/translations.xml
@@ -129,8 +129,8 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Люди можуть приєднатися, лише якщо їх запросили"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Лише запрошені"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Доступ до кімнати"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Простори наразі не підтримуються"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Учасники простору"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Простори наразі не підтримуються"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Вам знадобиться адреса кімнати, щоб зробити її видимою в каталозі."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Адреса кімнати"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Дозвольте, щоб цю кімнату можна було знайти за допомогою пошуку в каталозі загальнодоступних кімнат %1$s "</string>
diff --git a/features/roomdetails/impl/src/main/res/values-uz/translations.xml b/features/roomdetails/impl/src/main/res/values-uz/translations.xml
index a95af68769..401d015735 100644
--- a/features/roomdetails/impl/src/main/res/values-uz/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-uz/translations.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Katalogda ko‘rinadigan qilish uchun xona manzili kerak bo‘ladi."</string>
+  <string name="screen_edit_room_address_title">"Xona manzili"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Bildirishnoma sozlamalarini yangilashda xatolik yuz berdi."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Uy serveringiz shifrlangan xonalarda ushbu imkoniyatni qoʻllab-quvvatlamaydi, shuning uchun baʼzi xonalardagi xabarlarni olmasligingiz mumkin."</string>
   <string name="screen_polls_history_title">"Soʻrovnomalar"</string>
@@ -18,13 +20,17 @@
   <string name="screen_room_change_role_administrators_title">"Administratorlarni tahrirlash"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Bu amalni bekor qila olmaysiz. Siz foydalanuvchini o‘zingiz bilan bir xil quvvat darajasiga ega bo‘lishga undayapsiz."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Admin qo‘shilsinmi?"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"Bu amalni bekor qila olmaysiz. Siz egalikni tanlangan foydalanuvchilarga o‘tkazmoqdasiz. Tark etsangiz, bu doimiy bo‘ladi."</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"Egalik huquqini o‘tkazasizmi?"</string>
   <string name="screen_room_change_role_confirm_demote_self_action">"Pastga tushirish"</string>
   <string name="screen_room_change_role_confirm_demote_self_description">"Siz oʻzingizni imtiyozlardan mahrum qilayotganingiz sababli, bu o‘zgarishni bekor qila olmaysiz. Agar xonadagi so‘nggi imtiyozli foydalanuvchi bo‘lsangiz, imtiyozlarni qayta tiklash imkonsiz bo‘ladi."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"O‘z darajangizni pasaytirmoqchimisiz?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (Jarayonda)"</string>
   <string name="screen_room_change_role_invited_member_name_android">"(Kutilmoqda)"</string>
   <string name="screen_room_change_role_moderators_admin_section_footer">"Administratorlar avtomatik ravishda moderator imtiyozlariga ega"</string>
+  <string name="screen_room_change_role_moderators_owner_section_footer">"Egalar avtomatik ravishda administrator huquqlariga ega."</string>
   <string name="screen_room_change_role_moderators_title">"Moderatorlarni tahrirlash"</string>
+  <string name="screen_room_change_role_owners_title">"Egalarni tanlang"</string>
   <string name="screen_room_change_role_section_administrators">"Adminlar"</string>
   <string name="screen_room_change_role_section_moderators">"Moderatorlar"</string>
   <string name="screen_room_change_role_section_users">"Azolar"</string>
@@ -45,13 +51,16 @@
   <string name="screen_room_details_invite_people_title">"Odamlarni taklif qiling"</string>
   <string name="screen_room_details_leave_conversation_title">"Suhbatni tark etish"</string>
   <string name="screen_room_details_leave_room_title">"Xonani tark etish"</string>
+  <string name="screen_room_details_media_gallery_title">"Media va fayllar"</string>
   <string name="screen_room_details_notification_mode_custom">"Maxsus"</string>
   <string name="screen_room_details_notification_mode_default">"Standart"</string>
   <string name="screen_room_details_notification_title">"Bildirishnomalar"</string>
   <string name="screen_room_details_pinned_events_row_title">"Qadalgan xabarlar"</string>
   <string name="screen_room_details_profile_row_title">"Profil"</string>
+  <string name="screen_room_details_requests_to_join_title">"Qo‘shilish uchun so‘rovlar"</string>
   <string name="screen_room_details_roles_and_permissions">"Rollar va ruxsatlar"</string>
   <string name="screen_room_details_room_name_label">"Xona nomi"</string>
+  <string name="screen_room_details_security_and_privacy_title">"Xavfsizlik va maxfiylik"</string>
   <string name="screen_room_details_security_title">"Xavfsizlik"</string>
   <string name="screen_room_details_share_room_title">"Xonani baham ko\'ring"</string>
   <string name="screen_room_details_title">"Xona haqida maʼlumot"</string>
@@ -66,10 +75,12 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Faqat aʻzoni olib tashlash"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Taqiqni bekor qilish"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Agar taklif qilinsa, ular bu xonaga qayta qo‘shilishlari mumkin."</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Xonadan taqiqni olib tashlash"</string>
   <string name="screen_room_member_list_mode_banned">"Taqiqlangan"</string>
   <string name="screen_room_member_list_mode_members">"Azolar"</string>
   <string name="screen_room_member_list_role_administrator">"Faqat adminlar"</string>
   <string name="screen_room_member_list_role_moderator">"Adminlar va moderatorlar"</string>
+  <string name="screen_room_member_list_role_owner">"Egasi"</string>
   <string name="screen_room_member_list_room_members_header_title">"Xona a\'zolari"</string>
   <string name="screen_room_member_list_unbanning_user">"Taqiqni bekor qilish %1$s"</string>
   <string name="screen_room_notification_settings_allow_custom">"Moslashtirilgan sozlamalarga ruxsat bering"</string>
@@ -87,20 +98,46 @@
   <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Faqat eslatmalar va kalit so\'zlar"</string>
   <string name="screen_room_notification_settings_room_custom_settings_title">"Bu xonada menga xabar bering"</string>
   <string name="screen_room_roles_and_permissions_admins">"Adminlar"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"Adminlar va egalari"</string>
   <string name="screen_room_roles_and_permissions_change_my_role">"Rolimni o‘zgartirish"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Aʼzolikka tushirish"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Moderatorga pasaytirish"</string>
   <string name="screen_room_roles_and_permissions_member_moderation">"Aʻzo moderatsiyasi"</string>
   <string name="screen_room_roles_and_permissions_messages_and_content">"Xabarlar va kontent"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatorlar"</string>
+  <string name="screen_room_roles_and_permissions_owners">"Egalari"</string>
   <string name="screen_room_roles_and_permissions_reset">"Ruxsatlarni tiklash"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Ruxsatlarni asliga qaytargach, joriy sozlamalarni yoʻqotasiz."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Ruxsatlar asliga qaytarilsinmi?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Rollar"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Xona tafsilotlari"</string>
   <string name="screen_room_roles_and_permissions_title">"Rollar va ruxsatlar"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Xona manzilini kiritish"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Xonaga qo‘shilishni istalgan kishi so‘rashi mumkin, lekin administrator yoki moderator so‘rovni qabul qilishi kerak"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Qo‘shilishni so‘rang"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ha, shifrlashni yoqish"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Yoqilgandan so‘ng, xona uchun shifrlashni o‘chirib bo‘lmaydi. Xabarlar tarixi faqat xona a’zolari taklif qilinganidan yoki xonaga qo‘shilganidan keyingi davrdan boshlab ko‘rinadi. Xona a’zolaridan tashqari hech kim xabarlarni o‘qiy olmaydi. Bu botlar va ko‘priklarning to‘g‘ri ishlashiga to‘sqinlik qilishi mumkin.
+Shu sababli, har kim topishi va qo‘shilishi mumkin bo‘lgan xonalar uchun shifrlashni yoqishni tavsiya etmaymiz."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Shifrlash yoqilsinmi?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Yoqilgandan keyin shifrlashni faolsizlantirish imkonsiz."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Shifrlash"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"End-to-end shifrlashni yoqish"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Istalgan kishi topishi va qo‘shilishi mumkin"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Har kim"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Odamlar faqat taklif qilingan taqdirdagina qo‘shilishi mumkin"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Faqat taklif qilish"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Xonaga kirish huquqi"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Maydon a’zolari"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Hozirda maydonlar qo‘llab-quvvatlanmaydi"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Katalogda ko‘rinadigan qilish uchun xona manzili kerak bo‘ladi."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Bu xonani %1$s umumiy xonalar ro‘yxatidan qidirib topish imkoniyatini berish"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Umumiy xona ro‘yxatida ko‘rinadi"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Har kim"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Tarixni kim o‘qiy oladi"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Taklif qilinganidan buyon faqat a’zolar"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"A’zolar faqat bu parametr tanlanganidan keyin"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Xona manzillari xonalarni topish va ularga kirish usullaridir. Bu shuningdek xonangizni boshqalar bilan oson ulashish imkonini beradi.
+Xonangizni o‘z homeserveringizning ommaviy xonalar ro‘yxatida e’lon qilishni tanlashingiz mumkin."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"xona nashriyoti"</string>
+  <string name="screen_security_and_privacy_title">"Xavfsizlik va maxfiylik"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml b/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
index 9de710e576..0332c0ffd5 100644
--- a/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
@@ -135,8 +135,8 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"僅受邀者才能加入。"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"僅限邀請"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"存取權"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"目前不支援空間"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"空間成員"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"目前不支援空間"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"您需要地址才能在公開目錄中顯示。"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"地址"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允許透過搜尋 %1$s 公開聊天室目錄找到此聊天室"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-zh/translations.xml b/features/roomdetails/impl/src/main/res/values-zh/translations.xml
index a373e5d3c4..f925bdca2a 100644
--- a/features/roomdetails/impl/src/main/res/values-zh/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-zh/translations.xml
@@ -68,7 +68,7 @@
   <string name="screen_room_details_title">"聊天室信息"</string>
   <string name="screen_room_details_topic_title">"主题"</string>
   <string name="screen_room_details_updating_room">"正在更新聊天室……"</string>
-  <string name="screen_room_member_list_banned_empty">"此聊天室里没有被封禁的用户。"</string>
+  <string name="screen_room_member_list_banned_empty">"没有被封禁的用户。"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="other">"%1$d 人"</item>
   </plurals>
@@ -129,8 +129,8 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"只有受邀者才能加入"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"仅限邀请"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"房间访问权限"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"目前不支持空间"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"空间成员"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"目前不支持空间"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"你需要房间地址才能使其在目录中可见。"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"房间地址"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允许通过搜索 %1$s 的公共房间目录来发现此房间"</string>
diff --git a/features/roomdetails/impl/src/main/res/values/localazy.xml b/features/roomdetails/impl/src/main/res/values/localazy.xml
index 2f57c250f1..c582f6f6fb 100644
--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@@ -141,11 +141,15 @@ We do not recommend enabling encryption for rooms that anyone can find and join.
   <string name="screen_security_and_privacy_encryption_toggle_title">"Enable end-to-end encryption"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Anyone can join."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Anyone"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Choose which spaces’ members can join this room without an invitation.  %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Manage spaces"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Only invited people can join."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Invite only"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Access"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spaces are not currently supported"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Anyone in authorized spaces can join."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Anyone in %1$s can join."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Space members"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spaces are not currently supported"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"You’ll need an address in order to make it visible in the public directory."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Address"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Allow for this room to be found by searching %1$s public room directory"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-cs/translations.xml b/features/roommembermoderation/impl/src/main/res/values-cs/translations.xml
index 20fc68c391..a7d8966384 100644
--- a/features/roommembermoderation/impl/src/main/res/values-cs/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-cs/translations.xml
@@ -4,10 +4,12 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Vykázat"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Nebudou se moci znovu připojit k této místnosti, pokud budou pozváni."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Jste si jisti, že chcete vykázat tohoto člena?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Pokud budou pozváni, nebudou moci vstoupit do tohoto prostoru, ale stále si zachovají členství ve všech místnostech nebo podprostorech."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Vykazování %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Odebrat"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Pokud budou pozváni, budou se moci do této místnosti znovu připojit."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Opravdu chcete tohoto člena odebrat?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Pokud budou pozváni, budou moci vstoupit do tohoto prostoru a zachovají si členství ve všech místnostech nebo podprostorech."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Zobrazit profil"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Odebrat uživatele"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Odebrat člena a zakázat mu připojení v budoucnu?"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-fi/translations.xml b/features/roommembermoderation/impl/src/main/res/values-fi/translations.xml
index 4c93f73780..1eb78cd2ae 100644
--- a/features/roommembermoderation/impl/src/main/res/values-fi/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-fi/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Anna porttikielto"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"He eivät voi enää liittyä tähän huoneeseen, jos heidät kutsutaan."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Haluatko varmasti antaa tälle jäsenelle porttikiellon?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"He eivät voi liittyä tähän tilaan uudelleen, vaikka heidät kutsuttaisiin, mutta he säilyttävät jäsenyytensä muissa huoneissa tai alitiloissa."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Annetaan porttikieltoa käyttäjälle %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Poista"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"He voivat liittyä tähän huoneeseen uudelleen, jos heidät kutsutaan."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Haluatko varmasti poistaa tämän jäsenen?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"He voivat liittyä tähän tilaan uudelleen, jos heidät kutsutaan, ja he säilyttävät jäsenyytensä kaikissa huoneissa tai alitiloissa."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Näytä profiili"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Poista huoneesta"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Poista käyttäjä"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Poistetaanko jäsen huoneesta ja kielletäänkö heitä liittymästä tulevaisuudessa?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Poistetaan käyttäjää %1$s huoneesta…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Poista porttikielto huoneesta"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-it/translations.xml b/features/roommembermoderation/impl/src/main/res/values-it/translations.xml
index 7791d04546..4e423e2951 100644
--- a/features/roommembermoderation/impl/src/main/res/values-it/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-it/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Escludi"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Non potrà entrare nuovamente in questa stanza se invitato."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Vuoi davvero escludere questo membro?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Se invitati, non potranno più unirsi a questo spazio, ma manterranno comunque la loro iscrizione a tutte le stanze o sottospazi."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Esclusione di %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Rimuovi"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Potrà entrare nuovamente in questa stanza se invitato."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Sei sicuro di voler rimuovere questo membro?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Potranno unirsi nuovamente a questo spazio se invitati e manterranno comunque la loro iscrizione a tutte le stanze o sottospazi."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Visualizza profilo"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Rimuovi dalla stanza"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Rimuovi utente"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Rimuovere e vietare l\'accesso in futuro?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Rimozione di %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Riammetti nella stanza"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-pt-rBR/translations.xml b/features/roommembermoderation/impl/src/main/res/values-pt-rBR/translations.xml
index 4cbc0ba081..5a356e18f6 100644
--- a/features/roommembermoderation/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-pt-rBR/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Banir"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Essa pessoa não poderá entrar nesta sala novamente se for convidada."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Tem certeza de que quer banir este membro?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Eles não poderão mais entrar no espaço novamente se forem convidados, mas manterão sua participação em quaisquer salas e sub-espaços."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Banindo %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Remover"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Esta pessoa poderá entrar nesta sala novamente se for convidada."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Tem certeza de que deseja remover este membro?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Eles poderão entrar no espaço novamente se convidados, e manterão sua participação em quaisquer salas e sub-espaços."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Ver perfil"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Remover da sala"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Remover usuário"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Remover membro e banir de entrar novamente no futuro?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Removendo %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Desbanir da sala"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-uz/translations.xml b/features/roommembermoderation/impl/src/main/res/values-uz/translations.xml
index d7b09f0e8d..90dfae8ce3 100644
--- a/features/roommembermoderation/impl/src/main/res/values-uz/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-uz/translations.xml
@@ -5,11 +5,16 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Taklif qilingan taqdirda ham, ular bu xonaga boshqa qo‘shila olmaydilar."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Haqiqatan ham bu aʼzoni taqiqlamoqchimisiz?"</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Taqiqlash %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Oʻchirish"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Agar taklif qilinsa, ular bu xonaga qayta qo‘shilishlari mumkin."</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Haqiqatan ham bu a’zoni olib tashlaysizmi?"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Profilni koʻrish"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Xonadan olib tashlash"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Aʻzo oʻchirilsinmi va kelgusida qoʻshilish taqiqlansinmi?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Oʻchirish %1$s …"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban">"Xonadan taqiqni olib tashlash"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"Taqiqni bekor qilish"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"Agar taklif qilinsa, ular xonaga yana qo‘shilishlari mumkin"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_title">"Haqiqatan ham bu a’zoni blokdan chiqarmoqchimisiz?"</string>
   <string name="screen_bottom_sheet_manage_room_member_unbanning_user">"Taqiqni bekor qilish %1$s"</string>
 </resources>
diff --git a/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml b/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml
index a27d2ded05..aa8b2e3df8 100644
--- a/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"封禁"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"即使受到邀请，他们也无法再次加入聊天室。"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"您确定要封禁该成员吗？"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"即使再次受邀，他们也无法加入这个空间，但他们仍将保留其在任何房间或子空间的成员资格。"</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"封禁 %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"移除"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"如果受到邀请，他们可以重新加入聊天室。"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"您确定要移除此成员吗？"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"如果受到邀请，他们将能够再次加入这个空间，并且他们仍将保留其在任何房间或子空间的成员资格。"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"查看个人资料"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"从聊天室移除"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"移除用户"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"删除成员并禁止重新加入？"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"正在移除 %1$s……"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"从房间取消解封"</string>
diff --git a/features/securityandprivacy/impl/src/main/res/values-be/translations.xml b/features/securityandprivacy/impl/src/main/res/values-be/translations.xml
index 166afb9568..a1e1745100 100644
--- a/features/securityandprivacy/impl/src/main/res/values-be/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-be/translations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Папрасіце далучыцца"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Хто заўгодна"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Хто заўгодна"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-bg/translations.xml b/features/securityandprivacy/impl/src/main/res/values-bg/translations.xml
index 7ae4ba25cf..9917a7146f 100644
--- a/features/securityandprivacy/impl/src/main/res/values-bg/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-bg/translations.xml
@@ -4,20 +4,19 @@
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Да, включване на шифроването"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Да се включи ли шифроването?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Веднъж включено, шифроването не може да бъде изключено."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Шифроване"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Включване на шифроване от край до край"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Всеки може да намери и да се присъедини"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Всеки"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Хората могат да се присъединят само ако са поканени"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Само с покана"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Достъп до стаята"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Пространствата в момента не се поддържат"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Членове на пространството"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Ще ви е необходим адрес на стаята, за да я направите видима в директорията на стаите."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Пространствата в момента не се поддържат"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Видима в директорията на обществените стаи"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Всеки"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Кой може да чете историята"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Само за членове откакто са поканени"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Само за членове от избирането на тази опция"</string>
   <string name="screen_security_and_privacy_title">"Защита и поверителност"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Шифроване"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Всеки"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Видимост на стаята"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-cs/translations.xml b/features/securityandprivacy/impl/src/main/res/values-cs/translations.xml
index 299ac2b643..a70ccdbf72 100644
--- a/features/securityandprivacy/impl/src/main/res/values-cs/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-cs/translations.xml
@@ -1,38 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Aby byla místnost v adresáři viditelná, je třeba zadat její adresu."</string>
-  <string name="screen_edit_room_address_title">"Adresa místnosti"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Přidat adresu místnosti"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kdokoli může požádat o vstup do místnosti, ale správce nebo moderátor bude muset žádost přijmout."</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Budete potřebovat adresu místnosti, aby byla viditelná v adresáři místností."</string>
+  <string name="screen_edit_room_address_title">"Upravit adresu"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Přidat adresu"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Všichni musí požádat o přístup."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Požádat o připojení"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ano, povolit šifrování"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po aktivaci nelze šifrování místnosti deaktivovat. Historie zpráv bude viditelná pouze pro členy místnosti od doby, kdy byli pozváni nebo od té doby, co do místnosti vstoupili.
 Nikdo kromě členů místnosti nebude moci číst zprávy. To může bránit správnému fungování robotů a propojení.
 Nedoporučujeme povolovat šifrování pro místnosti, které může kdokoli najít a vstoupit do nich."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Povolit šifrování?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Jakmile je povoleno, šifrování nelze zakázat."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Šifrování"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Povolit koncové šifrování"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Každý může najít a vstoupit"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Vstoupit může kdokoli."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kdokoliv"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Lidé mohou vstoupit, pouze pokud jsou pozváni"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Vyberte, kteří členové prostorů se k této místnosti mohou připojit bez pozvánky. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vstoupit mohou pouze pozvaní lidé."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Pouze pro zvané"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Přístup do místnosti"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Prostory nejsou aktuálně podporovány"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Přístup"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Vstoupit může kdokoli z autorizovaných prostorů."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Vstoupit může kdokoli v %1$s."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Členové prostoru"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Prostory nejsou aktuálně podporovány"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Budete potřebovat adresu místnosti, aby byla viditelná v adresáři místností."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Adresa místnosti"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresa"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Umožněte nalezení této místnosti prohledáním adresáře veřejných místností na %1$s"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditelné v adresáři veřejných místností"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Umožnit nalezení vyhledáváním ve veřejném adresáři."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditelné ve veřejném adresáři"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kdokoliv"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kdo může číst historii"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Pouze členové od té doby, co byli pozváni"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Pouze členové od výběru této možnosti"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy místností představují způsoby, jak najít místnosti a získat k nim přístup. Díky tomu můžete svoji místnost snadno sdílet s ostatními.
 Můžete se rozhodnout publikovat svou místnost ve veřejném adresáři místnosti vašeho domovského serveru."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publikování místnosti"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy místností představují způsoby, jak najít místnosti a získat k nim přístup. Díky tomu můžete svoji místnost snadno sdílet s ostatními.
-Adresa je také vyžadována pro zobrazení místnosti v adresáři veřejných místností %1$s."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy slouží k vyhledávání a přístupu do místností a prostorů. Díky tomu je také můžete snadno sdílet s ostatními."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditelnost"</string>
   <string name="screen_security_and_privacy_title">"Zabezpečení a soukromí"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Požádat o připojení"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Šifrování"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kdokoliv"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditelnost místnosti"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-cy/translations.xml b/features/securityandprivacy/impl/src/main/res/values-cy/translations.xml
index 249fa6a1da..ce812b0f83 100644
--- a/features/securityandprivacy/impl/src/main/res/values-cy/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-cy/translations.xml
@@ -4,35 +4,33 @@
   <string name="screen_edit_room_address_title">"Cyfeiriad yr ystafell"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Ychwanegu cyfeiriad ystafell"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Gall unrhyw un ofyn am gael ymuno â\'r ystafell ond bydd rhaid i weinyddwr neu gymedrolwr dderbyn y cais."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Gofyn i gael ymuno"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Iawn, galluogi amgryptio"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Unwaith y bydd wedi\'i alluogi, does dim modd analluogi amgryptio ar gyfer ystafell, dim ond ar gyfer aelodau\'r ystafell y bydd hanes neges yn weladwy ers iddyn nhw gael eu gwahodd neu ers iddyn nhw ymuno â\'r ystafell.
 Fydd neb ar wahân i aelodau\'r ystafell yn gallu darllen negeseuon. Gall hyn atal botiau a phontydd i weithio\'n gywir.
 Nid ydym yn argymell galluogi amgryptio ar gyfer ystafelloedd y gall unrhyw un ddod o hyd iddynt ac ymuno â nhw."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Galluogi amgryptio?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Unwaith y bydd wedi\'i alluogi, does dim modd analluogi amgryptio."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Amgryptiad"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Galluogi amgryptio o\'r dechrau i\'r diwedd"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Gall unrhyw un ddod o hyd iddo ac ymuno"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Unrhyw un"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Dim ond os cawn nhw wahoddiad gall pobl ymuno"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Gwahoddiad yn unig"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Mynediad ystafell"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Nid yw gofodau\'n cael eu cefnogi ar hyn o bryd"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Aelodau gofod"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch er mwyn ei wneud yn weladwy yn y cyfeiriadur ystafelloedd."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Nid yw gofodau\'n cael eu cefnogi ar hyn o bryd"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch i\'w wneud yn weladwy yn y cyfeiriadur."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Cyfeiriad yr ystafell"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Caniatáu i\'r ystafell hon gael ei chanfod trwy chwilio cyfeiriadur ystafelloedd cyhoeddus %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Gweladwy yn y cyfeiriadur ystafelloedd cyhoeddus"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Unrhyw un"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Pwy all ddarllen hanes"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Yn aelodau ond dim ond ers cael eu gwahodd"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Yn aelodau dim ond ers dewis y dewis hwn"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill.
 Gallwch ddewis cyhoeddi eich ystafell yng ngweinydd cartref eich cyfeiriadur ystafelloedd cyhoeddus."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Cyhoeddi ystafell"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill.
-Mae angen y cyfeiriad hefyd i wneud yr ystafell yn weladwy yng nghyfeiriadur ystafell gyhoeddus %1$s."</string>
-  <string name="screen_security_and_privacy_title">"Diogelwch a phreifatrwydd"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Gofyn i gael ymuno"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Amgryptiad"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Unrhyw un"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Gwelededd yr ystafell"</string>
-</resources>
\ No newline at end of file
+  <string name="screen_security_and_privacy_title">"Diogelwch a phreifatrwydd"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-da/translations.xml b/features/securityandprivacy/impl/src/main/res/values-da/translations.xml
index 1a8a9046b6..46a20980bd 100644
--- a/features/securityandprivacy/impl/src/main/res/values-da/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-da/translations.xml
@@ -4,33 +4,31 @@
   <string name="screen_edit_room_address_title">"Rummets adresse"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Tilføj adresse på rum"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle kan bede om at deltage i lokalet, men en administrator eller moderator skal acceptere anmodningen."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Spørg om at deltage"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktivér kryptering"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Når det først er aktiveret, kan kryptering for et rum ikke deaktiveres igen. Beskedhistorik vil kun være synlig for rummedlemmer, siden de blev inviteret, eller siden de blev medlem af rummet.
 Ingen udover medlemmer af rummet vil være i stand til at læse beskeder. Dette kan forhindre bots og broer i at fungere korrekt.
 Vi anbefaler ikke at aktivere kryptering for rum, som alle kan finde og deltage i."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Aktivér kryptering?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Når kryptering først er aktiveret, kan den ikke deaktiveres igen."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Aktivér end-to-end-kryptering"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Alle kan finde og deltage"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Enhver"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Andre kan kun deltage, hvis de bliver inviteret"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun med invitation"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Adgang til rummet"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Grupper understøttes ikke i øjeblikket"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer af gruppen"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Du skal bruge en adresse til rummet, for at gøre den synlig i rum-registeret."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Grupper understøttes ikke i øjeblikket"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du skal bruge en rum-adresse for at gøre den synlig i kataloget."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillad, at dette rum kan findes ved at søge i %1$s fortegnelse over offentlige rum"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i det offentlige register over rum"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Enhver"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Hvem kan læse historikken?"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Kun medlemmer, efter de blev inviteret"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kun medlemmer siden valg af denne mulighed"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Rum-adresser er en måde at finde og få adgang til værelser på. Dette sikrer også, at du nemt kan dele dit rum med andre.
 Du kan vælge at offentliggøre dit rum i din hjemmeservers offentlige katalog over rum."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Udgivelse af rum"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Rum-adresser er måder at finde og få adgang til rum på. Dette sikrer også, at du nemt kan dele dit rum med andre.
-Adressen er også påkrævet for at gøre rummet synligt i det %1$s offentlige register."</string>
   <string name="screen_security_and_privacy_title">"Sikkerhed og privatliv"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Spørg om at deltage"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Enhver"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Rummets synlighed"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-de/translations.xml b/features/securityandprivacy/impl/src/main/res/values-de/translations.xml
index cc311a70f4..c37481560d 100644
--- a/features/securityandprivacy/impl/src/main/res/values-de/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-de/translations.xml
@@ -4,35 +4,33 @@
   <string name="screen_edit_room_address_title">"Chat-Adresse"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Chat-Adresse hinzufügen"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Jeder kann den Beitritt zum Chat anfragen, aber ein Admin oder Moderator müssen die Anfrage akzeptieren."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Beitritt beantragen"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, Verschlüsselung aktivieren"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Einmal angeschaltet kann die Verschlüsselung für einen Chat nicht mehr deaktiviert werden. Der Nachrichtenverlauf ist für Mitglieder nur sichtbar, seit sie eingeladen wurden oder dem Chat beigetreten sind.
 Niemand außer den Chat Mitgliedern kann Nachrichten lesen. Dies kann verhindern, dass Bots und Bridges richtig funktionieren.
 Wir empfehlen keine Verschlüsselung für Chats zu aktivieren, die jeder finden und denen jeder beitreten darf."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Verschlüsselung aktivieren?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Einmal angeschaltet kann die Verschlüsselung nicht mehr deaktiviert werden."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Verschlüsselung"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Ende-zu-Ende-Verschlüsselung aktivieren"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Jeder kann diesen Chat finden und ihm beitreten"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Alle"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Jeder"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Personen können nur beitreten, wenn sie eingeladen werden."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Nur auf Einladung"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Chat Zugang"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spaces werden zur Zeit nicht unterstützt."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Spacemitglieder"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spaces werden zur Zeit nicht unterstützt."</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Du benötigst eine Chat-Adresse, um den Chat im Verzeichnis sichtbar zu machen."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Chatroomadresse"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Erlaube das Auffinden dieses Chats durch Suche im öffentlichen Verzeichnis von %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Sichtbar im öffentlichen Verzeichnis"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Jeder"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Wer hat Zugriff auf den Nachrichtenverlauf"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Nur Mitglieder, aber erst seit deren Einladung"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Nur Mitglieder seit Auswahl dieser Option"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Chat-Adressen machen es möglich, Chats zu finden und ihnen beizutreten. Dies erleichtert es, Chats mit anderen zu teilen.
 Auf Wunsch kannst du deinen Chat im öffentlichen Verzeichnis deines Homeservers veröffentlichen."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Veröffentlichung von Chats"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Chat-Adressen machen es möglich, Chats zu finden und ihnen beizutreten. Dies erleichtert es, Chats mit anderen zu teilen.
-Die Adresse ist auch erforderlich, um den Chat im öffentlichen Verzeichnis von %1$s zu veröffentlichen."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Chatroomsichtbarkeit."</string>
   <string name="screen_security_and_privacy_title">"Sicherheit &amp; Datenschutz"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Beitritt beantragen"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Verschlüsselung"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Jeder"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">" Sichtbarkeit des Chats"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-el/translations.xml b/features/securityandprivacy/impl/src/main/res/values-el/translations.xml
index 8e2f0ad361..1946bae8b2 100644
--- a/features/securityandprivacy/impl/src/main/res/values-el/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-el/translations.xml
@@ -4,34 +4,31 @@
   <string name="screen_edit_room_address_title">"Διεύθυνση αίθουσας"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Προσθήκη διεύθυνσης αίθουσας"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Οποιοσδήποτε μπορεί να ζητήσει να συμμετάσχει στην αίθουσα, αλλά ένας διαχειριστής ή συντονιστής θα πρέπει να αποδεχτεί το αίτημα."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Αίτημα συμμετοχής"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ναι, ενεργοποιήστε την κρυπτογράφηση"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Μόλις ενεργοποιηθεί, η κρυπτογράφηση για μια αίθουσα δεν μπορεί να απενεργοποιηθεί, το ιστορικό μηνυμάτων θα είναι ορατό μόνο για τα μέλη της αίθουσας από τότε που προσκλήθηκαν ή από τότε που συμμετείχαν στην αίθουσα.
 Κανείς άλλος εκτός από τα μέλη της αίθουσας δεν θα μπορεί να διαβάσει τα μηνύματα. Αυτό μπορεί να εμποδίσει τη σωστή λειτουργία των bots και των γεφυρών.
 Δεν συνιστούμε την ενεργοποίηση της κρυπτογράφησης για αίθουσες που μπορεί να βρει και να συμμετάσχει ο καθένας."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Ενεργοποίηση κρυπτογράφησης;"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Μόλις ενεργοποιηθεί, η κρυπτογράφηση δεν μπορεί να απενεργοποιηθεί."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Κρυπτογράφηση"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Ενεργοποίηση κρυπτογράφησης από άκρο σε άκρο"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Οποιοσδήποτε μπορεί να βρει και να συμμετάσχει"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Οποιοσδήποτε"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Τα άτομα μπορούν να συμμετάσχουν μόνο εάν έχουν προσκληθεί"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Μόνο πρόσκληση"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Πρόσβαση στην αίθουσα"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Οι χώροι δεν υποστηρίζονται προς το παρόν"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Μέλη χώρου"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Θα χρειαστείτε μια διεύθυνση αίθουσας για να την κάνετε ορατή στον κατάλογο αιθουσών."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Οι χώροι δεν υποστηρίζονται προς το παρόν"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Θα χρειαστείτε μια διεύθυνση αίθουσας για να την κάνετε ορατή στον κατάλογο."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Επιστρέψτε την εύρεση αυτής της αίθουσας με αναζήτηση στον κατάλογο %1$s δημοσίων αιθουσών"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Ορατή στον κατάλογο δημόσιων αιθουσών"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Οποιοσδήποτε"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Ποιος μπορεί να διαβάσει το ιστορικό"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Μόνο μέλη από τη στιγμή που προσκλήθηκαν"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Μόνο για μέλη μετά από αυτήν την επιλογή"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Οι διευθύνσεις αιθουσών είναι τρόποι εύρεσης και πρόσβασης σε αίθουσες. Αυτό διασφαλίζει επίσης ότι μπορείτε εύκολα να μοιραστείτε την αίθουσα με άλλους.
 Μπορείτε να επιλέξετε να δημοσιεύσετε την αίθουσά σας στον δημόσιο κατάλογο αιθουσών του αρχικού διακομιστή σας."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Δημοσίευση αίθουσας"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Οι διευθύνσεις αιθουσών είναι τρόποι εύρεσης και πρόσβασης σε αίθουσες. Αυτό εξασφαλίζει επίσης ότι μπορείτε εύκολα να μοιραστείτε την αίθουσα με άλλους.
-Η διεύθυνση απαιτείται επίσης για να γίνει η αίθουσα ορατή στον δημόσιο κατάλογο αιθουσών %1$s."</string>
   <string name="screen_security_and_privacy_title">"Ασφάλεια &amp; απόρρητο"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Αίτημα συμμετοχής"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Κρυπτογράφηση"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Οποιοσδήποτε"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Ορατότητα αίθουσας"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-es/translations.xml b/features/securityandprivacy/impl/src/main/res/values-es/translations.xml
index 912ab9db68..2799d9d196 100644
--- a/features/securityandprivacy/impl/src/main/res/values-es/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-es/translations.xml
@@ -4,33 +4,31 @@
   <string name="screen_edit_room_address_title">"Dirección de la sala"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Agregar dirección de sala"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Cualquiera puede solicitar unirse a la sala, pero un administrador o moderador tendrá que aceptar la solicitud."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Solicitud para unirse"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sí, activar cifrado"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Una vez activado, el cifrado de una sala no se puede desactivar. El historial de mensajes solo será visible para los miembros de la sala desde que fueron invitados o desde que se unieron a la sala.
 Nadie más que los miembros de la sala podrán leer los mensajes. Esto puede impedir que los bots y los puentes funcionen correctamente.
 No recomendamos habilitar el cifrado para las salas que cualquiera pueda encontrar y unirse."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"¿Activar cifrado?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Una vez activado, el cifrado no se puede desactivar."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Cifrado"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Activar el cifrado de extremo a extremo"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Cualquiera puede encontrarla y unirse"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Cualquiera"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Las personas solo pueden unirse si están invitadas"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Solo por invitación"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Acceso a la sala"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"No se admiten los espacios por el momento."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Miembros del espacio"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Necesitarás una dirección de sala para que esta sea visible en el directorio de salas."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"No se admiten los espacios por el momento."</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Necesitarás una dirección de sala para que sea visible en el directorio."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permite encontrar esta sala buscando en el directorio de salas públicas de %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible en el directorio de salas públicas"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Cualquiera"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Quién puede leer el historial"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Solo participantes desde que fueron invitados"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Solo participantes desde que se selecciona esta opción"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Las direcciones de sala son formas de buscar salas y acceder a ellas. Esto también garantiza que puedas compartir fácilmente tu sala con otras personas.
 Puedes optar por publicar tu sala en el directorio de salas públicas de tu servidor base."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicación de la sala"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Las direcciones de sala son un medio para buscar y acceder a salas. También te permiten compartir fácilmente tu sala con otras personas.
-La dirección también es necesaria para hacer visible la sala en el directorio de salas públicas de %1$s."</string>
   <string name="screen_security_and_privacy_title">"Seguridad y privacidad"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Solicitud para unirse"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Cifrado"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Cualquiera"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidad de la sala"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-et/translations.xml b/features/securityandprivacy/impl/src/main/res/values-et/translations.xml
index 77dd390f52..7e6cdec9c6 100644
--- a/features/securityandprivacy/impl/src/main/res/values-et/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-et/translations.xml
@@ -2,39 +2,36 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_edit_room_address_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade avalikus kataloogis, vajab ta aadressi."</string>
   <string name="screen_edit_room_address_title">"Muuda aadressi"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Lisa jututoa aadress"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kõik võivad paluda jututoaga liitumist, kuid peakasutaja peab sellega nõustuma."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Lisa aadress"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kõik võivad paluda jututoaga liitumist."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Küsi võimalust liitumiseks"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Jah, lülita krüptimine sisse"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Kui jututoa krüptimine on kord sisse lülitatud, siis seda välja lülitada ei saa. Sõnumite ajalugu on nähtav vaid jututoa liikmetele alates kutse saamise või liitumise hetkest.
 Keegi teine peale jututoa liikmete ei saa sõnumeid lugeda. See võib takistada suhtlusrobotite ja/või võrgusildade toimimist.
 Me ei soovita krüptimise kasutamist selliste avalike jututubade puhul, millega kõik võivad liituda."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Kas võtame krüptimise kasutusele?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Kui krüptimine on kasutusel, siis seda enam väljalülitada ei saa."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Krüptimine"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Võta läbiv krüptimine kasutusele"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kõik võivad jututoaga liituda"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Avalik"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kõik"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Liituda saab vaid kutse olemasolul"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Privaatne"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vaid kutsega"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Ligipääs"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Kogukondade tugi veel puudub"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Kogukonna liikmed"</string>
-  <string name="screen_security_and_privacy_room_address_description">"Et jututuba oleks nähtav avalikus kataloogis, peab tal olema aadress."</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade kataloogis, vajab ta aadressi."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Avaldatud aadress"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Kogukondade tugi veel puudub"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade avalikus kataloogis, vajab ta aadressi."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Aadress"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Võimalda leida seda jututuba avalikust kataloogist otsides „%1$s“"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Luba leitavus avaliku kataloogi otsingust."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Nähtav avalikus kataloogis"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kõik"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kes võivad lugeda jututoa ajalugu"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Liikmed peale kutse saamist"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Liikmed peale selle valiku sisselülitamist"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Jututoa aadressid annavad võimaluse neid leida ning saada neile ligi. Samuti võimaldab see jututuba teistele huvilistele jagada.
 Lisaks võid sa jututoa avaldada oma koduserveri avalikus jututubade kataloogis."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Jututoa avaldamine"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Jututoa aadressid annavad võimaluse neid leida ning saada neile ligi. Samuti võimaldab see jututuba teistele huvilistele jagada.
-Lisaks on aadress vajalik, et jututuba oleks %1$s serveri avalikus jututubade kataloogis nähtav."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Nähtavus"</string>
   <string name="screen_security_and_privacy_title">"Turvalisus ja privaatsus"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Küsi võimalust liitumiseks"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Krüptimine"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kõik"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Jututoa nähtavus"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-eu/translations.xml b/features/securityandprivacy/impl/src/main/res/values-eu/translations.xml
index d7758c1f81..c66b6769ce 100644
--- a/features/securityandprivacy/impl/src/main/res/values-eu/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-eu/translations.xml
@@ -3,20 +3,20 @@
   <string name="screen_edit_room_address_title">"Gelaren helbidea"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Gehitu gelaren helbidea"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Bai, gaitu zifratzea"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Zifratzea"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Edonork aurkitu eta bat egin dezake"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Edonork"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Gonbidatutako pertsonak bakarrik sartu ahal izango dira"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Gonbidapen bidez"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Gelarako sarbidea"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Gaur-gaurkoz ez da guneekin bateragarria"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Guneko kideak"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Gelarako helbideren bat beharko duzu gelen direktorioan ikusgai egon dadila nahi baduzu."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Gaur-gaurkoz ez da guneekin bateragarria"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Gelaren helbidea"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Gela publikoen direktorioan ikusgai"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Edonork"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Nork irakur dezake historia"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Kideek bakarrik, gonbidatu zituztenetik"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kideek bakarrik, aukera hau hautatu zenetik"</string>
-  <string name="screen_security_and_privacy_title">"Segurtasuna eta pribatutasuna"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Zifratzea"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Edonork"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Gelaren ikusgarritasuna"</string>
-</resources>
\ No newline at end of file
+  <string name="screen_security_and_privacy_title">"Segurtasuna eta pribatutasuna"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-fa/translations.xml b/features/securityandprivacy/impl/src/main/res/values-fa/translations.xml
index d3e96712de..8cfa4147b5 100644
--- a/features/securityandprivacy/impl/src/main/res/values-fa/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-fa/translations.xml
@@ -2,21 +2,21 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_edit_room_address_title">"نشانی اتاق"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"افزودن نشانی اتاق"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"درخواست دعوت"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"بله. به کار انداختن رمزنگاری"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"رمزگذاری فعال شود؟"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"پس از به کار افتادن، رمزنگاری قابل از کار انداختن نیست."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"رمزنگاری"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"هرکسی می‌تواند یافته و بپیوندد"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"هرکسی"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"افراد فقط در صورت دعوت می‌توانند بپیوندند"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"فقط دعوتی"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"دسترسی اتاق"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"در حال حاضر فضاها پشتیبانی نمی‌شوند"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"اعضای فضا"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"در حال حاضر فضاها پشتیبانی نمی‌شوند"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"نشانی اتاق"</string>
-  <string name="screen_security_and_privacy_room_publishing_section_header">"انتشار اتاق"</string>
-  <string name="screen_security_and_privacy_title">"امنیت و محرمانگی"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"درخواست دعوت"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"رمزنگاری"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"هرکسی"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"انتشار اتاق"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"نمایانی اتاق"</string>
-</resources>
\ No newline at end of file
+  <string name="screen_security_and_privacy_title">"امنیت و محرمانگی"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-fi/translations.xml b/features/securityandprivacy/impl/src/main/res/values-fi/translations.xml
index 87440b626a..0f42d87675 100644
--- a/features/securityandprivacy/impl/src/main/res/values-fi/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-fi/translations.xml
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Tarvitset huoneen osoitteen, jotta se näkyy hakemistossa."</string>
-  <string name="screen_edit_room_address_title">"Huoneen osoite"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Lisää huoneen osoite"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kuka tahansa voi pyytää saada liittyä huoneeseen, mutta ylläpitäjän tai valvojan on hyväksyttävä pyyntö."</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Tarvitset osoitteen, jotta se näkyy julkisessa hakemistossa."</string>
+  <string name="screen_edit_room_address_title">"Muokkaa osoitetta"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Lisää osoite"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kaikkien on pyydettävä pääsyä."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pyydä liittymistä"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Kyllä, ota salaus käyttöön"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä. Viestihistoria näkyy vain huoneen jäsenille kutsusta tai liittymisestä lähtien.
 Kukaan muu kuin huoneen jäsenet eivät pysty lukemaan viestejä. Tämä voi estää botteja tai siltoja toimimasta oikein.
 Emme suosittele salauksen ottamista käyttöön huoneissa, jotka kuka tahansa voi löytää ja joihin kuka tahansa voi liittyä."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Otetaanko salaus käyttöön?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Salaus"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Ota päästä päähän -salaus käyttöön"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kuka tahansa voi löytää ja liittyä."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kuka tahansa voi liittyä."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kuka tahansa"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vain kutsutut henkilöt voivat liittyä"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vain kutsutut henkilöt voivat liittyä."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vain kutsutut"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Huoneeseen pääsy"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Tiloja ei tällä hetkellä tueta"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Pääsy"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Tilan jäsenet"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Tarvitset huoneen osoitteen, jotta se näkyy huonehakemistossa."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Huoneen osoite"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Tiloja ei tällä hetkellä tueta"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Tarvitset osoitteen, jotta se näkyy julkisessa hakemistossa."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Osoite"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Salli tämän huoneen löytäminen hakemalla %1$s -palvelimen julkisesta huonehakemistosta."</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Näkyy julkisessa huonehakemistossa"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Anna muiden löytää tämä julkisen hakemiston kautta."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Näkyy julkisessa hakemistossa"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kuka tahansa"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kuka voi lukea viestihistoriaa"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Jäsenet vasta kutsusta lähtien"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Jäsenet tämän vaihtoehdon valinnan jälkeen"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Huoneosoitteet ovat tapoja löytää ja käyttää huoneita. Näin voit myös helposti jakaa huoneesi muiden kanssa.
 Voit halutessasi julkaista huoneesi kotipalvelimesi julkisessa huonehakemistossa."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Huoneen julkaiseminen"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Huoneosoitteet ovat tapoja löytää ja käyttää huoneita. Näin voit myös helposti jakaa huoneesi muiden kanssa.
-Osoitetta tarvitaan myös, jotta huone näkyy %1$s -palvelimen julkisessa huonehakemistossa."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Näkyvyys"</string>
   <string name="screen_security_and_privacy_title">"Turvallisuus ja yksityisyys"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pyydä liittymistä"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Salaus"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kuka tahansa"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Huoneen näkyvyys"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-fr/translations.xml b/features/securityandprivacy/impl/src/main/res/values-fr/translations.xml
index 7a4be5d37a..754ef4cd1a 100644
--- a/features/securityandprivacy/impl/src/main/res/values-fr/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-fr/translations.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Vous aurez besoin d\'une adresse de salon pour le rendre visible dans le répertoire."</string>
-  <string name="screen_edit_room_address_title">"Adresse du salon"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Ajouter l\'adresse du salon"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"N\'importe qui peut demander à rejoindre le salon, mais un administrateur ou un modérateur devra accepter la demande."</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Vous aurez besoin d’une adresse pour le rendre visible dans l’annuaire public."</string>
+  <string name="screen_edit_room_address_title">"Modifier l’adresse"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Ajouter une adresse"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Tout le monde doit demander un accès."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Demander à rejoindre"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Oui, activer le chiffrement"</string>
-  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Une fois activé, le chiffrement d\'un salon ne peut pas être désactivé. L\'historique des messages ne sera visible que pour les membres depuis qu\'ils ont été invités ou depuis qu\'ils ont rejoint le salon.
-Personne d\'autre que les membres du salon ne pourra lire les messages. Cela peut empêcher les bots et les bridges de fonctionner correctement.
-Nous ne recommandons pas d\'activer le chiffrement pour les salons que tout le monde peut trouver et rejoindre."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Une fois activé, le chiffrement d’un salon ne peut pas être désactivé. L’historique des messages ne sera visible que pour les membres depuis qu’ils ont été invités ou depuis qu’ils ont rejoint le salon.
+Personne d’autre que les membres du salon ne pourra lire les messages. Cela peut empêcher les bots et les bridges de fonctionner correctement.
+Nous ne recommandons pas d’activer le chiffrement pour les salons que tout le monde peut trouver et rejoindre."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Activer le chiffrement ?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Une fois activé, le chiffrement ne peut pas être désactivé."</string>
-  <string name="screen_security_and_privacy_encryption_toggle_title">"Activer le chiffrement de bout en bout"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Tout le monde peut le trouver et le rejoindre"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Tout le monde"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Le salon ne peut être joint que par les personnes invitées"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Sur invitation uniquement"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Accès au salon"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Les Espaces ne sont pas encore supportés"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membres de l\'espace"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Vous aurez besoin de l\'adresse du salon pour le rendre visible dans le répertoire des salons."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Adresse du salon"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Autoriser le salon à apparaître dans les résultats de recherche dans le répertoire %1$s des salons publics"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible dans le répertoire des salons publics"</string>
-  <string name="screen_security_and_privacy_room_history_section_header">"Qui peux lire l\'historique"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Les membres uniquement depuis qu\'ils ont été invités"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Les membres uniquement depuis la sélection de cette option"</string>
-  <string name="screen_security_and_privacy_room_publishing_section_footer">"Les adresses de salon sont un moyen de trouver et d\'accéder aux salons. Cela vous permet également de partager facilement votre salon avec d\'autres personnes.
-Vous pouvez choisir de publier votre salon dans l\'annuaire des salons publics de votre serveur d’accueil."</string>
-  <string name="screen_security_and_privacy_room_publishing_section_header">"Publication du salon"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Les adresses de salon sont un moyen de trouver et d\'accéder aux salons. Cela vous permet également de partager facilement votre salon avec d\'autres personnes.
-L\'adresse est également requise pour que le salon soit visible dans le répertoire %1$s des salons publics."</string>
-  <string name="screen_security_and_privacy_title">"Sécurité &amp; confidentialité"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Demander à rejoindre"</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Chiffrement"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Activer le chiffrement de bout en bout"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Tout le monde peut rejoindre."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Tout le monde"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Seules les personnes invitées peuvent rejoindre."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Sur invitation uniquement"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Accès"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membres de l’espace"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Les Espaces ne sont pas encore supportés"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Vous aurez besoin d’une adresse pour le rendre visible dans l’annuaire public."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresse"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Autoriser le salon à apparaître dans les résultats de recherche dans le répertoire %1$s des salons publics"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Permet d’être trouvé en recherchant dans l’annuaire public."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible dans l’annuaire public"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Tout le monde"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilité du salon"</string>
-</resources>
\ No newline at end of file
+  <string name="screen_security_and_privacy_room_history_section_header">"Qui peux lire l’historique"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Les membres uniquement depuis qu’ils ont été invités"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Les membres uniquement depuis la sélection de cette option"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Les adresses de salon sont un moyen de trouver et d’accéder aux salons. Cela vous permet également de partager facilement votre salon avec d’autres personnes.
+Vous pouvez choisir de publier votre salon dans l’annuaire des salons publics de votre serveur d’accueil."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publication du salon"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Les adresses permettent de trouver et d’accéder aux salons et aux espaces. Elles facilitent également leur partage avec d’autres personnes."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilité"</string>
+  <string name="screen_security_and_privacy_title">"Sécurité &amp; confidentialité"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-hu/translations.xml b/features/securityandprivacy/impl/src/main/res/values-hu/translations.xml
index b32923dba6..503fdc8efe 100644
--- a/features/securityandprivacy/impl/src/main/res/values-hu/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-hu/translations.xml
@@ -2,39 +2,36 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_edit_room_address_room_address_section_footer">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
   <string name="screen_edit_room_address_title">"Cím szerkesztése"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Szobacím hozzáadása"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Bárki kérhet hozzáférést, de a kérést egy adminisztrátornak kell jóváhagynia."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Cím hozzáadása"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Mindenkinek hozzáférést kell kérnie."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Csatlakozás kérése"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Igen, engedélyezze a titkosítást"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Az engedélyezés után a szoba titkosítása nem tiltható le. Az üzenetek előzményei csak a szobatagok számára láthatók, amikor meghívást kaptak, vagy mióta csatlakoztak a szobához.
 A szobatagokon kívül senki sem tudja olvasni az üzeneteket. Ez megakadályozhatja a botok és a hidak megfelelő működését.
 Nem javasoljuk a titkosítás engedélyezését az olyan szobákban, amelyeket bárki megtalálhat és csatlakozhat."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Engedélyezi a titkosítást?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Engedélyezés után a titkosítás nem tiltható le."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Titkosítás"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Végpontok közötti titkosítás engedélyezése"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Bárki csatlakozhat."</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Nyilvános"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Bárki"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Csak a meghívott emberek léphetnek be."</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Privát"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Csak meghívásos"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Hozzáférés"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"A terek jelenleg nem támogatottak"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"A tér tagjai"</string>
-  <string name="screen_security_and_privacy_room_address_description">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Szüksége lesz egy szobacímre, hogy láthatóvá váljon a szobakatalógusban."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Közzétett cím"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"A terek jelenleg nem támogatottak"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Cím"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"A szoba megtalálhatóvá tétele a(z) %1$s nyilvános szobakatalógusában való kereséssel."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Lehetővé teszi, hogy a nyilvános szobakatalógusban megtalálható legyen."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Látható a nyilvános szobakatalógusban"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Bárki"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Ki olvashatja az előzményeket"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Csak a tagok, a meghívásuktól kezdődően"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Csak a tagok, a beállítás választásától kezdődően"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"A szobacímek a szobák megtalálásának és elérésnek módjai. Ez azt is biztosítja, hogy könnyen megoszthatja a szobáját másokkal.
 Kiválaszthatja, hogy szobáját közzéteszi-e a Matrix-kiszolgáló nyilvános szobakatalógusában."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Szoba közzététele"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"A szobacímek a szobák megtalálásának és elérésnek módjai. Ez azt is biztosítja, hogy könnyen megoszthatja a szobáját másokkal.
-A cím szükséges ahhoz is, hogy a nyilvános szoba láthatóvá váljon a(z) %1$s kiszolgáló nyilvános szobakatalógusában."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Láthatóság"</string>
   <string name="screen_security_and_privacy_title">"Biztonság és adatvédelem"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Csatlakozás kérése"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Titkosítás"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Bárki"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Szoba láthatósága"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-in/translations.xml b/features/securityandprivacy/impl/src/main/res/values-in/translations.xml
index 836ad66302..17f14057cb 100644
--- a/features/securityandprivacy/impl/src/main/res/values-in/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-in/translations.xml
@@ -4,32 +4,30 @@
   <string name="screen_edit_room_address_title">"Alamat ruangan"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Tambahkan alamat ruangan"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Siapa pun dapat meminta untuk bergabung dengan ruangan tetapi administrator atau moderator harus menerima permintaan tersebut."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Minta untuk bergabung"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ya, aktifkan enkripsi"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Setelah diaktifkan, encryption untuk sebuah ruangan tidak dapat dinonaktifkan, Riwayat pesan hanya akan terlihat oleh anggota ruangan sejak mereka diundang atau sejak mereka bergabung dengan ruangan tersebut.
 Tidak ada orang lain selain anggota ruangan yang dapat membaca pesan. Hal ini dapat mencegah bot dan jembatan bekerja dengan benar.
 Kami tidak menyarankan untuk mengaktifkan enkripsi untuk ruangan yang dapat ditemukan dan diikuti oleh siapa pun."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Aktifkan enkripsi?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Setelah diaktifkan, enkripsi tidak dapat dinonaktifkan."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Enkripsi"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Aktifkan enkripsi ujung ke ujung"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Siapa pun dapat menemukan dan bergabung"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Siapa pun"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Orang hanya dapat bergabung jika mereka diundang"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Hanya undangan"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Akses ruangan"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Space saat ini tidak didukung"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Anggota space"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Anda memerlukan alamat ruangan agar dapat membuatnya terlihat di direktori ruangan."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Space saat ini tidak didukung"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Anda akan memerlukan alamat ruangan untuk membuatnya terlihat dalam direktori."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Izinkan ruangan ini ditemukan dengan mencari direktori ruangan %1$s publik"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Terlihat di direktori ruangan publik"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Siapa pun"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Siapa yang bisa membaca riwayat"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Hanya anggota sejak mereka diundang"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Hanya anggota sejak memilih opsi ini"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Alamat ruangan adalah cara untuk menemukan dan mengakses ruangan. Ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain. Anda dapat memilih untuk menerbitkan ruangan Anda di direktori ruangan publik homeserver Anda."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Penerbitan ruangan"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Alamat ruangan adalah cara untuk menemukan dan mengakses ruangan. Hal ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain.
-Alamat ini juga diperlukan untuk membuat ruangan terlihat di %1$s direktori ruangan publik."</string>
   <string name="screen_security_and_privacy_title">"Keamanan &amp; privasi"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Minta untuk bergabung"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Enkripsi"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Siapa pun"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Keterlihatan ruangan"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-it/translations.xml b/features/securityandprivacy/impl/src/main/res/values-it/translations.xml
index 2148691b24..2854a69ce1 100644
--- a/features/securityandprivacy/impl/src/main/res/values-it/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-it/translations.xml
@@ -1,37 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Avrai bisogno di un indirizzo della stanza per renderla visibile nell\'elenco."</string>
-  <string name="screen_edit_room_address_title">"Indirizzo della stanza"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Aggiungi l\'indirizzo della stanza"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Chiunque può chiedere di entrare nella stanza, ma un amministratore o un moderatore dovrà accettare la richiesta."</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Per renderlo visibile nell\'elenco pubblico, avrai bisogno di un indirizzo."</string>
+  <string name="screen_edit_room_address_title">"Modifica indirizzo"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Aggiungi indirizzo"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Chiunque deve richiedere l\'accesso."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Chiedi di entrare"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sì, attiva la crittografia"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Una volta attivata, la crittografia di una stanza non può essere disattivata, la cronologia dei messaggi sarà visibile solo ai membri della stanza da quando sono stati invitati o da quando sono entrati nella stanza.
 Nessuno, oltre ai membri della stanza, sarà in grado di leggere i messaggi. Ciò potrebbe impedire ai bot e ai bridge di funzionare correttamente.
 Non consigliamo di attivare la crittografia per le stanze che chiunque può trovare e in cui può entrare."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Attivare la crittografia?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Una volta attivata, la crittografia non può essere disattivata."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Crittografia"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Attiva la crittografia end-to-end"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Chiunque può trovare ed entrare"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Chiunque può partecipare."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Chiunque"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Le persone possono partecipare solo se invitate"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Solo le persone invitate possono entrare."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Solo su invito"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Accesso alla stanza"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Gli spazi non sono attualmente supportati"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Accesso"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membri dello spazio"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Per rendere visibile la stanza nell\'elenco delle stanze, è necessario l\'indirizzo della stanza."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Indirizzo della stanza"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Gli spazi non sono attualmente supportati"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Per renderlo visibile nell\'elenco pubblico, avrai bisogno di un indirizzo."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Indirizzo"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Consenti la ricerca di questa stanza effettuando una ricerca nell\'elenco delle stanze pubbliche di %1$s"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visibile nell\'elenco delle stanze pubbliche"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Consenti di essere trovato effettuando una ricerca nell\'elenco pubblico."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visibile nell\'elenco pubblico"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Chiunque"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Chi può leggere la cronologia messaggi"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Solo membri da quando sono stati invitati"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Solo membri da dopo aver selezionato questa opzione"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Gli indirizzi delle stanze sono modi per trovare e accedervi. In questo modo puoi anche condividere facilmente la tua stanze con altri.
 Puoi scegliere di pubblicare la tua stanza nell\'elenco delle stanza pubbliche dell\'homeserver."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Pubblicazione della stanza"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Gli indirizzi delle stanze sono modi per trovare e accedere a queste ultime. Questo assicura anche che tu possa condividere facilmente la tua stanza con altri. L\'indirizzo è anche necessario per rendere la stanza visibile in %1$s nell\'elenco delle stanze pubbliche."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Gli indirizzi sono un modo per trovare e accedere a stanze e spazi. Questo ti consente anche di condividerli facilmente con altri."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilità"</string>
   <string name="screen_security_and_privacy_title">"Sicurezza e privacy"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Chiedi di entrare"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Crittografia"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Chiunque"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilità della stanza"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-ko/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ko/translations.xml
index b144b6bdde..8afa1987eb 100644
--- a/features/securityandprivacy/impl/src/main/res/values-ko/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-ko/translations.xml
@@ -4,33 +4,31 @@
   <string name="screen_edit_room_address_title">"방 주소"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"방 주소 추가"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"누구나 방에 참여 요청을 할 수 있지만, 관리자나 운영자가 요청을 수락해야 합니다."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"참가 요청"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"예, 암호화 활성화"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"일단 활성화되면, 방의 암호화는 비활성화할 수 없습니다. 메시지 기록은 방에 초대된 후 또는 방에 참여한 이후부터 방 구성원만 볼 수 있습니다.
 방 구성원 외에는 아무도 메시지를 읽을 수 없습니다. 이로 인해 봇과 브리지가 제대로 작동하지 않을 수 있습니다.
 누구나 찾고 참여할 수 있는 방에는 암호화를 활성화하지 않는 것이 좋습니다."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"암호화 활성화?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"일단 활성화되면, 암호화는 비활성화할 수 없습니다."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"암호화"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"종단간 암호화 활성화"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"누구나 찾을 수 있고 참여할 수 있습니다."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"누구나"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"초대받은 사용자만 가입할 수 있습니다."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"초대 전용"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"방 액세스"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"스페이스는 현재 지원되지 않습니다"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"스페이스 멤버들"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"방 디렉토리에 표시하려면 방 주소가 필요합니다."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"스페이스는 현재 지원되지 않습니다"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"디렉토리에 표시하려면 방 주소가 필요합니다."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"%1$s 공개 방 디렉토리에서 이 방을 검색할 수 있도록 허용합니다"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"공개 룸 디렉토리에 표시됨"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"누구나"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"누가 기록을 읽을 수 있는가"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"초대받은 회원만 이용 가능합니다"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"이 옵션을 선택한 회원만 이용 가능합니다."</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"방 주소는 방을 찾고 액세스하는 방법입니다. 이를 통해 다른 사람들과 방을 쉽게 공유할 수 있습니다.
 홈서버의 공개 방 디렉토리에 방을 공개할지 여부를 선택할 수 있습니다."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"방 게시"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"방 주소는 방을 찾고 액세스하는 방법입니다. 또한 이 주소를 사용하면 다른 사람들과 방을 쉽게 공유할 수 있습니다.
-%1$s 의 공개 방 디렉토리에서 방을 표시하려면 이 주소도 필요합니다."</string>
   <string name="screen_security_and_privacy_title">"보안 및 개인정보 보호"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"참가 요청"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"암호화"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"누구나"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"방 표시 여부"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-nb/translations.xml b/features/securityandprivacy/impl/src/main/res/values-nb/translations.xml
index 02f2163c51..2d0f8db8a5 100644
--- a/features/securityandprivacy/impl/src/main/res/values-nb/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-nb/translations.xml
@@ -4,33 +4,31 @@
   <string name="screen_edit_room_address_title">"Romadresse"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Legg til romadresse"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle kan be om å bli med i rommet, men en administrator eller moderator må godta forespørselen."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Be om å bli med"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktiver kryptering"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Når kryptering for et rom er aktivert, kan den ikke deaktiveres. Meldingshistorikken vil bare være synlig for rommedlemmer siden de ble invitert eller siden de ble med i rommet.
 Ingen andre enn rommedlemmene vil kunne lese meldingene. Dette kan føre til at bots og broer ikke fungerer som de skal.
 Vi anbefaler ikke å aktivere kryptering for rom som hvem som helst kan finne og bli med i."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Vil du aktivere kryptering?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Når kryptering er aktivert, kan det ikke deaktiveres."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Aktiver ende-til-ende-kryptering"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Alle kan finne og bli med"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Alle"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Folk kan bare bli med hvis de er invitert"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun for inviterte"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Tilgang til rom"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Områder støttes ikke for øyeblikket"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer av område"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Du trenger en adresse til rommet for å gjøre rommet synlig i romkatalogen."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Områder støttes ikke for øyeblikket"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du trenger en adresse til rommet for å gjøre det synlig i katalogen."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillat at dette rommet blir funnet ved å søke %1$s offentlig romkatalog"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i offentlig romkatalog"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Alle"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Hvem kan lese historikk"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Medlemmer bare siden de ble invitert"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kun medlemmer siden du valgte dette alternativet"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Romadresser er måter å finne og få tilgang til rom på. Dette sikrer også at du enkelt kan dele rommet ditt med andre.
 Du kan velge å publisere rommet ditt i hjemeserverens offentlige romkatalog."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publisering av rom"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Romadresser er en måte å finne og få tilgang til rommene på. Dette sikrer også at du enkelt kan dele rommet ditt med andre.
-Adressen er også nødvendig for å gjøre rommet synlig i den offentlige romkatalogen på %1$s."</string>
   <string name="screen_security_and_privacy_title">"Sikkerhet og personvern"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Be om å bli med"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Alle"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Romsynlighet"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-nl/translations.xml b/features/securityandprivacy/impl/src/main/res/values-nl/translations.xml
index 3913599edb..5fdc9466b5 100644
--- a/features/securityandprivacy/impl/src/main/res/values-nl/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-nl/translations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Vraag om toe te treden"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Iedereen"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Iedereen"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml b/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml
index 8cad565318..11b8189cc4 100644
--- a/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml
@@ -4,35 +4,33 @@
   <string name="screen_edit_room_address_title">"Adres pokoju"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Dodaj adres pokoju"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Każdy może poprosić o dołączenie do pokoju, ale administrator lub moderator będzie musiał zatwierdzić żądanie."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Poproś o dołączenie"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Tak, włącz szyfrowanie"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po włączeniu szyfrowanie pokoju nie może zostać wyłączone, a historia wiadomości będzie widoczna tylko dla członków od momentu, w którym dołączyli lub zostali zaproszeni.
 Nikt poza członkami pokoju nie będzie mógł czytać wiadomości. Może to wpłynąć na prawidłowe działanie botów lub mostków.
 Odradzamy włączanie szyfrowania dla pokoi, które każdy może znaleźć i do których każdy może dołączyć."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Włączyć szyfrowanie?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Po włączeniu szyfrowania nie można wyłączyć."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Szyfrowanie"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Włącz szyfrowanie end-to-end"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Każdy może znaleźć i dołączyć"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Każdy"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Wszyscy"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Tylko osoby z zaproszeniem mogą dołączyć"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Tylko zaproszenie"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Dostęp do pokoju"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Przestrzenie nie są obecnie wspierane"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Członkowie przestrzeni"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Aby pokój był widoczny w katalogu pokoi, potrzebny jest adres pokoju."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Przestrzenie nie są obecnie wspierane"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Aby pokój był widoczny w katalogu, potrzebny jest adres pokoju."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adres pokoju"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Zezwól na znalezienie tego pokoju wyszukując %1$s w katalogu pokoi publicznych"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Widoczny w katalogu pokoi publicznych"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Wszyscy"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kto może czytać historię"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Od momentu kiedy członkowie zostali zaproszeni"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Członkowie od momentu włączenia tej opcji"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy pokoju umożliwiają łatwe znalezienie i dołączenie do pokojów.
 Również możesz się zdecydować na upublicznienie Twojego serwera w katalogu pokoi publicznych."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publikowanie pokoju"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy pokoju umożliwiają łatwe znalezienie i dołączenie do pokojów.
-Dodatkowo adres pokoju jest wymagany, aby pomieszczenie było widoczne w katalogu pokoi publicznych %1$s."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Widoczność pokoju"</string>
   <string name="screen_security_and_privacy_title">"Bezpieczeństwo i prywatność"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Poproś o dołączenie"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Szyfrowanie"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Wszyscy"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Widoczność pomieszczenia"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml b/features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml
index 980fb118fb..584e94dc20 100644
--- a/features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml
@@ -1,36 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Você precisará de um endereço de sala para torná-la visível no diretório."</string>
-  <string name="screen_edit_room_address_title">"Endereço da sala"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Adicionar endereço da sala"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Qualquer pessoa pode pedir para entrar na sala, mas um administrador ou moderador terá que aceitar o pedido."</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Você precisará de um endereço para torná-la visível no diretório."</string>
+  <string name="screen_edit_room_address_title">"Editar endereço"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Adicionar endereço"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Qualquer um pode pedir acesso, mas um administrador terá que aceitar o pedido."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para entrar"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sim, ativar a criptografia"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Uma vez ativada, a criptografia de uma sala não pode ser desativada. O histórico de mensagens só será visível para os membros da sala desde que foram convidados ou desde que entraram na sala.
 Ninguém além dos membros da sala poderá ler as mensagens. Isso pode impedir que os bots e as pontes funcionem corretamente.
 Não recomendamos que você ative a criptografia para salas que qualquer pessoa possa encontrar e participar."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Ativar a criptografia?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Uma vez ativada, a criptografia não poderá ser desativada."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Criptografia"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Ativar a criptografia de ponta a ponta"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer um pode encontrar e entrar"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"As pessoas só podem participar se forem convidadas"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Somente para convidados"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Acesso à sala"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"No momento, não há suporte aos espaços"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer um pode entrar"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Qualquer pessoa"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Apenas pessoas convidadas podem entrar."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Privado"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Acesso"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membros do espaço"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Você precisará de um endereço de sala para torná-la visível no diretório de salas."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"No momento, não há suporte aos espaços"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Você precisará de um endereço para torná-la visível no diretório."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Endereço publicado"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permitir que esta sala seja encontrada pesquisando diretório de salas públicas de %1$s"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório de salas públicas"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Permite que seja encontrada ao buscar no diretório público."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório público"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Qualquer pessoa"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Quem pode ler o histórico"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Somente membros, desde que foram convidados"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Somente para membros após selecionar esta opção"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhar facilmente sua sala com outras pessoas.
 Você pode optar por publicar sua sala no diretório público de salas do seu servidor-casa."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicação da sala"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhar facilmente sua sala com outras pessoas.
-O endereço também é necessário para que você possa ver a sala no diretório público de salas do %1$s."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhá-las facilmente com outras pessoas."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade"</string>
   <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para entrar"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Criptografia"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Qualquer pessoa"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade da sala"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-pt/translations.xml b/features/securityandprivacy/impl/src/main/res/values-pt/translations.xml
index cdf157ab11..26585dc4f9 100644
--- a/features/securityandprivacy/impl/src/main/res/values-pt/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-pt/translations.xml
@@ -4,35 +4,33 @@
   <string name="screen_edit_room_address_title">"Endereço da sala"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Adicionar endereço de sala"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Qualquer pessoa pode pedir para entrar na sala, mas um administrador ou moderador tem que aceitar o pedido."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para participar"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sim, ativar cifragem"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Uma vez ativada, a cifragem não pode ser desativada. O histórico de mensagens só será visível a membros a partir do momento em que foram convidados ou que entraram na sala.
 Ninguém além dos membros poderão ler quaisquer mensagens. Isto pode impedir que robôs (\"bots\") e pontes (\"bridges\") funcionem devidamente.
 Não recomendamos ativar a cifragem em salas que qualquer pessoa possa encontrar e entrar."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Ativar cifragem?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Uma vez ativada, a cifragem não pode ser desativada."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Cifragem"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Ativar cifragem ponta-a-ponta"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer pessoa pode encontrar a sala e entrar"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Qualquer pessoa"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Só é possível entrar tendo um convite"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Apenas por convite"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Acesso à sala"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Os espaços ainda não estão implementados"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membros do espaço"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Os espaços ainda não estão implementados"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"É necessário um endereço para tornar a sala visível no diretório."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Endereço da sala"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permite que esta sala seja encontrada através do diretório público do %1$s."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório público de salas"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Qualquer pessoa"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Quem pode ler o histórico de mensagens"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Apenas membros, desde o momento em que forem convidados"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Apenas membros, desde o memento em que esta opção for selecionada"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Estes endereços permitem encontrar e aceder a sala, bem como a sua fácil partilha com outros.
 Podes escolher publicar a sala no diretório público do teu servidor."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicar sala"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Estes endereços permitem encontrar e aceder a sala, bem como a sua fácil partilha com outros.
-Além disso, é necessário ter endereço para publicar a sala no diretório público do %1$s."</string>
-  <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para participar"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Cifragem"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Qualquer pessoa"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade da sala"</string>
-</resources>
\ No newline at end of file
+  <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml
index 2bd0e41582..213e35562d 100644
--- a/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml
@@ -4,33 +4,31 @@
   <string name="screen_edit_room_address_title">"Adresa camerei"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Adăugați adresa camerei"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Oricine poate cere să se alăture camerei, dar un administrator sau moderator va trebui să accepte cererea."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Cereți să vă alăturați"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Da, activați criptarea"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Odată activată, criptarea pentru o cameră nu poate fi dezactivată. Mesajele anterioare vor fi vizibile numai pentru membrii camerei de la momentul la care au fost invitați sau de la momentul la care s-au alăturat camerei. 
 Nimeni în afară de membrii camerei nu va putea citi messaje. Acest lucru poate împiedica funcționarea corectă a boților și a punților. 
 Nu recomandăm activarea criptării pentru camerele pe care oricine le poate găsi și la care se poate alătura."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Activați criptarea?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Odată activată, criptarea nu poate fi dezactivată."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Criptare"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Activați criptarea end-to-end"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Oricine poate găsi și alătura camerei"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Oricine"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Persoanele se pot alătura numai dacă invitate"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Doar pe bază de invitație"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Acces la cameră"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spațiile nu sunt momentan suportate."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membrii spațiului"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Veți avea nevoie de o adresă de cameră pentru a o face vizibilă în directorul de camere."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spațiile nu sunt momentan suportate."</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Veți avea nevoie de o adresă de cameră pentru a o face vizibilă în director."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permiteți găsirea acestei camere prin căutarea în directorul de camere publice al %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Vizibilă în directorul de camere publice"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Oricine"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Cine poate citi mesajele anterioare"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Doar pentru membri, de la momentul în care au fost invitați"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Doar pentru membri, după selectarea acestei opțiuni"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresele camerelor sunt modalități de a găsi și accesa camere. Acest lucru vă asigură, de asemenea, că puteți partaja cu ușurință camera dumneavoastră cu alte persoane.
 Puteți alege să publicați camera în directorul public al camerelor serverului dumneavoastră."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicare cameră"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresele camerelor sunt modalități de a găsi și accesa camerele. Acest lucru vă asigură, de asemenea, că puteți partaja cu ușurință camera dvs. cu alte persoane.
-Adresa este necesară și pentru ca camera să fie vizibilă în directorul public de camere al %1$s."</string>
   <string name="screen_security_and_privacy_title">"Securitate &amp; confidențialitate"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Cereți să vă alăturați"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Criptare"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Oricine"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Vizibilitatea camerei"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
index 1a54034ee5..1a138fbb94 100644
--- a/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
@@ -2,39 +2,36 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_edit_room_address_room_address_section_footer">"Вам понадобится адрес комнаты, чтобы сделать ее видимой в каталоге."</string>
   <string name="screen_edit_room_address_title">"Редактировать адрес комнаты"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Добавить адрес комнаты"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Любой желающий может подать заявку на присоединение к комнате, но администратор должен будет принять запрос."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Добавить адрес"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Каждый должен запросить доступ."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Попросить присоединиться"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Да, включить шифрование"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Шифрование комнаты нельзя будет отключить, история сообщений будет видна только участникам комнаты с момента их приглашения или с момента присоединения к комнате.
 Никто, кроме членов комнаты, не сможет читать сообщения. Это может помешать ботам и мостам работать корректно.
 Мы не рекомендуем включать шифрование для комнат, в которые может найти и присоединиться любой желающий."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Включить шифрование?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"После включения, шифрование не может быть отключено."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Шифрование"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Включить сквозное шифрование"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Любой желающий может найти и присоединиться"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Публичный"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Любой"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Присоединиться могут только приглашенные люди."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Только по приглашению"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Доступ"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Пространства в настоящее время не поддерживаются."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Участники пространства"</string>
-  <string name="screen_security_and_privacy_room_address_description">"Вам необходимо добавить адрес комнаты, чтобы сделать ее видимой в каталоге."</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Вам понадобится адрес комнаты, чтобы сделать ее видимой в каталоге комнат."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Опубликованный адрес"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Пространства в настоящее время не поддерживаются."</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Вам понадобится адрес комнаты, чтобы сделать ее видимой в каталоге."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Адрес"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Опубликовать %1$s в каталоге публичных комнат"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Разрешить поиск в публичном каталоге."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Доступна в списке публичных комнат"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Любой"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Кто может читать историю"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Участники только с тех пор, как они были приглашены"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Только для участников с момента выбора этой опции"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Адреса комнат — это способ найти комнату и получить к ней доступ. Это также гарантирует, что вы сможете легко поделиться своей комнатой с другими.
 Вы можете опубликовать свою комнату в каталоге общедоступных комнат на домашнем сервере."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Публикация комнат"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Адреса комнат — это способ найти комнату и получить к ним доступ. Это также гарантирует, что вы сможете легко поделиться своей комнатой с другими.
-Адрес также необходим для отображения комнаты в каталоге %1$s общедоступных комнат."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Видимость"</string>
   <string name="screen_security_and_privacy_title">"Безопасность и конфиденциальность"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Попросить присоединиться"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Шифрование"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Любой"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Видимость комнаты"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-sk/translations.xml b/features/securityandprivacy/impl/src/main/res/values-sk/translations.xml
index 287fa1f442..a9e6b1dd1b 100644
--- a/features/securityandprivacy/impl/src/main/res/values-sk/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-sk/translations.xml
@@ -4,35 +4,33 @@
   <string name="screen_edit_room_address_title">"Adresa miestnosti"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Pridať adresu miestnosti"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Ktokoľvek môže požiadať o pripojenie do miestnosti, ale správca alebo moderátor bude musieť žiadosť prijať."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Požiadať o pripojenie"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Áno, povoliť šifrovanie"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po aktivácii nie je možné zakázať šifrovanie pre miestnosť. História správ bude viditeľná len pre členov miestnosti, odkedy boli pozvaní alebo keď vstúpili do miestnosti. 
 Nikto okrem členov miestnosti nebude môcť čítať správy. 
 To môže brániť správnemu fungovaniu robotov a premostení. Neodporúčame povoliť šifrovanie pre miestnosti, ktoré môže ktokoľvek nájsť a pripojiť sa k nim."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Povoliť šifrovanie?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Po zapnutí už šifrovanie nie je možné vypnúť."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Šifrovanie"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Povoliť end-to-end šifrovanie"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Ktokoľvek môže nájsť a pripojiť sa"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Ktokoľvek"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Ľudia sa môžu pripojiť len vtedy, ak sú pozvaní"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Iba na pozvánku"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Prístup do miestnosti"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Priestory momentálne nie sú podporované"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Členovia priestoru"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Budete potrebovať adresu miestnosti, aby bola viditeľná v adresári miestností."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Priestory momentálne nie sú podporované"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Budete potrebovať adresu miestnosti, aby bola viditeľná v adresári."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresa miestnosti"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Umožniť vyhľadanie tejto miestnosti v adresári verejných miestností %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditeľné v adresári verejných miestností"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Ktokoľvek"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kto môže čítať históriu"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Len pre členov, odkedy boli pozvaní"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Len členovia od zvolenia tejto možnosti"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy miestností predstavujú spôsoby, ako nájsť a získať prístup k miestnostiam. To tiež zaisťuje, že môžete jednoducho zdieľať svoju miestnosť s ostatnými. 
 Môžete sa rozhodnúť zverejniť svoju miestnosť v adresári verejných miestností vášho domovského servera."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Zverejnenie miestnosti"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy miestností predstavujú spôsoby, ako nájsť a získať prístup k miestnostiam. Toto tiež zaisťuje, že môžete jednoducho zdieľať svoju miestnosť s ostatnými. 
-Adresa je tiež potrebná, aby bola miestnosť viditeľná v adresári verejných miestností %1$s."</string>
-  <string name="screen_security_and_privacy_title">"Bezpečnosť a súkromie"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Požiadať o pripojenie"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Šifrovanie"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Ktokoľvek"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Viditeľnosť miestnosti"</string>
-</resources>
\ No newline at end of file
+  <string name="screen_security_and_privacy_title">"Bezpečnosť a súkromie"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-sv/translations.xml b/features/securityandprivacy/impl/src/main/res/values-sv/translations.xml
index b8d76de9bf..4fbfe47ba7 100644
--- a/features/securityandprivacy/impl/src/main/res/values-sv/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-sv/translations.xml
@@ -4,34 +4,31 @@
   <string name="screen_edit_room_address_title">"Rumsadress"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Lägg till rumsadress"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Vem som helst kan be om att gå med i rummet men en administratör eller moderator måste acceptera begäran."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Be om att gå med"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktivera kryptering"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"När det är aktiverat kan kryptering för ett rum inte inaktiveras, meddelandehistoriken visas bara för rumsmedlemmar sedan de blev inbjudna eller sedan de gick med i rummet.
 Ingen förutom rumsmedlemmarna kommer att kunna läsa meddelanden. Detta kan förhindra att bots och bridges fungerar korrekt.
 Vi rekommenderar inte att aktivera kryptering för rum som vem som helst kan hitta och gå med i."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Aktivera kryptering?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Efter aktivering kan kryptering inte inaktiveras."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Aktivera totalsträckskryptering"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Vem som helst kan hitta och gå med"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Vem som helst"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Användare kan bara gå med om de är inbjudna"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Endast inbjudan"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Tillgång till rum"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Utrymmen stöds för närvarande inte"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Utrymmesmedlemmar"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Du behöver en rumsadress för att göra den synlig i rumskatalogen."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Utrymmen stöds för närvarande inte"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du behöver en rumsadress för att göra den synlig i katalogen."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillåt att detta rum hittas genom att söka i den offentliga rumskatalogen på %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i katalogen för offentliga rum"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Vem som helst"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Vem kan läsa historik"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Endast medlemmar sedan de bjöds in"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Endast medlemmar sedan det här alternativet har valts"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Rumsadresser är sätt att hitta och komma åt rum. Detta säkerställer också att du enkelt kan dela ditt rum med andra.
 Du kan välja att publicera ditt rum i din hemservers offentliga rumskatalog."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Rumspublicering"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Rumsadresser är sätt att hitta och komma åt rum. Detta säkerställer också att du enkelt kan dela ditt rum med andra. 
-Adressen krävs också för att göra rummet synligt i%1$s katalog för offentliga rum."</string>
   <string name="screen_security_and_privacy_title">"Säkerhet och sekretess"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Be om att gå med"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Vem som helst"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Rumssynlighet"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-tr/translations.xml b/features/securityandprivacy/impl/src/main/res/values-tr/translations.xml
index 959833c7b6..940fdc9a91 100644
--- a/features/securityandprivacy/impl/src/main/res/values-tr/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-tr/translations.xml
@@ -4,35 +4,33 @@
   <string name="screen_edit_room_address_title">"Oda adresi"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Oda adresi ekle"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Herkes odaya katılma isteğinde bulunabilir ancak bir yönetici veya moderatörün isteği kabul etmesi gerekir."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Katılmak için sor"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Evet, şifrelemeyi etkinleştir"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Etkinleştirildikten sonra, bir oda için şifreleme devre dışı bırakılamaz, Mesaj geçmişi yalnızca davet edildiklerinden veya odaya katıldıklarından beri oda üyeleri için görünür olacaktır.
 Oda üyeleri dışında hiç kimse mesajları okuyamayacaktır. Bu, botların ve köprülerin düzgün çalışmasını engelleyebilir.
 Herkesin bulabileceği ve katılabileceği odalar için şifrelemenin etkinleştirilmesini önermiyoruz."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Şifrelemeyi etkinleştir?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Açıldıktan donra şifreleme kapatılamaz."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Şifreleme"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Uçtan uca şifrelemeyi etkinleştir"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Herkes bulabilir ve katılabilir"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Herkes"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"İnsanlar yalnızca davet edildiklerinde katılabilirler"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Yalnızca davet"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Oda Erişimi"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Alanlar şu anda desteklenmiyor"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Alan üyeleri"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Oda dizininde görünür kılmak için bir oda adresine ihtiyacınız olacaktır."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Alanlar şu anda desteklenmiyor"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Dizinde görünür hale getirmek için bir oda adresine ihtiyacınız olacak."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Oda adresi"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Bu odanın %1$s genel oda dizininde arama yapılarak bulunmasına izin verin"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Genel oda dizininde görünür"</string>
-  <string name="screen_security_and_privacy_room_history_section_header">"Geçmişi kimler okuyabilir ?"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Herkes"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Geçmişi kimler okuyabilir ?"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Sadece üyeler (davet edildiklerinden beri)"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Bu seçeneği seçtiğinden beri yalnızca üyeler"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Oda adresleri, odaları bulmanın ve odalara erişmenin yoludur. Bu aynı zamanda odanızı başkalarıyla kolayca paylaşabilmenizi sağlar.
 Odanızı ana sunucunuzun genel oda dizininde yayınlamayı seçebilirsiniz."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Oda yayınlama"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Oda adresleri, odaları bulmanın ve odalara erişmenin yollarıdır. Bu aynı zamanda odanızı başkalarıyla kolayca paylaşabilmenizi sağlar.
-Adres, odayı %1$s genel oda dizininde görünür kılmak için de gereklidir."</string>
-  <string name="screen_security_and_privacy_title">"Güvenlik ve gizlilik"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Katılmak için sor"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Şifreleme"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Herkes"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Oda görünürlüğü"</string>
-</resources>
\ No newline at end of file
+  <string name="screen_security_and_privacy_title">"Güvenlik ve gizlilik"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml b/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml
index b631ee092b..55c7d4fda7 100644
--- a/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml
@@ -4,35 +4,33 @@
   <string name="screen_edit_room_address_title">"Адреса кімнати"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Додати адресу кімнати"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Будь-хто може надіслати запит приєднатися до кімнати, але адміністратор або модератор повинні прийняти запит."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Запросити приєднатися"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Так, увімкнути шифрування"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Після ввімкнення шифрування кімнати, його неможливо вимкнути, історію повідомлень бачитимуть лише учасники кімнати, яких було запрошено або які приєдналися до кімнати.
 Ніхто, крім учасників кімнати, не зможе прочитати повідомлення. Це може перешкоджати коректній роботі ботів і мостів.
 Ми не радимо вмикати шифрування для кімнат, які будь-хто може знайти та до яких може приєднатися всі."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Увімкнути шифрування?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Після ввімкнення шифрування неможливо вимкнути."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Шифрування"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Увімкнути наскрізне шифрування"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Будь-хто може знайти та приєднатися."</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Будь-хто"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Кожний"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Люди можуть приєднатися, лише якщо їх запросили"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Лише запрошені"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Доступ до кімнати"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Простори наразі не підтримуються"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Учасники простору"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Вам знадобиться адреса кімнати, щоб зробити її видимою в каталозі кімнат."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Простори наразі не підтримуються"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Вам знадобиться адреса кімнати, щоб зробити її видимою в каталозі."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Адреса кімнати"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Дозвольте, щоб цю кімнату можна було знайти за допомогою пошуку в каталозі загальнодоступних кімнат %1$s "</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Видима в каталозі загальнодоступних кімнат"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Кожний"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Хто може читати історію"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Лише учасники з моменту запрошення"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Лише учасники після вибору цього параметра"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Адреси кімнат — це спосіб знайти кімнату та отримати до неї доступ. Це також гарантує, що ви можете легко поділитися своєю кімнатою з іншими.
 Ви можете опублікувати свою кімнату в каталозі загальнодоступних кімнат вашого домашнього сервера."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Публікація в кімнаті"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Адреси кімнат — це спосіб знайти та отримати доступ до кімнат. Це також гарантує, що ви зможете легко поділитися своєю кімнатою з іншими.
-Адреса також необхідна, щоб зробити кімнату видимою в каталозі загальнодоступних кімнат %1$s."</string>
-  <string name="screen_security_and_privacy_title">"Безпека й приватність"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"Запросити приєднатися"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"Шифрування"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Кожний"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Видимість кімнати"</string>
-</resources>
\ No newline at end of file
+  <string name="screen_security_and_privacy_title">"Безпека й приватність"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml b/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml
index 157e8f8418..06f0337bf1 100644
--- a/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml
@@ -1,7 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Katalogda ko‘rinadigan qilish uchun xona manzili kerak bo‘ladi."</string>
+  <string name="screen_edit_room_address_title">"Xona manzili"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Xona manzilini kiritish"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Xonaga qo‘shilishni istalgan kishi so‘rashi mumkin, lekin administrator yoki moderator so‘rovni qabul qilishi kerak"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Qo‘shilishni so‘rang"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ha, shifrlashni yoqish"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Yoqilgandan so‘ng, xona uchun shifrlashni o‘chirib bo‘lmaydi. Xabarlar tarixi faqat xona a’zolari taklif qilinganidan yoki xonaga qo‘shilganidan keyingi davrdan boshlab ko‘rinadi. Xona a’zolaridan tashqari hech kim xabarlarni o‘qiy olmaydi. Bu botlar va ko‘priklarning to‘g‘ri ishlashiga to‘sqinlik qilishi mumkin.
+Shu sababli, har kim topishi va qo‘shilishi mumkin bo‘lgan xonalar uchun shifrlashni yoqishni tavsiya etmaymiz."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Shifrlash yoqilsinmi?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Yoqilgandan keyin shifrlashni faolsizlantirish imkonsiz."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Shifrlash"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"End-to-end shifrlashni yoqish"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Istalgan kishi topishi va qo‘shilishi mumkin"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Har kim"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Odamlar faqat taklif qilingan taqdirdagina qo‘shilishi mumkin"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Faqat taklif qilish"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Xonaga kirish huquqi"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Maydon a’zolari"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Hozirda maydonlar qo‘llab-quvvatlanmaydi"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Katalogda ko‘rinadigan qilish uchun xona manzili kerak bo‘ladi."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Bu xonani %1$s umumiy xonalar ro‘yxatidan qidirib topish imkoniyatini berish"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Umumiy xona ro‘yxatida ko‘rinadi"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Har kim"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Xonaning ko‘rinishi"</string>
-</resources>
\ No newline at end of file
+  <string name="screen_security_and_privacy_room_history_section_header">"Tarixni kim o‘qiy oladi"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Taklif qilinganidan buyon faqat a’zolar"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"A’zolar faqat bu parametr tanlanganidan keyin"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Xona manzillari xonalarni topish va ularga kirish usullaridir. Bu shuningdek xonangizni boshqalar bilan oson ulashish imkonini beradi.
+Xonangizni o‘z homeserveringizning ommaviy xonalar ro‘yxatida e’lon qilishni tanlashingiz mumkin."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"xona nashriyoti"</string>
+  <string name="screen_security_and_privacy_title">"Xavfsizlik va maxfiylik"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml b/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml
index 44a21456f4..93e5880ae1 100644
--- a/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"您需要聊天室地址才能在目錄中顯示它。"</string>
-  <string name="screen_edit_room_address_title">"聊天室地址"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"新增聊天室地址"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"任何人都可以要求加入聊天室，但管理員必須接受請求。"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"您需要地址才能在公開目錄中顯示。"</string>
+  <string name="screen_edit_room_address_title">"編輯地址"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"新增地址"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"所有人都必須申請存取權。"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"要求加入"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是的，啟用加密"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"啟用後就無法停用聊天室的加密，只有受邀的聊天室成員或加入聊天室後才能看到訊息歷史紀錄。
 除了聊天室成員以外，任何人都不能讀取訊息。這可能會讓機器人與橋接無法正常運作。
 我們不建議對任何人都可以找到並加入的聊天室啟用加密。"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"啟用加密？"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"一旦啟用就無法停用加密。"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"加密"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"啟用端到端加密"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以找到並加入"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以加入。"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"任何人"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"人們僅有受到邀請時才能加入"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"僅受邀者才能加入。"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"僅限邀請"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"聊天室存取權"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"目前不支援空間"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"存取權"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"空間成員"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"您需要聊天室地址才能在聊天室目錄中顯示。"</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"聊天室地址"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"目前不支援空間"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"您需要地址才能在公開目錄中顯示。"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"地址"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允許透過搜尋 %1$s 公開聊天室目錄找到此聊天室"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"在公開聊天室目錄中可見"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"允許其他人透過公開目錄找到。"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"在公開目錄中可見"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"誰可以讀取歷史紀錄"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"僅在成員被邀請後"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"選取此選項後僅限成員"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"聊天室地址是尋找與存取聊天室的方法。也確保您可以輕鬆與其他人分享聊天室。
 您可以選擇在家伺服器公開聊天室目錄中發佈您的聊天室。"</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"聊天室發佈"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"聊天室地址是尋找與存取聊天室的方法。也確保您可以輕鬆與其他人分享聊天室。
-若要讓聊天室在 %1$s 公開聊天室目錄中可見，地址也是必要的。"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"能見度"</string>
   <string name="screen_security_and_privacy_title">"安全與隱私"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"要求加入"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"加密"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"聊天室能見度"</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml b/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml
index 1dd91a684d..ef9051ab97 100644
--- a/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml
@@ -4,35 +4,33 @@
   <string name="screen_edit_room_address_title">"房间地址"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"添加房间地址"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"任何人都可以请求加入房间，但必须由管理员或版主接受请求。"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"请求加入"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是的，启用加密"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"一旦启用，就不能再禁用房间的加密功能。消息历史记录只能在房间成员被邀请或加入房间后才可见。
 除房间成员外，任何人都无法阅读信息。这可能会妨碍机器人和网桥正常工作。
 我们不建议对任何人都能找到并加入的房间启用加密。"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"启用加密？"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"加密一旦启用，就无法禁用。"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"加密"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"启用端到端加密"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以找到并加入"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"任何人"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"只有受邀者才能加入"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"仅限邀请"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"房间访问权限"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"目前不支持空间"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"空间成员"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"你需要有房间地址才能使其在房间目录中可见。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"目前不支持空间"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"你需要房间地址才能使其在目录中可见。"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"房间地址"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允许通过搜索 %1$s 的公共房间目录来发现此房间"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"在公共房间目录中可见"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"谁可以读取历史记录"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"仅限被邀请的成员"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"仅自选择此选项以来的成员"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"房间地址是查找和访问房间的方式。这也确保你可以轻松地向他人分享房间。
 你可以选择在你服务器的公共房间目录中发布你的房间。"</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"房间发布"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"房间地址是查找和访问房间的方式。这也确保你可以轻松地向他人分享房间。
-在 %1$s 的公共房间目录中显示该房间时也需要地址。"</string>
-  <string name="screen_security_and_privacy_title">"安全与隐私"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"请求加入"</string>
-  <string name="screen_security_and_privacy_encryption_section_header">"加密"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"房间可见性"</string>
-</resources>
\ No newline at end of file
+  <string name="screen_security_and_privacy_title">"安全与隐私"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values/localazy.xml b/features/securityandprivacy/impl/src/main/res/values/localazy.xml
index b0e8195733..859be7670b 100644
--- a/features/securityandprivacy/impl/src/main/res/values/localazy.xml
+++ b/features/securityandprivacy/impl/src/main/res/values/localazy.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_edit_room_address_room_address_section_footer">"You’ll need an address in order to make it visible in the public directory."</string>
   <string name="screen_edit_room_address_title">"Edit address"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Add room address"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Anyone can request access but an administrator must accept the request."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Add address"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Everyone must request access."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Ask to join"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Yes, enable encryption"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Once enabled, encryption for a room cannot be disabled, Message history will only be visible for room members since they were invited or since they joined the room.
@@ -14,15 +14,18 @@ We do not recommend enabling encryption for rooms that anyone can find and join.
   <string name="screen_security_and_privacy_encryption_section_header">"Encryption"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Enable end-to-end encryption"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Anyone can join."</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Public"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Anyone"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Choose which spaces’ members can join this room without an invitation.  %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Manage spaces"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Only invited people can join."</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Private"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Invite only"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Access"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spaces are not currently supported"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Anyone in authorized spaces can join."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Anyone in %1$s can join."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Space members"</string>
-  <string name="screen_security_and_privacy_room_address_description">"You’ll need an address in order to make it visible in the public directory."</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"You’ll need a room address in order to make it visible in the room directory."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Published address"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spaces are not currently supported"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"You’ll need an address in order to make it visible in the public directory."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Address"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Allow for this room to be found by searching %1$s public room directory"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Allow to be found by searching the public directory."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible in public directory"</string>
@@ -33,8 +36,7 @@ We do not recommend enabling encryption for rooms that anyone can find and join.
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.
 You can choose to publish your room in your homeserver public room directory."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Room publishing"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.
-The address is also required to make the room visible in %1$s public room directory."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Room visibility"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Addresses are a way to find and access rooms and spaces. This also ensures you can easily share them with others."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibility"</string>
   <string name="screen_security_and_privacy_title">"Security &amp; privacy"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-cs/translations.xml b/features/space/impl/src/main/res/values-cs/translations.xml
index 4a0ecda415..d4730fc62d 100644
--- a/features/space/impl/src/main/res/values-cs/translations.xml
+++ b/features/space/impl/src/main/res/values-cs/translations.xml
@@ -12,6 +12,6 @@
   <string name="screen_leave_space_title">"Opustit %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"Jste jediným administrátorem pro %1$s"</string>
   <string name="screen_space_settings_leave_space">"Opustit prostor"</string>
-  <string name="screen_space_settings_roles_and_permissions">"Role a oprávnění"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Role a oprávnění"</string>
   <string name="screen_space_settings_security_and_privacy">"Zabezpečení a soukromí"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-it/translations.xml b/features/space/impl/src/main/res/values-it/translations.xml
index 11ddf1c29b..e483f98513 100644
--- a/features/space/impl/src/main/res/values-it/translations.xml
+++ b/features/space/impl/src/main/res/values-it/translations.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_leave_space_last_admin_info">"%1$s (Amministratore)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="one">"Lascia %1$d stanza e spazio"</item>
+    <item quantity="other">"Lascia %1$d stanze e spazi"</item>
+  </plurals>
+  <string name="screen_leave_space_subtitle">"Seleziona le stanze che desideri abbandonare e di cui non sei l\'unico amministratore:"</string>
+  <string name="screen_leave_space_subtitle_last_admin">"Prima di poter uscire, devi assegnare un altro amministratore a questo spazio."</string>
+  <string name="screen_leave_space_subtitle_only_last_admin">"Non verrai rimosso dalle seguenti stanze perché sei l\'unico amministratore:"</string>
+  <string name="screen_leave_space_title">"Uscire da %1$s?"</string>
+  <string name="screen_leave_space_title_last_admin">"Sei l\'unico amministratore di %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Esci dallo spazio"</string>
   <string name="screen_space_settings_roles_and_permissions">"Ruoli e autorizzazioni"</string>
   <string name="screen_space_settings_security_and_privacy">"Sicurezza e privacy"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-pt-rBR/translations.xml b/features/space/impl/src/main/res/values-pt-rBR/translations.xml
index 9c05395704..3329be1097 100644
--- a/features/space/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/space/impl/src/main/res/values-pt-rBR/translations.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_leave_space_last_admin_info">"%1$s (Administrador)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="one">"Sair de %1$d sala e espaço"</item>
+    <item quantity="other">"Sair de %1$d salas e do espaço"</item>
+  </plurals>
+  <string name="screen_leave_space_subtitle">"Selecione as salas que gostaria de sair nas quais você não é o único administrador:"</string>
+  <string name="screen_leave_space_subtitle_last_admin">"Você precisa atribuir outro administrador para este espaço antes de sair."</string>
+  <string name="screen_leave_space_subtitle_only_last_admin">"Você não será removido das seguintes salas porque você é o único administrador:"</string>
+  <string name="screen_leave_space_title">"Sair de %1$s?"</string>
+  <string name="screen_leave_space_title_last_admin">"Você é o único administrador de %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Sair do espaço"</string>
   <string name="screen_space_settings_roles_and_permissions">"Cargos e permissões"</string>
   <string name="screen_space_settings_security_and_privacy">"Segurança e privacidade"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-uz/translations.xml b/features/space/impl/src/main/res/values-uz/translations.xml
index 1fc7fa6b54..83540091ca 100644
--- a/features/space/impl/src/main/res/values-uz/translations.xml
+++ b/features/space/impl/src/main/res/values-uz/translations.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_space_settings_roles_and_permissions">"Rollar va ruxsatlar"</string>
+  <string name="screen_space_settings_security_and_privacy">"Xavfsizlik va maxfiylik"</string>
 </resources>
diff --git a/features/startchat/impl/src/main/res/values-uz/translations.xml b/features/startchat/impl/src/main/res/values-uz/translations.xml
index a789abc565..b2523ab7bd 100644
--- a/features/startchat/impl/src/main/res/values-uz/translations.xml
+++ b/features/startchat/impl/src/main/res/values-uz/translations.xml
@@ -3,4 +3,10 @@
   <string name="screen_create_room_action_create_room">"Yangi xona"</string>
   <string name="screen_room_directory_search_title">"Xona katalogi"</string>
   <string name="screen_start_chat_error_starting_chat">"Suhbatni boshlashda xatolik yuz berdi"</string>
+  <string name="screen_start_chat_join_room_by_address_action">"Xonaga manzil orqali kirish"</string>
+  <string name="screen_start_chat_join_room_by_address_invalid_address">"Yaroqli manzil emas"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Kirish…"</string>
+  <string name="screen_start_chat_join_room_by_address_room_found">"Mos xona topildi"</string>
+  <string name="screen_start_chat_join_room_by_address_room_not_found">"Xona topilmadi"</string>
+  <string name="screen_start_chat_join_room_by_address_supporting_text">"masalan #xona-nomi:matrix.org"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-pt-rBR/translations.xml b/features/verifysession/impl/src/main/res/values-pt-rBR/translations.xml
index 8dd7c9a2f7..591c482ca6 100644
--- a/features/verifysession/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-pt-rBR/translations.xml
@@ -11,12 +11,12 @@
   <string name="screen_identity_use_another_device">"Usar outro dispositivo"</string>
   <string name="screen_identity_waiting_on_other_device">"Aguardando o outro dispositivo…"</string>
   <string name="screen_session_verification_cancelled_subtitle">"Algo não parece certo. Ou a solicitação atingiu o tempo limite ou a solicitação foi negada."</string>
-  <string name="screen_session_verification_compare_emojis_subtitle">"Confirme se os emojis abaixo correspondem aos mostrados na sua outra sessão."</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"Confirme que os emojis abaixo correspondem aos mostrados no seu outro dispositivo."</string>
   <string name="screen_session_verification_compare_emojis_title">"Compare os emojis"</string>
   <string name="screen_session_verification_compare_emojis_user_subtitle">"Confirme se os emojis abaixo correspondem aos exibidos no dispositivo do outro usuário."</string>
   <string name="screen_session_verification_compare_numbers_subtitle">"Confirme se os números abaixo correspondem aos mostrados na sua outra sessão."</string>
   <string name="screen_session_verification_compare_numbers_title">"Comparar números"</string>
-  <string name="screen_session_verification_complete_subtitle">"Sua nova sessão está verificada agora. Ela tem acesso às suas mensagens criptografadas e outros usuários a verão como confiável."</string>
+  <string name="screen_session_verification_complete_subtitle">"Agora você pode enviar ou receber mensagens com segurança no seu outro dispositivo."</string>
   <string name="screen_session_verification_complete_user_subtitle">"Agora você pode confiar na identidade desse usuário ao enviar ou receber mensagens."</string>
   <string name="screen_session_verification_device_verified">"Dispositivo verificado"</string>
   <string name="screen_session_verification_enter_recovery_key">"Digitar chave de recuperação"</string>
@@ -33,7 +33,7 @@
   <string name="screen_session_verification_request_failure_title">"A verificação falhou"</string>
   <string name="screen_session_verification_request_footer">"Continue somente se você iniciou esta verificação."</string>
   <string name="screen_session_verification_request_subtitle">"Verifique o outro dispositivo para manter seu histórico de mensagens seguro."</string>
-  <string name="screen_session_verification_request_success_subtitle">"Sua nova sessão está verificada agora. Ela tem acesso às suas mensagens criptografadas e outros usuários a verão como confiável."</string>
+  <string name="screen_session_verification_request_success_subtitle">"Agora você pode enviar ou receber mensagens com segurança no seu outro dispositivo."</string>
   <string name="screen_session_verification_request_success_title">"Dispositivo verificado"</string>
   <string name="screen_session_verification_request_title">"Verificação solicitada"</string>
   <string name="screen_session_verification_they_dont_match">"Eles não combinam"</string>
diff --git a/features/verifysession/impl/src/main/res/values-uz/translations.xml b/features/verifysession/impl/src/main/res/values-uz/translations.xml
index 5204e759b3..04169a71d0 100644
--- a/features/verifysession/impl/src/main/res/values-uz/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-uz/translations.xml
@@ -13,9 +13,11 @@
   <string name="screen_session_verification_cancelled_subtitle">"Nimadir noto‘g‘ri ko‘rinadi. Yoki so‘rov muddati tugadi yoki so‘rov rad etildi."</string>
   <string name="screen_session_verification_compare_emojis_subtitle">"Quyidagi kulgichlar boshqa seansda ko‘rsatilganlarga mos kelishini tasdiqlang."</string>
   <string name="screen_session_verification_compare_emojis_title">"Emojilarni solishtiring"</string>
+  <string name="screen_session_verification_compare_emojis_user_subtitle">"Quyidagi emojilar narigi foydalanuvchining qurilmasida ko‘rsatilgan emojilarga mos kelishini tasdiqlang."</string>
   <string name="screen_session_verification_compare_numbers_subtitle">"Quyidagi raqamlarning boshqa sessiyangizda koʻrsatilgan raqamlarga mos kelishini tasdiqlang."</string>
   <string name="screen_session_verification_compare_numbers_title">"Sonlarni taqqoslash"</string>
   <string name="screen_session_verification_complete_subtitle">"Yangi seansingiz tasdiqlandi. U sizning shifrlangan xabarlaringizga kirish huquqiga ega va boshqa foydalanuvchilar uni ishonchli deb bilishadi."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Endi xabarlarni yuborish yoki qabul qilishda bu foydalanuvchining shaxsiga ishonishingiz mumkin."</string>
   <string name="screen_session_verification_device_verified">"Qurilma tasdiqlandi"</string>
   <string name="screen_session_verification_enter_recovery_key">"Tiklash kalitini kiriting"</string>
   <string name="screen_session_verification_failed_subtitle">"So‘rov vaqti tugab qoldi, so‘rov rad etildi yoki tekshiruv mos kelmadi."</string>
@@ -36,6 +38,16 @@
   <string name="screen_session_verification_request_title">"Tasdiqlash talab qilindi"</string>
   <string name="screen_session_verification_they_dont_match">"Ular mos kelmaydi"</string>
   <string name="screen_session_verification_they_match">"Ular mos keladi"</string>
+  <string name="screen_session_verification_use_another_device_subtitle">"Bu yerdan tasdiqlashni boshlashdan oldin, boshqa qurilmada ilovaning ochiq ekanligiga ishonch hosil qiling."</string>
+  <string name="screen_session_verification_use_another_device_title">"Ilovani boshqa tasdiqlangan qurilmada oching"</string>
+  <string name="screen_session_verification_user_initiator_subtitle">"Qo‘shimcha xavfsizlik chorasi sifatida, qurilmalaringizdagi emojilar to‘plamini solishtirish orqali ushbu foydalanuvchini tasdiqlang. Buni ishonchli aloqa usuli yordamida amalga oshiring."</string>
+  <string name="screen_session_verification_user_initiator_title">"Bu foydalanuvchi tasdiqlansinmi?"</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Qo‘shimcha xavfsizlik maqsadida, boshqa foydalanuvchi sizning shaxsingizni tasdiqlashni xohlaydi. Taqqoslash uchun sizga bir qator emojilar ko‘rsatiladi."</string>
+  <string name="screen_session_verification_waiting_another_device_subtitle">"Boshqa qurilmangizda qalqib chiquvchi oyna paydo bo‘lishi kerak. Tekshirish jarayonini o‘sha yerdan boshlang."</string>
+  <string name="screen_session_verification_waiting_another_device_title">"Boshqa qurilmada tekshirishni boshlang"</string>
+  <string name="screen_session_verification_waiting_other_device_title">"Boshqa qurilmada tekshirishni boshlang"</string>
+  <string name="screen_session_verification_waiting_other_user_title">"Boshqa foydalanuvchi kutilmoqda"</string>
+  <string name="screen_session_verification_waiting_subtitle">"Qabul qilinganingizdan so‘ng, tasdiqlash jarayonini davom ettirishingiz mumkin bo‘ladi."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Davom etish uchun boshqa seansda tekshirish jarayonini boshlash soʻrovini qabul qiling."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Soʻrovni qabul qilish kutilmoqda"</string>
   <string name="screen_signout_in_progress_dialog_content">"Chiqish…"</string>
diff --git a/features/verifysession/impl/src/main/res/values-zh/translations.xml b/features/verifysession/impl/src/main/res/values-zh/translations.xml
index 92641d1773..54b6de5d68 100644
--- a/features/verifysession/impl/src/main/res/values-zh/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-zh/translations.xml
@@ -11,12 +11,12 @@
   <string name="screen_identity_use_another_device">"使用其他设备"</string>
   <string name="screen_identity_waiting_on_other_device">"正在等待其他设备……"</string>
   <string name="screen_session_verification_cancelled_subtitle">"发生了一些错误。网络请求超时，或者被服务器拒绝。"</string>
-  <string name="screen_session_verification_compare_emojis_subtitle">"确认下方的表情符号与另一设备上显示的相同。"</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"确认下面的表情符号与您其他设备上显示的表情符号相匹配。"</string>
   <string name="screen_session_verification_compare_emojis_title">"比较表情符号"</string>
   <string name="screen_session_verification_compare_emojis_user_subtitle">"请验证下方表情是否与对方设备显示一致"</string>
   <string name="screen_session_verification_compare_numbers_subtitle">"确认以下数字与其他会话中显示的一致。"</string>
   <string name="screen_session_verification_compare_numbers_title">"比较数字"</string>
-  <string name="screen_session_verification_complete_subtitle">"新设备已经成功验证。现在新设备可以访问加密信息，其他用户也会信任这个设备。"</string>
+  <string name="screen_session_verification_complete_subtitle">"现在您可以在其他设备上安全地阅读或发送消息。"</string>
   <string name="screen_session_verification_complete_user_subtitle">"现在您可以在发送或接收消息时信任该用户的身份。"</string>
   <string name="screen_session_verification_device_verified">"设备已验证"</string>
   <string name="screen_session_verification_enter_recovery_key">"输入恢复密钥"</string>
@@ -33,7 +33,7 @@
   <string name="screen_session_verification_request_failure_title">"验证失败"</string>
   <string name="screen_session_verification_request_footer">"仅在你发起此验证后才继续。"</string>
   <string name="screen_session_verification_request_subtitle">"验证另一台设备以确保您的消息历史记录保密。"</string>
-  <string name="screen_session_verification_request_success_subtitle">"新设备已经成功验证。现在新设备可以访问加密信息，其他用户也会信任这个设备。"</string>
+  <string name="screen_session_verification_request_success_subtitle">"现在您可以在其他设备上安全地阅读或发送消息。"</string>
   <string name="screen_session_verification_request_success_title">"设备已验证"</string>
   <string name="screen_session_verification_request_title">"已请求验证"</string>
   <string name="screen_session_verification_they_dont_match">"不匹配"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-uz/translations.xml b/libraries/eventformatter/impl/src/main/res/values-uz/translations.xml
index 88a8186fec..11835dc605 100644
--- a/libraries/eventformatter/impl/src/main/res/values-uz/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-uz/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Siz xonani avatarini o\'chirib tashladingiz"</string>
   <string name="state_event_room_ban">"%1$staqiqlangan%2$s"</string>
   <string name="state_event_room_ban_by_you">"Siz taqiqlangansiz%1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Siz %1$s: %2$sni blokladingiz"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s %2$s:%3$sni blokladi"</string>
   <string name="state_event_room_created">"%1$sxonani yaratdi"</string>
   <string name="state_event_room_created_by_you">"Siz xonani yaratdingiz"</string>
   <string name="state_event_room_invite">"%1$staklif qilingan%2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Siz taklifni rad etdingiz"</string>
   <string name="state_event_room_remove">"%1$s o\'chirildi %2$s"</string>
   <string name="state_event_room_remove_by_you">"Siz o\'chirildingiz %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Siz olib tashladingiz %1$s :%2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s %2$s:%3$sni olib tashladi"</string>
   <string name="state_event_room_third_party_invite">"%1$s taklifnoma yubordi %2$sga xonaga qo\'shilish uchun"</string>
   <string name="state_event_room_third_party_invite_by_you">"Siz taklifnoma yubordingiz %1$s ga xonaga qo\'shilishi uchun"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s taklifni %2$s ga xonaga qo\'shilish uchun bekor qildi"</string>
diff --git a/libraries/matrixui/src/main/res/values-uz/translations.xml b/libraries/matrixui/src/main/res/values-uz/translations.xml
index 069f0b8372..63add2d3c0 100644
--- a/libraries/matrixui/src/main/res/values-uz/translations.xml
+++ b/libraries/matrixui/src/main/res/values-uz/translations.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Taklif yuborish"</string>
+  <string name="screen_bottom_sheet_create_dm_message">"%1$s bilan chatni boshlashni xohlaysizmi?"</string>
+  <string name="screen_bottom_sheet_create_dm_title">"Taklif yuborilsinmi?"</string>
   <string name="screen_invites_invited_you">"%1$s(%2$s ) sizni taklif qildi"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-uz/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-uz/translations.xml
new file mode 100644
index 0000000000..8f838c0d26
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/res/values-uz/translations.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_media_browser_delete_confirmation_subtitle">"Bu fayl xonadan olib tashlanadi va a’zolar unga kira olmaydilar."</string>
+  <string name="screen_media_browser_delete_confirmation_title">"Fayl oʻchirilsinmi?"</string>
+  <string name="screen_media_browser_download_error_message">"Internet aloqangizni tekshiring va qayta urining."</string>
+  <string name="screen_media_browser_files_empty_state_subtitle">"Ushbu xonaga yuklangan hujjatlar, audio fayllar va ovozli xabarlar shu yerda ko‘rsatiladi."</string>
+  <string name="screen_media_browser_files_empty_state_title">"Hali hech qanday fayl yuklanmagan"</string>
+  <string name="screen_media_browser_list_loading_files">"Fayllar yuklanmoqda…"</string>
+  <string name="screen_media_browser_list_loading_media">"Media yuklanmoqda…"</string>
+  <string name="screen_media_browser_list_mode_files">"Fayllar"</string>
+  <string name="screen_media_browser_list_mode_media">"Media"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Bu xonaga yuklangan rasm va videolar shu yerda chiqadi."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Hali hech qanday media yuklanmagan"</string>
+  <string name="screen_media_browser_title">"Media va fayllar"</string>
+  <string name="screen_media_details_file_format">"Fayl formati"</string>
+  <string name="screen_media_details_filename">"Fayl nomi"</string>
+  <string name="screen_media_details_no_more_files_to_show">"Ko‘rsatish uchun boshqa fayllar yo‘q"</string>
+  <string name="screen_media_details_no_more_media_to_show">"Ko‘rsatish uchun boshqa media yo‘q"</string>
+  <string name="screen_media_details_uploaded_by">"Tomonidan yuklangan"</string>
+  <string name="screen_media_details_uploaded_on">"Yuklangan"</string>
+</resources>
diff --git a/libraries/push/impl/src/main/res/values-cs/translations.xml b/libraries/push/impl/src/main/res/values-cs/translations.xml
index 8cc5d79095..667f181536 100644
--- a/libraries/push/impl/src/main/res/values-cs/translations.xml
+++ b/libraries/push/impl/src/main/res/values-cs/translations.xml
@@ -15,6 +15,7 @@
     <item quantity="few">"%d oznámení"</item>
     <item quantity="other">"%d oznámení"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Distributor oznámení UnifiedPush se nepodařilo zaregistrovat, takže již nebudete dostávat oznámení. Zkontrolujte nastavení oznámení v aplikaci a stav distributora push oznámění."</string>
   <string name="notification_fallback_content">"Oznámení"</string>
   <string name="notification_incoming_call">"📹 Příchozí hovor"</string>
   <string name="notification_inline_reply_failed">"** Nepodařilo se odeslat - otevřete prosím místnost"</string>
diff --git a/libraries/push/impl/src/main/res/values-fa/translations.xml b/libraries/push/impl/src/main/res/values-fa/translations.xml
index da071e07d4..ef24f09c1e 100644
--- a/libraries/push/impl/src/main/res/values-fa/translations.xml
+++ b/libraries/push/impl/src/main/res/values-fa/translations.xml
@@ -5,15 +5,31 @@
   <string name="notification_channel_noisy">"اعلان‌های پرصدا"</string>
   <string name="notification_channel_ringing_calls">"زنگ خوردن تماس"</string>
   <string name="notification_channel_silent">"اعلان‌های صامت"</string>
+  <plurals name="notification_compat_summary_line_for_room">
+    <item quantity="one">"%1$s:%2$d پیام"</item>
+    <item quantity="other">"%1$s:%2$d پیام‌"</item>
+  </plurals>
+  <plurals name="notification_compat_summary_title">
+    <item quantity="one">"%dاعلان"</item>
+    <item quantity="other">"%dاعلان‌"</item>
+  </plurals>
   <string name="notification_fallback_content">"پیام‌های جدیدی دارید."</string>
   <string name="notification_incoming_call">"📹 تماس ورودی"</string>
   <string name="notification_inline_reply_failed">"**‌شکست در فرستادن - لطفاً اتاق را بگشایید"</string>
   <string name="notification_invitation_action_join">"پیوستن"</string>
   <string name="notification_invitation_action_reject">"رد کردن"</string>
+  <plurals name="notification_invitations">
+    <item quantity="one">"%d دعوت"</item>
+    <item quantity="other">"%d دعوت"</item>
+  </plurals>
   <string name="notification_invite_body">"به گپ دعوتتان کرد"</string>
   <string name="notification_invite_body_with_sender">"%1$s به گپ دعوتتان کرد"</string>
   <string name="notification_mentioned_you_body">"به شما اشاره کرد: %1$s"</string>
   <string name="notification_new_messages">"پیام جدید"</string>
+  <plurals name="notification_new_messages_for_room">
+    <item quantity="one">"%d پیام جدید"</item>
+    <item quantity="other">"%d پیام جدید"</item>
+  </plurals>
   <string name="notification_reaction_body">"با %1$s واکنش داد"</string>
   <string name="notification_room_action_mark_as_read">"علامت‌گذاری به عنوان خوانده شده"</string>
   <string name="notification_room_action_quick_reply">"پاسخ سریع"</string>
@@ -24,9 +40,17 @@
   <string name="notification_test_push_notification_content">"دارید آگاهی را مشاهده می‌کنید! کلیک کنید!"</string>
   <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
   <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
+  <plurals name="notification_unread_notified_messages">
+    <item quantity="one">"%d پیام اعلان نشده"</item>
+    <item quantity="other">"%d پیام اعلان نشده"</item>
+  </plurals>
   <string name="notification_unread_notified_messages_and_invitation">"%1$s و %2$s"</string>
   <string name="notification_unread_notified_messages_in_room">"%1$s در %2$s"</string>
   <string name="notification_unread_notified_messages_in_room_and_invitation">"%1$s در %2$s و %3$s"</string>
+  <plurals name="notification_unread_notified_messages_in_room_rooms">
+    <item quantity="one">"%d اتاق"</item>
+    <item quantity="other">"%d اتاق"</item>
+  </plurals>
   <string name="push_distributor_background_sync_android">"همگام سازی پس‌زمینه"</string>
   <string name="push_distributor_firebase_android">"خدمات گوگل"</string>
   <string name="push_no_valid_google_play_services_apk_android">"خدمت پلی گوگل معتبری پیدا نشد. ممکن است آگاهی‌ها به درستی کار نکنند."</string>
diff --git a/libraries/push/impl/src/main/res/values-fi/translations.xml b/libraries/push/impl/src/main/res/values-fi/translations.xml
index f3cec970d5..1af69c2da9 100644
--- a/libraries/push/impl/src/main/res/values-fi/translations.xml
+++ b/libraries/push/impl/src/main/res/values-fi/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d ilmoitus"</item>
     <item quantity="other">"%d ilmoitusta"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"UnifiedPush ilmoitusten jakelijaa ei voitu rekisteröidä, joten et enää vastaanota ilmoituksia. Tarkista sovelluksen ilmoitusasetukset ja push-jakelijan tila."</string>
   <string name="notification_fallback_content">"Sinulle on uusia viestejä."</string>
   <string name="notification_incoming_call">"📹 Saapuva puhelu"</string>
   <string name="notification_inline_reply_failed">"** Lähetys epäonnistui - avaa huone"</string>
diff --git a/libraries/push/impl/src/main/res/values-it/translations.xml b/libraries/push/impl/src/main/res/values-it/translations.xml
index 6ad3398635..9e44c2d7f9 100644
--- a/libraries/push/impl/src/main/res/values-it/translations.xml
+++ b/libraries/push/impl/src/main/res/values-it/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d notifica"</item>
     <item quantity="other">"%d notifiche"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Non è stato possibile registrare il distributore di notifiche UnifiedPush, quindi non riceverai più notifiche. Controlla le impostazioni delle notifiche dell\'app e lo stato del distributore push."</string>
   <string name="notification_fallback_content">"Hai nuovi messaggi."</string>
   <string name="notification_incoming_call">"📹 Chiamata in arrivo"</string>
   <string name="notification_inline_reply_failed">"** Invio fallito - si prega di aprire la stanza"</string>
@@ -38,6 +39,7 @@
   <string name="notification_sender_me">"Io"</string>
   <string name="notification_sender_mention_reply">"%1$s ti ha menzionato o risposto"</string>
   <string name="notification_test_push_notification_content">"Stai visualizzando la notifica! Cliccami!"</string>
+  <string name="notification_thread_in_room">"Discussione in %1$s"</string>
   <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
   <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
   <plurals name="notification_unread_notified_messages">
@@ -54,9 +56,20 @@
   <string name="push_distributor_background_sync_android">"Sincronizzazione in background"</string>
   <string name="push_distributor_firebase_android">"Servizi Google"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Google Play Services non trovato. Le notifiche non funzioneranno bene."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"Controllo degli utenti bloccati"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"Visualizza gli utenti bloccati"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"Nessun utente è bloccato."</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="one">"Hai bloccato%1$d utente. Non riceverai notifiche da questo utente."</item>
+    <item quantity="other">"Hai bloccato%1$d utenti. Non riceverai notifiche da questi utenti."</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Utenti bloccati"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Ottieni il nome del fornitore attuale."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Nessun provider push selezionato."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Fornitore push attuale: %1$s e attuale distributore: %2$s Ma il distributore %3$s non viene trovato. Forse l\'applicazione è stata disinstallata?"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Fornitore push attuale:%1$s , ma non è stato configurato alcun distributore."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Provider push attuale: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Fornitore push attuale: %1$s (%2$s )"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"Provider push attuale"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"Assicurati che l\'applicazione abbia almeno un fornitore push."</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Nessun provider push trovato."</string>
diff --git a/libraries/push/impl/src/main/res/values-pt-rBR/translations.xml b/libraries/push/impl/src/main/res/values-pt-rBR/translations.xml
index 6d2e96d82c..178823e629 100644
--- a/libraries/push/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/libraries/push/impl/src/main/res/values-pt-rBR/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d notificação"</item>
     <item quantity="other">"%d notificações"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"O distribuidor de notificações do UnifiedPush não pôde ser cadastrado, então você não receberá mais notificações. Confira as configurações do app e o estado do distribuidor de push."</string>
   <string name="notification_fallback_content">"Você tem mensagens novas."</string>
   <string name="notification_incoming_call">"📹 Chamada recebida"</string>
   <string name="notification_inline_reply_failed">"** Falha ao enviar - por favor, abra a sala"</string>
@@ -38,6 +39,7 @@
   <string name="notification_sender_me">"Eu"</string>
   <string name="notification_sender_mention_reply">"%1$s mencionado ou respondido"</string>
   <string name="notification_test_push_notification_content">"Você está visualizando a notificação! Clique em mim!"</string>
+  <string name="notification_thread_in_room">"Tópico em %1$s"</string>
   <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
   <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
   <plurals name="notification_unread_notified_messages">
@@ -54,9 +56,20 @@
   <string name="push_distributor_background_sync_android">"Sincronização em segundo plano"</string>
   <string name="push_distributor_firebase_android">"Serviços do Google"</string>
   <string name="push_no_valid_google_play_services_apk_android">"O Google Play Services não foi encontrado. As notificações podem não funcionar corretamente."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"Verificando usuários bloqueados"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"Ver usuários bloqueados"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"Nenhum usuário está bloqueado."</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="one">"Você bloqueou %1$d usuário. Você não receberá notificações deste usuário."</item>
+    <item quantity="other">"Você bloqueou %1$d usuários. Você não receberá notificações deles."</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Usuários bloqueados"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Obtenha o nome do provedor atual."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Nenhum provedor de push foi selecionado."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Provedor de push atual: %1$s e distribuidor atual: %2$s. Mas o distribuidor %3$s não foi encontrado. Talvez o aplicativo foi desinstalado?"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Provedor de push atual: %1$s, mas nenhum distribuidor foi configurado."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Provedor de push atual: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Provedor de push atual: %1$s (%2$s)"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"Provedor de push atual"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"Certifique-se de que o aplicativo tenha suporte a pelo menos um provedor de push."</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Nenhum provedor de push com suporte foi encontrado."</string>
diff --git a/libraries/push/impl/src/main/res/values-uz/translations.xml b/libraries/push/impl/src/main/res/values-uz/translations.xml
index 4a9e4bffbc..7ba9e6319c 100644
--- a/libraries/push/impl/src/main/res/values-uz/translations.xml
+++ b/libraries/push/impl/src/main/res/values-uz/translations.xml
@@ -64,6 +64,7 @@
     <item quantity="one">"Topildi %1$d push provider: %2$s"</item>
     <item quantity="other">"Topildi %1$d push provayderlar: %2$s"</item>
   </plurals>
+  <string name="troubleshoot_notifications_test_detect_push_provider_success_2">"Ilova quyidagilar uchun yaratilgan: %1$s"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_title">"Provayderni qoʻllab-quvvatlash"</string>
   <string name="troubleshoot_notifications_test_display_notification_description">"Ilova bildirishnomani koʻrsata olishini tekshiring."</string>
   <string name="troubleshoot_notifications_test_display_notification_failure">"Bildirishnoma bosilmagan."</string>
@@ -76,4 +77,5 @@
   <string name="troubleshoot_notifications_test_push_loop_back_failure_2">"Xato: %1$s."</string>
   <string name="troubleshoot_notifications_test_push_loop_back_failure_3">"Xatolik, push qilishni sinab bo‘lmadi."</string>
   <string name="troubleshoot_notifications_test_push_loop_back_failure_4">"Xatolik, taym aut pushni kutmoqda."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_title">"Test Push loop back"</string>
 </resources>
diff --git a/libraries/push/impl/src/main/res/values-zh/translations.xml b/libraries/push/impl/src/main/res/values-zh/translations.xml
index 2fe8d3e4c7..3f2bd7e836 100644
--- a/libraries/push/impl/src/main/res/values-zh/translations.xml
+++ b/libraries/push/impl/src/main/res/values-zh/translations.xml
@@ -34,6 +34,7 @@
   <string name="notification_sender_me">"我"</string>
   <string name="notification_sender_mention_reply">"%1$s提及或回复"</string>
   <string name="notification_test_push_notification_content">"您正在查看通知！点击我！"</string>
+  <string name="notification_thread_in_room">"线程 %1$s"</string>
   <string name="notification_ticker_text_dm">"%1$s：%2$s"</string>
   <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
   <plurals name="notification_unread_notified_messages">
@@ -48,12 +49,19 @@
   <string name="push_distributor_background_sync_android">"后台同步"</string>
   <string name="push_distributor_firebase_android">"谷歌服务"</string>
   <string name="push_no_valid_google_play_services_apk_android">"找不到有效的 Google Play 服务。通知可能无法正常工作。"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"检查被阻止的用户"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"查看被屏蔽的用户"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"没有用户被阻止。"</string>
   <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
     <item quantity="other">"您已屏蔽 %1$d 位用户。您将不再收到这些用户的推送通知。"</item>
   </plurals>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"已屏蔽用户"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"获取当前推送提供者的名称。"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"未选择任何推送提供者。"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"当前推送提供商：%1$s和当前分销商：%2$s . 但经销商%3$s未找到。应用程序可能已被卸载？"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"当前推送提供商：%1$s ，但尚未配置分销商。"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"当前推送提供者：%1$s。"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"当前推送提供商：%1$s （%2$s ）"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"当前推送提供者"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"确保应用程序至少有一个推送提供者。"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"未找到推送提供者。"</string>
diff --git a/libraries/textcomposer/impl/src/main/res/values-uz/translations.xml b/libraries/textcomposer/impl/src/main/res/values-uz/translations.xml
index 9b28fd8ef6..d5a7002665 100644
--- a/libraries/textcomposer/impl/src/main/res/values-uz/translations.xml
+++ b/libraries/textcomposer/impl/src/main/res/values-uz/translations.xml
@@ -5,11 +5,17 @@
   <string name="rich_text_editor_close_formatting_options">"Formatlash parametrlarini yoping"</string>
   <string name="rich_text_editor_code_block">"Kod blokini almashtirish"</string>
   <string name="rich_text_editor_composer_caption_placeholder">"Taglavha kiritish"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"Shifrlangan xabar…"</string>
   <string name="rich_text_editor_composer_placeholder">"Xabar…"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"Shifrlanmagan xabar…"</string>
   <string name="rich_text_editor_create_link">"Havola yarating"</string>
   <string name="rich_text_editor_edit_link">"Havolani tahrirlash"</string>
+  <string name="rich_text_editor_format_action">"%1$s, holat: %2$s"</string>
   <string name="rich_text_editor_format_bold">"Qalin formatni qo\'llang"</string>
   <string name="rich_text_editor_format_italic">"Kursiv formatini qo\'llang"</string>
+  <string name="rich_text_editor_format_state_disabled">"oʻchirilgan"</string>
+  <string name="rich_text_editor_format_state_off">"o\'chiq"</string>
+  <string name="rich_text_editor_format_state_on">"yoniq"</string>
   <string name="rich_text_editor_format_strikethrough">"Chizilgan formatni qo\'llash"</string>
   <string name="rich_text_editor_format_underline">"Pastki chiziq formatini qo\'llang"</string>
   <string name="rich_text_editor_full_screen_toggle">"Toʻliq ekran rejimiga oʻtish"</string>
@@ -22,5 +28,6 @@
   <string name="rich_text_editor_remove_link">"Havolani olib tashlang"</string>
   <string name="rich_text_editor_unindent">"Paragrafni bekor qilish"</string>
   <string name="rich_text_editor_url_placeholder">"Havola"</string>
+  <string name="screen_media_upload_preview_caption_warning">"Taglavhalar eski ilovalardan foydalanuvchilarga ko‘rinmasligi mumkin."</string>
   <string name="screen_room_voice_message_tooltip">"Yozib olish uchun bosib turing"</string>
 </resources>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-uz/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-uz/translations.xml
index e01e098f5f..d7fa7207e7 100644
--- a/libraries/troubleshoot/impl/src/main/res/values-uz/translations.xml
+++ b/libraries/troubleshoot/impl/src/main/res/values-uz/translations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_push_history_title">"Bildirishnoma tarixi"</string>
   <string name="troubleshoot_notifications_screen_action">"Testlarni ishga tushirish"</string>
   <string name="troubleshoot_notifications_screen_action_again">"Testlarni qayta ishga tushirish"</string>
   <string name="troubleshoot_notifications_screen_failure">"Ba’zi testlar muvaffaqiyatsiz tugadi. Iltimos, tafsilotlarni tekshirib chiqing."</string>
diff --git a/libraries/ui-strings/src/main/res/values-cs/translations.xml b/libraries/ui-strings/src/main/res/values-cs/translations.xml
index ccc293a691..d4f8550f7a 100644
--- a/libraries/ui-strings/src/main/res/values-cs/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-cs/translations.xml
@@ -452,6 +452,10 @@ Opravdu chcete pokračovat?"</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Vaše zpráva nebyla odeslána, protože%1$s neověřil(a) všechna zařízení"</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Jedno nebo více vašich zařízení není ověřeno. Zprávu můžete přesto odeslat, nebo ji můžete prozatím zrušit a zkusit to znovu později, až ověříte všechna svá zařízení."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"Vaše zpráva nebyla odeslána, protože jste neověřili jedno nebo více zařízení"</string>
+  <string name="screen_room_change_permissions_change_settings">"Změnit nastavení"</string>
+  <string name="screen_room_change_permissions_manage_space">"Správa prostoru"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"Spravovat místnosti"</string>
+  <string name="screen_room_change_permissions_title">"Oprávnění"</string>
   <string name="screen_room_change_role_administrators_or_owners_title">"Upravit správce nebo vlastníky"</string>
   <string name="screen_room_error_failed_processing_media">"Nahrání média se nezdařilo, zkuste to prosím znovu."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Nepodařilo se načíst údaje o uživateli"</string>
diff --git a/libraries/ui-strings/src/main/res/values-fa/translations.xml b/libraries/ui-strings/src/main/res/values-fa/translations.xml
index 6f55ce0db4..1656bc3b0c 100644
--- a/libraries/ui-strings/src/main/res/values-fa/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fa/translations.xml
@@ -3,6 +3,10 @@
   <string name="a11y_add_reaction">"افزودن واکنش: %1$s"</string>
   <string name="a11y_avatar">"چهرک"</string>
   <string name="a11y_delete">"حذف"</string>
+  <plurals name="a11y_digits_entered">
+    <item quantity="one">"%1$d رقم وارد شده"</item>
+    <item quantity="other">"%1$d رقم وارد شده"</item>
+  </plurals>
   <string name="a11y_edit_avatar">"ویرایش چهرک"</string>
   <string name="a11y_edit_room_address_hint">"نشانی کامل %1$s خواهد بود"</string>
   <string name="a11y_encryption_details">"جزییات رمزنگاری"</string>
@@ -26,6 +30,10 @@
   <string name="a11y_react_with">"واکنش با %1$s"</string>
   <string name="a11y_react_with_other_emojis">"واکنش با شکلک‌های دیگر"</string>
   <string name="a11y_read_receipts_multiple">"خوانده به دست %1$s و %2$s"</string>
+  <plurals name="a11y_read_receipts_multiple_with_others">
+    <item quantity="one">"خوانده شده توسط%1$s و%2$d نفر دیگر"</item>
+    <item quantity="other">"خوانده شده توسط%1$s و%2$d نفر دیگر"</item>
+  </plurals>
   <string name="a11y_read_receipts_single">"خوانده به دست %1$s"</string>
   <string name="a11y_read_receipts_tap_to_show_all">"زدن برای نمایش همه"</string>
   <string name="a11y_remove_reaction">"برداشتن واکنش با %1$s"</string>
@@ -112,7 +120,7 @@
   <string name="action_quote">"نقل قول"</string>
   <string name="action_react">"واکنش"</string>
   <string name="action_reject">"رد کردن"</string>
-  <string name="action_remove">"برداشتن"</string>
+  <string name="action_remove">"حذف"</string>
   <string name="action_remove_caption">"برداشتن عنوان"</string>
   <string name="action_remove_message">"برداشتن پیام‌ها"</string>
   <string name="action_reply">"پاسخ"</string>
@@ -216,6 +224,10 @@
   <string name="common_link_copied_to_clipboard">"پیوند در تخته‌گیره رونوشت شد"</string>
   <string name="common_loading">"بار کردن…"</string>
   <string name="common_loading_more">"بار کردن بیش‌تر…"</string>
+  <plurals name="common_member_count">
+    <item quantity="one">"%1$d عضو"</item>
+    <item quantity="other">"%1$d عضو"</item>
+  </plurals>
   <string name="common_message">"پیام"</string>
   <string name="common_message_actions">"کنش‌های پیام"</string>
   <string name="common_message_layout">"جینش پیام"</string>
@@ -241,6 +253,10 @@
   <string name="common_poll_summary">"نظرسنجی: %1$s"</string>
   <string name="common_poll_total_votes">"مجموع آرا: %1$s"</string>
   <string name="common_poll_undisclosed_text">"نتیجه‌ها پس از پایان نظرسنجی نشان داده خواهند شد"</string>
+  <plurals name="common_poll_votes_count">
+    <item quantity="one">"%d رأی"</item>
+    <item quantity="other">"%d رأی"</item>
+  </plurals>
   <string name="common_preparing">"آماده سازی…"</string>
   <string name="common_privacy_policy">"سیاست محرمانگی"</string>
   <string name="common_private_room">"اتاق خصوصی"</string>
diff --git a/libraries/ui-strings/src/main/res/values-fi/translations.xml b/libraries/ui-strings/src/main/res/values-fi/translations.xml
index 1885f56f66..bc23e78b05 100644
--- a/libraries/ui-strings/src/main/res/values-fi/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fi/translations.xml
@@ -95,10 +95,11 @@
   <string name="action_forgot_password">"Unohditko salasanan?"</string>
   <string name="action_forward">"Välitä"</string>
   <string name="action_go_back">"Takaisin"</string>
+  <string name="action_go_to_roles_and_permissions">"Siirry rooleihin ja oikeuksiin"</string>
   <string name="action_go_to_settings">"Siirry asetuksiin"</string>
   <string name="action_ignore">"Ohita"</string>
   <string name="action_invite">"Kutsu"</string>
-  <string name="action_invite_friends">"Kutsu ihmisiä"</string>
+  <string name="action_invite_friends">"Kutsu henkilöitä"</string>
   <string name="action_invite_friends_to_app">"Kutsu ihmisiä %1$s -sovellukseen"</string>
   <string name="action_invite_people_to_app">"Kutsu ihmisiä %1$s -sovellukseen"</string>
   <string name="action_invites_list">"Kutsut"</string>
@@ -444,6 +445,10 @@ Haluatko varmasti jatkaa?"</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Viestiäsi ei lähetetty, koska %1$s ei ole vahvistanut kaikkia laitteitaan."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Yksi tai useampi laitteistasi on vahvistamaton. Voit lähettää viestin silti tai peruuttaa sen toistaiseksi ja yrittää uudelleen myöhemmin, kun olet vahvistanut kaikki laitteesi."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"Viestiäsi ei lähetetty, koska et ole vahvistanut yhtä tai useampaa laitettasi."</string>
+  <string name="screen_room_change_permissions_change_settings">"Asetusten muuttaminen"</string>
+  <string name="screen_room_change_permissions_manage_space">"Tilan hallitseminen"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"Huoneiden hallitseminen"</string>
+  <string name="screen_room_change_permissions_title">"Oikeudet"</string>
   <string name="screen_room_change_role_administrators_or_owners_title">"Muokkaa ylläpitäjiä tai omistajia"</string>
   <string name="screen_room_error_failed_processing_media">"Median käsittely epäonnistui, yritä uudelleen."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Käyttäjän tietojen hakeminen epäonnistui"</string>
diff --git a/libraries/ui-strings/src/main/res/values-it/translations.xml b/libraries/ui-strings/src/main/res/values-it/translations.xml
index 77a1a20782..793b115917 100644
--- a/libraries/ui-strings/src/main/res/values-it/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-it/translations.xml
@@ -42,7 +42,7 @@
   <string name="a11y_remove_reaction_with">"Rimuovere la reazione con %1$s"</string>
   <string name="a11y_room_avatar">"Avatar della stanza"</string>
   <string name="a11y_send_files">"Invia file"</string>
-  <string name="a11y_session_verification_time_limited_action_required">"Azione a tempo limitato richiesta"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"Azione richiesta a tempo limitato, hai un minuto per la verifica"</string>
   <string name="a11y_show_password">"Mostra password"</string>
   <string name="a11y_start_call">"Avvia una chiamata"</string>
   <string name="a11y_tombstoned_room">"Stanza obsoleta"</string>
@@ -80,6 +80,7 @@
   <string name="action_decline">"Rifiuta"</string>
   <string name="action_decline_and_block">"Rifiuta e blocca"</string>
   <string name="action_delete_poll">"Elimina sondaggio"</string>
+  <string name="action_deselect_all">"Deseleziona tutti"</string>
   <string name="action_disable">"Disabilita"</string>
   <string name="action_discard">"Annulla"</string>
   <string name="action_dismiss">"Chiudi"</string>
@@ -94,6 +95,8 @@
   <string name="action_forgot_password">"Password dimenticata?"</string>
   <string name="action_forward">"Inoltra"</string>
   <string name="action_go_back">"Indietro"</string>
+  <string name="action_go_to_roles_and_permissions">"Vai a ruoli &amp; autorizzazioni"</string>
+  <string name="action_go_to_settings">"Vai alle impostazioni"</string>
   <string name="action_ignore">"Ignora"</string>
   <string name="action_invite">"Invita"</string>
   <string name="action_invite_friends">"Invita persone"</string>
@@ -105,10 +108,12 @@
   <string name="action_leave">"Esci"</string>
   <string name="action_leave_conversation">"Abbandona la conversazione"</string>
   <string name="action_leave_room">"Esci dalla stanza"</string>
+  <string name="action_leave_space">"Esci dallo spazio"</string>
   <string name="action_load_more">"Carica altro"</string>
   <string name="action_manage_account">"Gestisci account"</string>
   <string name="action_manage_devices">"Gestisci dispositivi"</string>
   <string name="action_message">"Invia messaggio"</string>
+  <string name="action_minimize">"Riduci"</string>
   <string name="action_next">"Avanti"</string>
   <string name="action_no">"No"</string>
   <string name="action_not_now">"Non ora"</string>
@@ -137,6 +142,7 @@
   <string name="action_retry_decryption">"Riprova la decrittazione"</string>
   <string name="action_save">"Salva"</string>
   <string name="action_search">"Ricerca"</string>
+  <string name="action_select_all">"Seleziona tutti"</string>
   <string name="action_send">"Invia"</string>
   <string name="action_send_edited_message">"Invia messaggio modificato"</string>
   <string name="action_send_message">"Invia messaggio"</string>
@@ -165,6 +171,8 @@
   <string name="banner_migrate_to_native_sliding_sync_title">"Aggiornamento disponibile"</string>
   <string name="common_about">"Informazioni"</string>
   <string name="common_acceptable_use_policy">"Regole sull\'utilizzo consentito"</string>
+  <string name="common_add_account">"Aggiungi un account"</string>
+  <string name="common_add_another_account">"Aggiungi un altro account"</string>
   <string name="common_adding_caption">"Aggiunta didascalia"</string>
   <string name="common_advanced_settings">"Impostazioni avanzate"</string>
   <string name="common_an_image">"un\'immagine"</string>
@@ -173,6 +181,7 @@
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Sei stato disconnesso dalla sessione"</string>
   <string name="common_appearance">"Aspetto"</string>
   <string name="common_audio">"Audio"</string>
+  <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Utenti bloccati"</string>
   <string name="common_bubbles">"Fumetti"</string>
   <string name="common_call_started">"Chiamata avviata"</string>
@@ -182,9 +191,11 @@
   <string name="common_creating_room">"Creazione stanza…"</string>
   <string name="common_current_user_canceled_knock">"Richiesta annullata"</string>
   <string name="common_current_user_left_room">"Hai lasciato la stanza"</string>
+  <string name="common_current_user_left_space">"Hai lasciato lo spazio"</string>
   <string name="common_current_user_rejected_invite">"Invito rifiutato"</string>
   <string name="common_dark">"Scuro"</string>
   <string name="common_decryption_error">"Errore di decrittazione"</string>
+  <string name="common_description">"Descrizione"</string>
   <string name="common_developer_options">"Opzioni sviluppatore"</string>
   <string name="common_device_id">"ID dispositivo"</string>
   <string name="common_direct_chat">"Conversazione diretta"</string>
@@ -219,6 +230,7 @@ Motivo:. %1$s"</string>
   <string name="common_install_apk_android">"Installa APK"</string>
   <string name="common_invite_unknown_profile">"Questo ID Matrix non può essere trovato, quindi l\'invito potrebbe non essere ricevuto."</string>
   <string name="common_leaving_room">"Lascio la stanza"</string>
+  <string name="common_leaving_space">"Uscendo dallo spazio"</string>
   <string name="common_light">"Chiaro"</string>
   <string name="common_line_copied_to_clipboard">"Riga copiata negli appunti"</string>
   <string name="common_link_copied_to_clipboard">"Collegamento copiato negli appunti"</string>
@@ -241,6 +253,7 @@ Motivo:. %1$s"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Nessun risultato"</string>
   <string name="common_no_room_name">"Nessun nome della stanza"</string>
+  <string name="common_no_space_name">"Spazio senza nome"</string>
   <string name="common_not_encrypted">"Non cifrato"</string>
   <string name="common_offline">"Non in linea"</string>
   <string name="common_open_source_licenses">"Licenze open source"</string>
@@ -294,15 +307,19 @@ Motivo:. %1$s"</string>
   <string name="common_search_results">"Risultati di ricerca"</string>
   <string name="common_security">"Sicurezza"</string>
   <string name="common_seen_by">"Visto da"</string>
+  <string name="common_select_account">"Seleziona un account"</string>
   <string name="common_send_to">"Invia a"</string>
   <string name="common_sending">"Invio in corso…"</string>
   <string name="common_sending_failed">"Invio fallito"</string>
   <string name="common_sent">"Inviato"</string>
   <string name="common_sentence_delimiter">"."</string>
   <string name="common_server_not_supported">"Server non supportato"</string>
+  <string name="common_server_unreachable">"Server non raggiungibile"</string>
   <string name="common_server_url">"URL del server"</string>
   <string name="common_settings">"Impostazioni"</string>
+  <string name="common_share_space">"Condividi lo spazio"</string>
   <string name="common_shared_location">"Posizione condivisa"</string>
+  <string name="common_shared_space">"Spazio condiviso"</string>
   <string name="common_signing_out">"Disconnessione"</string>
   <string name="common_something_went_wrong">"Qualcosa è andato storto"</string>
   <string name="common_something_went_wrong_message">"Abbiamo riscontrato un problema. Per favore riprova."</string>
@@ -376,6 +393,8 @@ Sei sicuro di voler continuare?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"La dimensione massima consentita per il file è: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Seleziona la qualità del video che vuoi caricare."</string>
   <string name="dialog_video_quality_selector_title">"Seleziona la qualità di caricamento del video"</string>
+  <string name="emoji_picker_search_placeholder">"Cerca emoji"</string>
+  <string name="error_account_already_logged_in">"Hai già effettuato l\'accesso su questo dispositivo come %1$s ."</string>
   <string name="error_account_creation_not_possible">"Il tuo homeserver deve essere aggiornato per supportare il Matrix Authentication Service e la creazione di account."</string>
   <string name="error_failed_creating_the_permalink">"Impossibile creare il collegamento permanente"</string>
   <string name="error_failed_loading_map">"%1$s non è riuscito a caricare la mappa. Riprova più tardi."</string>
@@ -426,6 +445,10 @@ Sei sicuro di voler continuare?"</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Il tuo messaggio non è stato inviato perché %1$s non ha verificato tutti i dispositivi."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Uno o più dispositivi non sono verificati. Puoi inviare il messaggio comunque, oppure annullarlo e riprovare più tardi dopo aver verificato tutti i tuoi dispositivi."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"Il tuo messaggio non è stato inviato perché non hai verificato uno o più dispositivi."</string>
+  <string name="screen_room_change_permissions_change_settings">"Modifica impostazioni"</string>
+  <string name="screen_room_change_permissions_manage_space">"Gestire lo spazio"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"Gestisci le stanze"</string>
+  <string name="screen_room_change_permissions_title">"Autorizzazioni"</string>
   <string name="screen_room_change_role_administrators_or_owners_title">"Modifica amministratori o proprietari"</string>
   <string name="screen_room_error_failed_processing_media">"Elaborazione del file multimediale da caricare fallita, riprova."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Impossibile recuperare i dettagli dell\'utente"</string>
@@ -446,7 +469,9 @@ Sei sicuro di voler continuare?"</string>
   <string name="screen_share_this_location_action">"Condividi questa posizione"</string>
   <string name="screen_space_list_description">"Spazi che hai creato o a cui hai aderito."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
+  <string name="screen_space_list_parent_space">"%1$s spazio"</string>
   <string name="screen_space_list_title">"Spazi"</string>
+  <string name="screen_space_menu_action_members">"Visualizza membri"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Messaggio non inviato perché l\'identità verificata di %1$s è stata reimpostata."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Messaggio non inviato perché %1$s non ha verificato tutti i dispositivi."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Messaggio non inviato perché non hai verificato uno o più dispositivi."</string>
diff --git a/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml b/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml
index fabc600b67..2f9b4a13e8 100644
--- a/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml
@@ -2,6 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Adicionar reação: %1$s"</string>
   <string name="a11y_avatar">"Avatar"</string>
+  <string name="a11y_collapse_message_text_field">"Minimizar campo de texto de mensagem"</string>
   <string name="a11y_delete">"Apagar"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d dígito digitado"</item>
@@ -10,6 +11,7 @@
   <string name="a11y_edit_avatar">"Editar avatar"</string>
   <string name="a11y_edit_room_address_hint">"O endereço completo será %1$s"</string>
   <string name="a11y_encryption_details">"Detalhes de criptografia"</string>
+  <string name="a11y_expand_message_text_field">"Expandir campo de texto de mensagem"</string>
   <string name="a11y_hide_password">"Ocultar senha"</string>
   <string name="a11y_join_call">"Entrar à chamada"</string>
   <string name="a11y_jump_to_bottom">"Ir para o final"</string>
@@ -40,7 +42,7 @@
   <string name="a11y_remove_reaction_with">"Remover reação com %1$s"</string>
   <string name="a11y_room_avatar">"Avatar da sala"</string>
   <string name="a11y_send_files">"Enviar arquivos"</string>
-  <string name="a11y_session_verification_time_limited_action_required">"Ação de tempo limitado necessária"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"Ação de tempo limitado necessária, você tem um minuto para verificar"</string>
   <string name="a11y_show_password">"Mostrar senha"</string>
   <string name="a11y_start_call">"Iniciar uma chamada"</string>
   <string name="a11y_tombstoned_room">"Sala morta"</string>
@@ -78,6 +80,7 @@
   <string name="action_decline">"Recusar"</string>
   <string name="action_decline_and_block">"Recusar e bloquear"</string>
   <string name="action_delete_poll">"Excluir enquete"</string>
+  <string name="action_deselect_all">"Desselecionar tudo"</string>
   <string name="action_disable">"Desativar"</string>
   <string name="action_discard">"Descartar"</string>
   <string name="action_dismiss">"Dispensar"</string>
@@ -88,9 +91,12 @@
   <string name="action_enable">"Ativar"</string>
   <string name="action_end_poll">"Encerrar enquete"</string>
   <string name="action_enter_pin">"Digitar PIN"</string>
+  <string name="action_finish">"Concluir"</string>
   <string name="action_forgot_password">"Esqueceu a senha?"</string>
   <string name="action_forward">"Encaminhar"</string>
   <string name="action_go_back">"Voltar"</string>
+  <string name="action_go_to_roles_and_permissions">"Ir aos cargos e permissões"</string>
+  <string name="action_go_to_settings">"Ir às configurações"</string>
   <string name="action_ignore">"Ignorar"</string>
   <string name="action_invite">"Convidar"</string>
   <string name="action_invite_friends">"Convidar pessoas"</string>
@@ -102,10 +108,12 @@
   <string name="action_leave">"Sair"</string>
   <string name="action_leave_conversation">"Sair da conversa"</string>
   <string name="action_leave_room">"Sair da sala"</string>
+  <string name="action_leave_space">"Sair do espaço"</string>
   <string name="action_load_more">"Carregar mais"</string>
   <string name="action_manage_account">"Gerenciar conta"</string>
   <string name="action_manage_devices">"Gerenciar dispositivos"</string>
   <string name="action_message">"Mensagem"</string>
+  <string name="action_minimize">"Minimizar"</string>
   <string name="action_next">"Avançar"</string>
   <string name="action_no">"Não"</string>
   <string name="action_not_now">"Agora não"</string>
@@ -134,6 +142,7 @@
   <string name="action_retry_decryption">"Tentar descriptografar novamente"</string>
   <string name="action_save">"Salvar"</string>
   <string name="action_search">"Pesquisar"</string>
+  <string name="action_select_all">"Selecionar tudo"</string>
   <string name="action_send">"Enviar"</string>
   <string name="action_send_edited_message">"Enviar mensagem editada"</string>
   <string name="action_send_message">"Enviar mensagem"</string>
@@ -162,12 +171,17 @@
   <string name="banner_migrate_to_native_sliding_sync_title">"Atualização disponível"</string>
   <string name="common_about">"Sobre"</string>
   <string name="common_acceptable_use_policy">"Política de uso aceitável"</string>
+  <string name="common_add_account">"Adicionar uma conta"</string>
+  <string name="common_add_another_account">"Adicionar outra conta"</string>
   <string name="common_adding_caption">"Adicionando legenda"</string>
   <string name="common_advanced_settings">"Configurações avançadas"</string>
   <string name="common_an_image">"uma imagem"</string>
   <string name="common_analytics">"Telemetria"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Você saiu da sala"</string>
+  <string name="common_android_shortcuts_remove_reason_session_logged_out">"Você foi desconectado da sessão"</string>
   <string name="common_appearance">"Aparência"</string>
   <string name="common_audio">"Áudio"</string>
+  <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Usuários bloqueados"</string>
   <string name="common_bubbles">"Balões"</string>
   <string name="common_call_started">"Chamada iniciada"</string>
@@ -177,9 +191,11 @@
   <string name="common_creating_room">"Criando sala…"</string>
   <string name="common_current_user_canceled_knock">"Solicitação cancelada"</string>
   <string name="common_current_user_left_room">"Saiu da sala"</string>
+  <string name="common_current_user_left_space">"Saiu do espaço"</string>
   <string name="common_current_user_rejected_invite">"Convite recusado"</string>
   <string name="common_dark">"Escuro"</string>
   <string name="common_decryption_error">"Erro de descriptografia"</string>
+  <string name="common_description">"Descrição"</string>
   <string name="common_developer_options">"Opções de desenvolvedor"</string>
   <string name="common_device_id">"ID do dispositivo"</string>
   <string name="common_direct_chat">"Conversa direta"</string>
@@ -214,6 +230,7 @@ Motivo:​ %1$s."</string>
   <string name="common_install_apk_android">"Instalar APK"</string>
   <string name="common_invite_unknown_profile">"Este ID Matrix não foi encontrado, então o convite pode não ser recebido"</string>
   <string name="common_leaving_room">"Saindo da sala"</string>
+  <string name="common_leaving_space">"Saindo do espaço"</string>
   <string name="common_light">"Claro"</string>
   <string name="common_line_copied_to_clipboard">"Linha copiada para a área de transferência"</string>
   <string name="common_link_copied_to_clipboard">"Link copiado para área de transferência"</string>
@@ -236,6 +253,7 @@ Motivo:​ %1$s."</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Não há resultados"</string>
   <string name="common_no_room_name">"Não há um nome para a sala"</string>
+  <string name="common_no_space_name">"Sem nome de espaço"</string>
   <string name="common_not_encrypted">"Sem criptografia"</string>
   <string name="common_offline">"Off-line"</string>
   <string name="common_open_source_licenses">"Licenças de código aberto"</string>
@@ -289,18 +307,23 @@ Motivo:​ %1$s."</string>
   <string name="common_search_results">"Resultados da pesquisa"</string>
   <string name="common_security">"Segurança"</string>
   <string name="common_seen_by">"Visto por"</string>
+  <string name="common_select_account">"Selecionar uma conta"</string>
   <string name="common_send_to">"Enviar para"</string>
   <string name="common_sending">"Enviando…"</string>
   <string name="common_sending_failed">"Envio falhou"</string>
   <string name="common_sent">"Enviado"</string>
   <string name="common_sentence_delimiter">". "</string>
   <string name="common_server_not_supported">"Servidor não suportado"</string>
+  <string name="common_server_unreachable">"Servidor inacessível"</string>
   <string name="common_server_url">"URL do servidor"</string>
   <string name="common_settings">"Configurações"</string>
+  <string name="common_share_space">"Compartilhar espaço"</string>
   <string name="common_shared_location">"Localização compartilhada"</string>
+  <string name="common_shared_space">"Espaço compartilhado"</string>
   <string name="common_signing_out">"Saindo"</string>
   <string name="common_something_went_wrong">"Algo deu errado"</string>
   <string name="common_something_went_wrong_message">"Encontramos um problema. Tente novamente."</string>
+  <string name="common_space">"Espaço"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d espaço"</item>
     <item quantity="other">"%1$d espaços"</item>
@@ -335,6 +358,12 @@ Motivo:​ %1$s."</string>
   <string name="common_verify_identity">"Verificar identidade"</string>
   <string name="common_verify_user">"Verificar usuário"</string>
   <string name="common_video">"Vídeo"</string>
+  <string name="common_video_quality_high">"Alta qualidade"</string>
+  <string name="common_video_quality_high_description">"Melhor qualidade, mas tamanho de arquivo maior"</string>
+  <string name="common_video_quality_low">"Baixa qualidade"</string>
+  <string name="common_video_quality_low_description">"Maior velocidade de envio e menor tamanho de arquivo"</string>
+  <string name="common_video_quality_standard">"Qualidade normal"</string>
+  <string name="common_video_quality_standard_description">"Equilíbrio entre qualidade e velocidade de envio"</string>
   <string name="common_voice_message">"Mensagem de voz"</string>
   <string name="common_waiting">"Aguardando…"</string>
   <string name="common_waiting_for_decryption_key">"Aguardando por esta mensagem"</string>
@@ -349,6 +378,10 @@ Motivo:​ %1$s."</string>
 
 Você tem certeza de que deseja continuar?"</string>
   <string name="dialog_confirm_link_title">"Verifique este link duas vezes"</string>
+  <string name="dialog_default_video_quality_selector_subtitle">"Selecione a qualidade padrão dos videos que você envia."</string>
+  <string name="dialog_default_video_quality_selector_title">"Qualidade de envio de vídeos"</string>
+  <string name="dialog_file_too_large_to_upload_subtitle">"O tamanho máximo permitido de arquivos é: %1$s"</string>
+  <string name="dialog_file_too_large_to_upload_title">"O tamanho do arquivo é muito grande para ser enviado"</string>
   <string name="dialog_room_reported">"Sala denunciada"</string>
   <string name="dialog_room_reported_and_left">"Denunciou e deixou a sala"</string>
   <string name="dialog_title_confirmation">"Confirmação"</string>
@@ -357,6 +390,11 @@ Você tem certeza de que deseja continuar?"</string>
   <string name="dialog_title_warning">"Alerta"</string>
   <string name="dialog_unsaved_changes_description_android">"Suas alterações não foram salvas. Tem certeza de que você quer voltar?"</string>
   <string name="dialog_unsaved_changes_title">"Salvar alterações?"</string>
+  <string name="dialog_video_quality_selector_subtitle_file_size">"O tamanho máximo permitido de arquivos é: %1$s"</string>
+  <string name="dialog_video_quality_selector_subtitle_no_file_size">"Selecione a qualidade do video que quer enviar."</string>
+  <string name="dialog_video_quality_selector_title">"Selecione a qualidade de envio dos vídeos"</string>
+  <string name="emoji_picker_search_placeholder">"Pesquisar emojis"</string>
+  <string name="error_account_already_logged_in">"Você já está conectado neste dispositivo como %1$s ."</string>
   <string name="error_account_creation_not_possible">"Seu servidor-casa precisa ser atualizado para oferecer suporte ao Matrix Authentication Service e à criação de contas."</string>
   <string name="error_failed_creating_the_permalink">"Falha ao criar o link permanente"</string>
   <string name="error_failed_loading_map">"%1$s não conseguiu carregar o mapa. Por favor, tente novamente mais tarde."</string>
@@ -407,6 +445,10 @@ Você tem certeza de que deseja continuar?"</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Sua mensagem não foi enviada porque %1$s não verificou todos os dispositivos"</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Um ou mais de seus dispositivos não foram verificados. Você pode enviar a mensagem mesmo assim ou pode cancelar por enquanto e tentar novamente mais tarde, depois de ter verificado todos os seus dispositivos."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"Sua mensagem não foi enviada porque você não verificou um ou mais de seus dispositivos"</string>
+  <string name="screen_room_change_permissions_change_settings">"Alterar configurações"</string>
+  <string name="screen_room_change_permissions_manage_space">"Gerenciar espaço"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"Gerenciar salas"</string>
+  <string name="screen_room_change_permissions_title">"Permissões"</string>
   <string name="screen_room_change_role_administrators_or_owners_title">"Editar administradores ou proprietários"</string>
   <string name="screen_room_error_failed_processing_media">"Falha ao processar a mídia para o envio. Tente novamente."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Não foi possível buscar os detalhes do usuário"</string>
@@ -427,7 +469,9 @@ Você tem certeza de que deseja continuar?"</string>
   <string name="screen_share_this_location_action">"Compartilhar esta localização"</string>
   <string name="screen_space_list_description">"Os espaços que você criou ou entrou."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
+  <string name="screen_space_list_parent_space">"Espaço %1$s"</string>
   <string name="screen_space_list_title">"Espaços"</string>
+  <string name="screen_space_menu_action_members">"Ver membros"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Mensagem não enviada porque a identidade verificada de %1$s foi redefinida."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"A mensagem não foi enviada porque %1$s não verificou todos os dispositivos."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Mensagem não enviada porque você não verificou um ou mais dos seus dispositivos."</string>
diff --git a/libraries/ui-strings/src/main/res/values-uz/translations.xml b/libraries/ui-strings/src/main/res/values-uz/translations.xml
index 40da86f9d5..8f23ee0d9e 100644
--- a/libraries/ui-strings/src/main/res/values-uz/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-uz/translations.xml
@@ -2,6 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Reaksiya qoʻyish: %1$s"</string>
   <string name="a11y_avatar">"Avatar"</string>
+  <string name="a11y_collapse_message_text_field">"Xabar matni maydonini kichraytirish"</string>
   <string name="a11y_delete">"Oʻchirish"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d ta raqam kiritildi"</item>
@@ -10,6 +11,7 @@
   <string name="a11y_edit_avatar">"Avatarni tahrirlash"</string>
   <string name="a11y_edit_room_address_hint">"To\'liq manzil %1$s bo\'ladi"</string>
   <string name="a11y_encryption_details">"Shifrlash tafsilotlari"</string>
+  <string name="a11y_expand_message_text_field">"Xabar matni maydonini kengaytirish"</string>
   <string name="a11y_hide_password">"Parolni yashirish"</string>
   <string name="a11y_join_call">"Qoʻngʻiroqga qoʻshilish"</string>
   <string name="a11y_jump_to_bottom">"Pastga o\'tish"</string>
@@ -40,7 +42,7 @@
   <string name="a11y_remove_reaction_with">"%1$s bilan reaktsiyani olib tashlang"</string>
   <string name="a11y_room_avatar">"Xona avatari"</string>
   <string name="a11y_send_files">"Fayllarni yuborish"</string>
-  <string name="a11y_session_verification_time_limited_action_required">"Vaqt cheklangan harakat talab qilinadi"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"Amal bajarish vaqti cheklangan, tasdiqlash uchun bir daqiqa vaqtingiz bor"</string>
   <string name="a11y_show_password">"Parolni ko\'rsatish"</string>
   <string name="a11y_start_call">"Qoʻngʻiroqni boshlash"</string>
   <string name="a11y_tombstoned_room">"Arxivlangan xona"</string>
@@ -88,6 +90,7 @@
   <string name="action_enable">"Yoqish"</string>
   <string name="action_end_poll">"So‘rovnomani tugatish"</string>
   <string name="action_enter_pin">"PIN kodni kiriting"</string>
+  <string name="action_finish">"Tugatish"</string>
   <string name="action_forgot_password">"Parolni unutdingizmi?"</string>
   <string name="action_forward">"Oldinga"</string>
   <string name="action_go_back">"Ortga qaytish"</string>
@@ -162,10 +165,14 @@
   <string name="banner_migrate_to_native_sliding_sync_title">"Yangilash mavjud"</string>
   <string name="common_about">"Haqida"</string>
   <string name="common_acceptable_use_policy">"Qabul qilinadigan foydalanish siyosati"</string>
+  <string name="common_add_account">"Hisob qo‘shish"</string>
+  <string name="common_add_another_account">"Boshqa hisob qo‘shish"</string>
   <string name="common_adding_caption">"Sarlavha qoʻshish"</string>
   <string name="common_advanced_settings">"Kengaytirilgan sozlamalar"</string>
   <string name="common_an_image">"rasm"</string>
   <string name="common_analytics">"Analitika"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Siz xonani tark etdingiz"</string>
+  <string name="common_android_shortcuts_remove_reason_session_logged_out">"Siz sessiyadan chiqdingiz"</string>
   <string name="common_appearance">"Ko\'rinish"</string>
   <string name="common_audio">"Audio"</string>
   <string name="common_blocked_users">"Bloklangan foydalanuvchilar"</string>
@@ -180,6 +187,7 @@
   <string name="common_current_user_rejected_invite">"Taklif rad etildi"</string>
   <string name="common_dark">"Tungi"</string>
   <string name="common_decryption_error">"Shifrni ochish xatosi"</string>
+  <string name="common_description">"Tavsif"</string>
   <string name="common_developer_options">"Dasturchi variantlari"</string>
   <string name="common_device_id">"Qurilma ID"</string>
   <string name="common_direct_chat">"Shaxsiy suhbat"</string>
@@ -258,12 +266,18 @@ Sababi:%1$s."</string>
   <string name="common_preparing">"Tayyorlanmoqda…"</string>
   <string name="common_privacy_policy">"Maxfiylik siyosati"</string>
   <string name="common_private_room">"Shaxsiy xona"</string>
+  <string name="common_private_space">"Shaxsiy guruh"</string>
   <string name="common_public_room">"Jamoat xonasi"</string>
+  <string name="common_public_space">"Jamoat guruhi"</string>
   <string name="common_reaction">"Reaktsiya"</string>
   <string name="common_reactions">"reaksiyalar"</string>
   <string name="common_reason">"Sabab"</string>
   <string name="common_recovery_key">"Qayta tiklash kaliti"</string>
   <string name="common_refreshing">"Yangilanmoqda…"</string>
+  <plurals name="common_replies">
+    <item quantity="one">"%1$d ta javob"</item>
+    <item quantity="other">"%1$d ta javob"</item>
+  </plurals>
   <string name="common_replying_to">"%1$sga Javob berilmoqda"</string>
   <string name="common_report_a_bug">"Xato haqida xabar bering"</string>
   <string name="common_report_a_problem">"Muammo haqida xabar bering"</string>
@@ -272,6 +286,10 @@ Sababi:%1$s."</string>
   <string name="common_room">"Xona"</string>
   <string name="common_room_name">"Xona nomi"</string>
   <string name="common_room_name_placeholder">"masalan, loyihangiz nomi"</string>
+  <plurals name="common_rooms">
+    <item quantity="one">"%1$d Xona"</item>
+    <item quantity="other">"%1$d Xonalar"</item>
+  </plurals>
   <string name="common_saved_changes">"Saqlangan oʻzgarishlar"</string>
   <string name="common_saving">"Saqlash"</string>
   <string name="common_screen_lock">"Ekran qulfi"</string>
@@ -279,18 +297,25 @@ Sababi:%1$s."</string>
   <string name="common_search_results">"Qidiruv natijalari"</string>
   <string name="common_security">"Xavfsizlik"</string>
   <string name="common_seen_by">"Tomonidan koʻrilgan"</string>
+  <string name="common_select_account">"Hisobni tanlang"</string>
   <string name="common_send_to">"Yubirish"</string>
   <string name="common_sending">"Yuborilmoqda…"</string>
   <string name="common_sending_failed">"Yuborilmadi"</string>
   <string name="common_sent">"Yuborilgan"</string>
   <string name="common_sentence_delimiter">". "</string>
   <string name="common_server_not_supported">"Server qo\'llab-quvvatlanmaydi"</string>
+  <string name="common_server_unreachable">"Serverga kirish imkonsiz"</string>
   <string name="common_server_url">"Server URL manzili"</string>
   <string name="common_settings">"Sozlamalar"</string>
   <string name="common_shared_location">"Joylashuvi ulashildi"</string>
   <string name="common_signing_out">"Chiqish"</string>
   <string name="common_something_went_wrong">"Nimadir xato ketdi"</string>
   <string name="common_something_went_wrong_message">"Muammoga duch keldik. Iltimos, qayta urinib koʻring."</string>
+  <string name="common_space">"Bo‘shliq"</string>
+  <plurals name="common_spaces">
+    <item quantity="one">"%1$d Guruh"</item>
+    <item quantity="other">"%1$d Guruhlar"</item>
+  </plurals>
   <string name="common_starting_chat">"Chat boshlanmoqda…"</string>
   <string name="common_sticker">"Stiker"</string>
   <string name="common_success">"Muvaffaqiyat"</string>
@@ -310,6 +335,7 @@ Sababi:%1$s."</string>
   <string name="common_unable_to_invite_title">"Taklif(lar)ni yuborib bo‘lmadi"</string>
   <string name="common_unlock">"Qulfni ochish"</string>
   <string name="common_unmute">"Ovozni yoqish"</string>
+  <string name="common_unsupported_call">"Qo‘llab-quvvatlanmaydigan chaqiruv"</string>
   <string name="common_unsupported_event">"Qo\'llab-quvvatlanmagan hodisa"</string>
   <string name="common_username">"Foydalanuvchi nomi"</string>
   <string name="common_verification_cancelled">"Tasdiqlash bekor qilindi"</string>
@@ -318,31 +344,62 @@ Sababi:%1$s."</string>
   <string name="common_verified">"Tasdiqlangan"</string>
   <string name="common_verify_device">"Qurilmani tasdiqlash"</string>
   <string name="common_verify_identity">"Shaxsni tasdiqlash"</string>
+  <string name="common_verify_user">"Foydalanuvchini tasdiqlang"</string>
   <string name="common_video">"Video"</string>
+  <string name="common_video_quality_high">"Yuqori sifatli"</string>
+  <string name="common_video_quality_high_description">"Eng yaxshi sifat, lekin kattaroq fayl hajmi"</string>
+  <string name="common_video_quality_low">"Past sifat"</string>
+  <string name="common_video_quality_low_description">"Eng tez yuklash tezligi va eng kichik fayl hajmi"</string>
+  <string name="common_video_quality_standard">"Standart sifat"</string>
+  <string name="common_video_quality_standard_description">"Sifat va yuklash tezligi balansi"</string>
   <string name="common_voice_message">"Ovozli xabar"</string>
   <string name="common_waiting">"Kutilmoqda…"</string>
   <string name="common_waiting_for_decryption_key">"Ushbu xabarni kutilmoqda"</string>
   <string name="common_you">"Siz"</string>
   <string name="crypto_identity_change_pin_violation">"%1$sning shaxsi qayta tiklandi.%2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"%1$sʼning %2$s shaxsiy ma’lumotlari qayta tiklandi.%3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s )"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$sning shaxsi qayta tiklandi."</string>
+  <string name="crypto_identity_change_verification_violation_new">"%1$sʼning %2$s shaxsiy ma’lumotlari qayta o‘rnatildi.%3$s"</string>
+  <string name="crypto_identity_change_withdraw_verification_action">"Tasdiqlashni bekor qilish"</string>
+  <string name="dialog_confirm_link_message">"%1$s havolasi sizni boshqa %2$s saytiga olib boradi
+
+Davom etasizmi?"</string>
+  <string name="dialog_confirm_link_title">"Ushbu havolani ikki marta tekshiring"</string>
+  <string name="dialog_default_video_quality_selector_subtitle">"Yuklagan videolaringizning standart sifatini tanlang."</string>
+  <string name="dialog_default_video_quality_selector_title">"Video yuklash sifati"</string>
+  <string name="dialog_file_too_large_to_upload_subtitle">"Ruxsat etilgan maksimal fayl hajmi: %1$s"</string>
+  <string name="dialog_file_too_large_to_upload_title">"Fayl hajmi yuklash uchun juda katta"</string>
+  <string name="dialog_room_reported">"Xona haqida xabar"</string>
+  <string name="dialog_room_reported_and_left">"Xabar berildi va xona tark etildi"</string>
   <string name="dialog_title_confirmation">"Tasdiqlash"</string>
   <string name="dialog_title_error">"Xato"</string>
   <string name="dialog_title_success">"Muvaffaqiyat"</string>
   <string name="dialog_title_warning">"Ogohlantirish"</string>
   <string name="dialog_unsaved_changes_description_android">"Oʻzgarishlar saqlanmadi. Haqiqatan ham orqaga qaytmoqchimisiz?"</string>
   <string name="dialog_unsaved_changes_title">"O‘zgartirishlarni saqlaysizmi?"</string>
+  <string name="dialog_video_quality_selector_subtitle_file_size">"Ruxsat etilgan maksimal fayl hajmi: %1$s"</string>
+  <string name="dialog_video_quality_selector_subtitle_no_file_size">"Yuklanadigan video sifatini tanlang."</string>
+  <string name="dialog_video_quality_selector_title">"Video yuklash sifatini tanlang"</string>
+  <string name="emoji_picker_search_placeholder">"Emojilarni qidiring"</string>
+  <string name="error_account_already_logged_in">"Bu qurilmada allaqachon %1$s hisobiga kirgansiz."</string>
   <string name="error_account_creation_not_possible">"Matrix autentifikatsiya xizmati va hisob yaratish imkoniyatini qo‘llab-quvvatlash uchun uy serveringizni yangilash talab etiladi."</string>
   <string name="error_failed_creating_the_permalink">"Doimiy havola yaratilmadi"</string>
   <string name="error_failed_loading_map">"%1$sxaritani yuklay olmadi. Iltimos keyinroq qayta urinib ko\'ring."</string>
   <string name="error_failed_loading_messages">"Xabarlar yuklanmadi"</string>
   <string name="error_failed_locating_user">"%1$sjoylashuvingizga kira olmadi. Iltimos keyinroq qayta urinib ko\'ring."</string>
   <string name="error_failed_uploading_voice_message">"Ovozli xabaringizni yuklashda xatolik roʻy berdi."</string>
+  <string name="error_invalid_invite">"Xona endi mavjud emas yoki taklif yaroqsiz."</string>
   <string name="error_message_not_found">"Xabar topilmadi"</string>
   <string name="error_missing_location_auth_android">"%1$sjoylashuvingizga kirishga ruxsati yo\'q. Sozlamalar orqali kirishni yoqishingiz mumkin."</string>
   <string name="error_missing_location_rationale_android">"%1$sjoylashuvingizga kirishga ruxsati yo\'q. Quyida kirishni yoqing."</string>
   <string name="error_missing_microphone_voice_rationale_android">"%1$smikrofoningizga kirish ruxsatiga ega emas. Ovozli xabar yozish uchun ruxsatni yoqing."</string>
+  <string name="error_network_or_server_issue">"Bu tarmoq yoki server muammolari bilan bog‘liq bo‘lishi mumkin."</string>
+  <string name="error_room_address_already_exists">"Bu xona manzili allaqachon mavjud. Xona manzili maydonini tahrirlang yoki xona nomini o‘zgartiring"</string>
+  <string name="error_room_address_invalid_symbols">"Ayrim belgilarga ruxsat berilmagan. Faqat harf, raqam va quyidagi belgilar ishlaydi! $ &amp;’() * + /; =? @ [ ] -. _"</string>
   <string name="error_some_messages_have_not_been_sent">"Bazi xabarlar yuborilmagan"</string>
   <string name="error_unknown">"Kechirasiz, xatolik yuz berdi"</string>
+  <string name="event_shield_mismatched_sender">"Hodisani yuborgan shaxs uni yuborgan qurilmaning egasi bilan mos kelmaydi."</string>
   <string name="event_shield_reason_authenticity_not_guaranteed">"Bu qurilmada shifrlangan xabarning haqiqiyligini kafolatlash imkonsiz."</string>
   <string name="event_shield_reason_previously_verified">"Avval tasdiqlangan foydalanuvchi tomonidan shifrlangan."</string>
   <string name="event_shield_reason_sent_in_clear">"Shifrlanmagan"</string>
@@ -353,6 +410,11 @@ Sababi:%1$s."</string>
   <string name="invite_friends_text">"Hey, men bilan gaplash%1$s :%2$s"</string>
   <string name="login_initial_device_name_android">"%1$sAndroid"</string>
   <string name="preference_rageshake">"Xato haqida xabar berish uchun G\'azablanish"</string>
+  <string name="screen_bug_report_a11y_screenshot">"Skrinshot"</string>
+  <string name="screen_create_poll_option_accessibility_label">"%1$s:%2$s"</string>
+  <string name="screen_create_poll_options_section_title">"Parametrlar"</string>
+  <string name="screen_create_poll_remove_accessibility_label">"%1$sni olib tashlash"</string>
+  <string name="screen_create_poll_settings_section_title">"Sozlamalar"</string>
   <string name="screen_media_picker_error_failed_selection">"Media tanlash jarayonida xatolik yuz berdi, qayta urinib ko\'ring"</string>
   <string name="screen_pinned_timeline_empty_state_description">"Xabarni bosib, bu yerga kiritish uchun \"%1$s\"-ni tanlang."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Muhim xabarlarni osongina topish uchun qadang"</string>
@@ -371,8 +433,13 @@ Sababi:%1$s."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"%1$s barcha qurilmalarni tasdiqlamagani uchun xabaringiz yuborilmadi"</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Bir yoki bir nechta qurilmangiz tasdiqlanmagan. Xabarni istalgancha yuborishingiz yoki hozircha bekor qilishingiz va barcha qurilmalaringizni tasdiqlaganingizdan keyin qayta urinishingiz mumkin."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"Xabaringiz yuborilmadi, chunki bir yoki bir nechta qurilmangizni tasdiqlamagansiz"</string>
+  <string name="screen_room_change_role_administrators_or_owners_title">"Administratorlar yoki egalarni tahrirlash"</string>
   <string name="screen_room_error_failed_processing_media">"Mediani yuklab bo‘lmadi, qayta urinib ko‘ring."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Foydalanuvchi tafsilotlarini olinmadi"</string>
+  <string name="screen_room_event_pill">"Xabar %1$sda"</string>
+  <string name="screen_room_grouped_state_events_expand">"Kengaytirish"</string>
+  <string name="screen_room_grouped_state_events_reduce">"Kamaytirish"</string>
+  <string name="screen_room_permalink_same_room_android">"Bu xona allaqachon ko‘rilmoqda!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$sʼdan %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s ta qadalgan xabar"</string>
   <string name="screen_room_pinned_banner_loading_description">"Xabar yuklanmoqda…"</string>
@@ -384,11 +451,18 @@ Sababi:%1$s."</string>
   <string name="screen_share_open_google_maps">"Google Mapsda oching"</string>
   <string name="screen_share_open_osm_maps">"OpenStreetMapda oching"</string>
   <string name="screen_share_this_location_action">"Bu joylashuvni ulashing"</string>
+  <string name="screen_space_list_description">"Siz yaratgan yoki qo‘shilgan guruhlar."</string>
+  <string name="screen_space_list_details">"%1$s•%2$s"</string>
+  <string name="screen_space_list_title">"Bo‘shliqlar"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Xabar yuborilmadi, chunki %1$sʼning tasdiqlangan identifikatori asliga qaytarildi."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Xabar yuborilmadi, chunki %1$s barcha qurilmalarni tasdiqlamagan."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Xabaringiz yuborilmadi, chunki siz bir yoki bir nechta qurilmangizni tasdiqlamagan ekansiz."</string>
   <string name="screen_view_location_title">"Joylashuv"</string>
   <string name="settings_version_number">"Versiya:%1$s (%2$s )"</string>
   <string name="test_language_identifier">"en"</string>
+  <string name="timeline_decryption_failure_historical_event_no_key_backup">"Bu qurilmada tarixiy xabarlar mavjud emas"</string>
+  <string name="timeline_decryption_failure_historical_event_unverified_device">"Tarixiy xabarlarga kirish uchun bu qurilmani tasdiqlashingiz kerak"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Sizni ushbu xabarga ruxsatingiz yoʻq"</string>
+  <string name="timeline_decryption_failure_unable_to_decrypt">"Xabarni shifrini ochib bo‘lmadi"</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Bu xabar bloklandi, chunki siz qurilmangizni tasdiqlamadingiz yoki yuboruvchi shaxsingizni tasdiqlashi kerak bo‘lgani sababli bloklandi"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-zh/translations.xml b/libraries/ui-strings/src/main/res/values-zh/translations.xml
index a4144eb8f0..a743a5771b 100644
--- a/libraries/ui-strings/src/main/res/values-zh/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-zh/translations.xml
@@ -93,6 +93,8 @@
   <string name="action_forgot_password">"忘记密码？"</string>
   <string name="action_forward">"转发"</string>
   <string name="action_go_back">"返回"</string>
+  <string name="action_go_to_roles_and_permissions">"前往角色与权限"</string>
+  <string name="action_go_to_settings">"前往设置"</string>
   <string name="action_ignore">"忽略"</string>
   <string name="action_invite">"邀请"</string>
   <string name="action_invite_friends">"邀请朋友"</string>
@@ -177,6 +179,7 @@
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"您已被注销当前会话"</string>
   <string name="common_appearance">"外观"</string>
   <string name="common_audio">"音频"</string>
+  <string name="common_beta">"测试版"</string>
   <string name="common_blocked_users">"已屏蔽用户"</string>
   <string name="common_bubbles">"气泡"</string>
   <string name="common_call_started">"通话已开始"</string>
@@ -307,7 +310,9 @@
   <string name="common_server_unreachable">"无法访问服务器"</string>
   <string name="common_server_url">"服务器 URL"</string>
   <string name="common_settings">"设置"</string>
+  <string name="common_share_space">"共享空间"</string>
   <string name="common_shared_location">"共享位置"</string>
+  <string name="common_shared_space">"共享空间"</string>
   <string name="common_signing_out">"正在登出"</string>
   <string name="common_something_went_wrong">"发生了一些错误"</string>
   <string name="common_something_went_wrong_message">"我们遇到了一个问题。请重试。"</string>
@@ -451,7 +456,9 @@
   <string name="screen_share_this_location_action">"分享这个位置"</string>
   <string name="screen_space_list_description">"您创建或加入的空间。"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
+  <string name="screen_space_list_parent_space">"%1$s空间"</string>
   <string name="screen_space_list_title">"空间"</string>
+  <string name="screen_space_menu_action_members">"查看成员"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"消息未发送，因为%1$s的已验证身份已被重置。"</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"消息未发送，因为%1$s尚未验证所有设备。"</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"消息未发送，因为您有尚未验证的设备。"</string>
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index b1586a8d66..dcd3cdd6e2 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -246,6 +246,7 @@ Reason: %1$s."</string>
   </plurals>
   <string name="common_message">"Message"</string>
   <string name="common_message_actions">"Message actions"</string>
+  <string name="common_message_failed_to_send">"Message failed to send"</string>
   <string name="common_message_layout">"Message layout"</string>
   <string name="common_message_removed">"Message removed"</string>
   <string name="common_modern">"Modern"</string>
@@ -368,6 +369,7 @@ Reason: %1$s."</string>
   <string name="common_waiting">"Waiting…"</string>
   <string name="common_waiting_for_decryption_key">"Waiting for this message"</string>
   <string name="common_you">"You"</string>
+  <string name="crypto_history_visible">"Messages you send will be shared with new members invited to this room. %1$s"</string>
   <string name="crypto_identity_change_pin_violation">"%1$s\'s identity was reset. %2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"%1$s’s %2$s identity was reset. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
@@ -427,6 +429,11 @@ Are you sure you want to continue?"</string>
   <string name="screen_create_poll_options_section_title">"Options"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Remove %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Settings"</string>
+  <string name="screen_manage_authorized_spaces_header">"Spaces where members can join the room without an invitation."</string>
+  <string name="screen_manage_authorized_spaces_title">"Manage spaces"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(Unknown space)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Other spaces you’re not a member of"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Your spaces"</string>
   <string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Press on a message and choose “%1$s” to include here."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Pin important messages so that they can be easily discovered"</string>
diff --git a/screenshots/html/data.js b/screenshots/html/data.js
index 6d8ee5fbab..758b77c7ee 100644
--- a/screenshots/html/data.js
+++ b/screenshots/html/data.js
@@ -1,80 +1,80 @@
 // Generated file, do not edit
 export const screenshots = [
 ["en","en-dark","de",],
-["features.preferences.impl.about_AboutView_Day_0_en","features.preferences.impl.about_AboutView_Night_0_en",20413,],
+["features.preferences.impl.about_AboutView_Day_0_en","features.preferences.impl.about_AboutView_Night_0_en",20420,],
 ["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_0_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_0_en",0,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en",20413,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en",20413,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en",20413,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en",20413,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_5_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_5_en",20413,],
-["features.logout.impl_AccountDeactivationView_Day_0_en","features.logout.impl_AccountDeactivationView_Night_0_en",20413,],
-["features.logout.impl_AccountDeactivationView_Day_1_en","features.logout.impl_AccountDeactivationView_Night_1_en",20413,],
-["features.logout.impl_AccountDeactivationView_Day_2_en","features.logout.impl_AccountDeactivationView_Night_2_en",20413,],
-["features.logout.impl_AccountDeactivationView_Day_3_en","features.logout.impl_AccountDeactivationView_Night_3_en",20413,],
-["features.logout.impl_AccountDeactivationView_Day_4_en","features.logout.impl_AccountDeactivationView_Night_4_en",20413,],
-["features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en","features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en",20413,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en",20420,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en",20420,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en",20420,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en",20420,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_5_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_5_en",20420,],
+["features.logout.impl_AccountDeactivationView_Day_0_en","features.logout.impl_AccountDeactivationView_Night_0_en",20420,],
+["features.logout.impl_AccountDeactivationView_Day_1_en","features.logout.impl_AccountDeactivationView_Night_1_en",20420,],
+["features.logout.impl_AccountDeactivationView_Day_2_en","features.logout.impl_AccountDeactivationView_Night_2_en",20420,],
+["features.logout.impl_AccountDeactivationView_Day_3_en","features.logout.impl_AccountDeactivationView_Night_3_en",20420,],
+["features.logout.impl_AccountDeactivationView_Day_4_en","features.logout.impl_AccountDeactivationView_Night_4_en",20420,],
+["features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en","features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en",20420,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_0_en","features.login.impl.accountprovider_AccountProviderView_Night_0_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_1_en","features.login.impl.accountprovider_AccountProviderView_Night_1_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_2_en","features.login.impl.accountprovider_AccountProviderView_Night_2_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_3_en","features.login.impl.accountprovider_AccountProviderView_Night_3_en",0,],
-["libraries.accountselect.impl_AccountSelectView_Day_0_en","libraries.accountselect.impl_AccountSelectView_Night_0_en",20413,],
-["libraries.accountselect.impl_AccountSelectView_Day_1_en","libraries.accountselect.impl_AccountSelectView_Night_1_en",20413,],
+["libraries.accountselect.impl_AccountSelectView_Day_0_en","libraries.accountselect.impl_AccountSelectView_Night_0_en",20420,],
+["libraries.accountselect.impl_AccountSelectView_Day_1_en","libraries.accountselect.impl_AccountSelectView_Night_1_en",20420,],
 ["features.messages.impl.actionlist_ActionListViewContent_Day_0_en","features.messages.impl.actionlist_ActionListViewContent_Night_0_en",0,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_10_en","features.messages.impl.actionlist_ActionListViewContent_Night_10_en",20413,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_11_en","features.messages.impl.actionlist_ActionListViewContent_Night_11_en",20413,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_12_en","features.messages.impl.actionlist_ActionListViewContent_Night_12_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_10_en","features.messages.impl.actionlist_ActionListViewContent_Night_10_en",20420,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_11_en","features.messages.impl.actionlist_ActionListViewContent_Night_11_en",20420,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_12_en","features.messages.impl.actionlist_ActionListViewContent_Night_12_en",20420,],
 ["features.messages.impl.actionlist_ActionListViewContent_Day_1_en","features.messages.impl.actionlist_ActionListViewContent_Night_1_en",0,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_2_en","features.messages.impl.actionlist_ActionListViewContent_Night_2_en",20413,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_3_en","features.messages.impl.actionlist_ActionListViewContent_Night_3_en",20413,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_4_en","features.messages.impl.actionlist_ActionListViewContent_Night_4_en",20413,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_5_en","features.messages.impl.actionlist_ActionListViewContent_Night_5_en",20413,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_6_en","features.messages.impl.actionlist_ActionListViewContent_Night_6_en",20413,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_7_en","features.messages.impl.actionlist_ActionListViewContent_Night_7_en",20413,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_8_en","features.messages.impl.actionlist_ActionListViewContent_Night_8_en",20413,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_9_en","features.messages.impl.actionlist_ActionListViewContent_Night_9_en",20413,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_0_en","features.createroom.impl.addpeople_AddPeopleView_Night_0_en",20413,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_1_en","features.createroom.impl.addpeople_AddPeopleView_Night_1_en",20413,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_2_en","features.createroom.impl.addpeople_AddPeopleView_Night_2_en",20413,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_3_en","features.createroom.impl.addpeople_AddPeopleView_Night_3_en",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en","",20413,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en","",20413,],
-["libraries.designsystem.components.dialogs_AlertDialogContent_Dialogs_en","",20413,],
-["libraries.designsystem.components.dialogs_AlertDialog_Day_0_en","libraries.designsystem.components.dialogs_AlertDialog_Night_0_en",20413,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_2_en","features.messages.impl.actionlist_ActionListViewContent_Night_2_en",20420,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_3_en","features.messages.impl.actionlist_ActionListViewContent_Night_3_en",20420,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_4_en","features.messages.impl.actionlist_ActionListViewContent_Night_4_en",20420,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_5_en","features.messages.impl.actionlist_ActionListViewContent_Night_5_en",20420,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_6_en","features.messages.impl.actionlist_ActionListViewContent_Night_6_en",20420,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_7_en","features.messages.impl.actionlist_ActionListViewContent_Night_7_en",20420,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_8_en","features.messages.impl.actionlist_ActionListViewContent_Night_8_en",20420,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_9_en","features.messages.impl.actionlist_ActionListViewContent_Night_9_en",20420,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_0_en","features.createroom.impl.addpeople_AddPeopleView_Night_0_en",20420,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_1_en","features.createroom.impl.addpeople_AddPeopleView_Night_1_en",20420,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_2_en","features.createroom.impl.addpeople_AddPeopleView_Night_2_en",20420,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_3_en","features.createroom.impl.addpeople_AddPeopleView_Night_3_en",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en","",20420,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en","",20420,],
+["libraries.designsystem.components.dialogs_AlertDialogContent_Dialogs_en","",20420,],
+["libraries.designsystem.components.dialogs_AlertDialog_Day_0_en","libraries.designsystem.components.dialogs_AlertDialog_Night_0_en",20420,],
 ["libraries.designsystem.theme.components_AllIcons_Icons_en","",0,],
-["features.analytics.impl_AnalyticsOptInView_Day_0_en","features.analytics.impl_AnalyticsOptInView_Night_0_en",20413,],
-["features.analytics.impl_AnalyticsOptInView_Day_1_en","features.analytics.impl_AnalyticsOptInView_Night_1_en",20413,],
-["features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en",20413,],
-["features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en",20413,],
-["features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en","features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en",20413,],
+["features.analytics.impl_AnalyticsOptInView_Day_0_en","features.analytics.impl_AnalyticsOptInView_Night_0_en",20420,],
+["features.analytics.impl_AnalyticsOptInView_Day_1_en","features.analytics.impl_AnalyticsOptInView_Night_1_en",20420,],
+["features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en",20420,],
+["features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en",20420,],
+["features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en","features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en",20420,],
 ["libraries.designsystem.components_Announcement_Day_0_en","libraries.designsystem.components_Announcement_Night_0_en",0,],
-["services.apperror.impl_AppErrorView_Day_0_en","services.apperror.impl_AppErrorView_Night_0_en",20413,],
+["services.apperror.impl_AppErrorView_Day_0_en","services.apperror.impl_AppErrorView_Night_0_en",20420,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_0_en","libraries.designsystem.components.async_AsyncActionView_Night_0_en",0,],
-["libraries.designsystem.components.async_AsyncActionView_Day_1_en","libraries.designsystem.components.async_AsyncActionView_Night_1_en",20413,],
+["libraries.designsystem.components.async_AsyncActionView_Day_1_en","libraries.designsystem.components.async_AsyncActionView_Night_1_en",20420,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_2_en","libraries.designsystem.components.async_AsyncActionView_Night_2_en",0,],
-["libraries.designsystem.components.async_AsyncActionView_Day_3_en","libraries.designsystem.components.async_AsyncActionView_Night_3_en",20413,],
+["libraries.designsystem.components.async_AsyncActionView_Day_3_en","libraries.designsystem.components.async_AsyncActionView_Night_3_en",20420,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_4_en","libraries.designsystem.components.async_AsyncActionView_Night_4_en",0,],
-["libraries.designsystem.components.async_AsyncFailure_Day_0_en","libraries.designsystem.components.async_AsyncFailure_Night_0_en",20413,],
+["libraries.designsystem.components.async_AsyncFailure_Day_0_en","libraries.designsystem.components.async_AsyncFailure_Night_0_en",20420,],
 ["libraries.designsystem.components.async_AsyncIndicatorFailure_Day_0_en","libraries.designsystem.components.async_AsyncIndicatorFailure_Night_0_en",0,],
 ["libraries.designsystem.components.async_AsyncIndicatorLoading_Day_0_en","libraries.designsystem.components.async_AsyncIndicatorLoading_Night_0_en",0,],
 ["libraries.designsystem.components.async_AsyncLoading_Day_0_en","libraries.designsystem.components.async_AsyncLoading_Night_0_en",0,],
-["features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en","features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en",20413,],
+["features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en","features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en",20420,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_0_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_0_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_1_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_1_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_2_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_2_en",0,],
@@ -84,19 +84,19 @@ export const screenshots = [
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_6_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_6_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_7_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_7_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_8_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_8_en",0,],
-["features.messages.impl.attachments.preview_AttachmentsView_0_en","",20413,],
-["features.messages.impl.attachments.preview_AttachmentsView_1_en","",20413,],
-["features.messages.impl.attachments.preview_AttachmentsView_2_en","",20413,],
-["features.messages.impl.attachments.preview_AttachmentsView_3_en","",20413,],
-["features.messages.impl.attachments.preview_AttachmentsView_4_en","",20413,],
-["features.messages.impl.attachments.preview_AttachmentsView_5_en","",20413,],
-["features.messages.impl.attachments.preview_AttachmentsView_6_en","",20413,],
-["features.messages.impl.attachments.preview_AttachmentsView_7_en","",20413,],
-["features.messages.impl.attachments.preview_AttachmentsView_8_en","",20413,],
+["features.messages.impl.attachments.preview_AttachmentsView_0_en","",20420,],
+["features.messages.impl.attachments.preview_AttachmentsView_1_en","",20420,],
+["features.messages.impl.attachments.preview_AttachmentsView_2_en","",20420,],
+["features.messages.impl.attachments.preview_AttachmentsView_3_en","",20420,],
+["features.messages.impl.attachments.preview_AttachmentsView_4_en","",20420,],
+["features.messages.impl.attachments.preview_AttachmentsView_5_en","",20420,],
+["features.messages.impl.attachments.preview_AttachmentsView_6_en","",20420,],
+["features.messages.impl.attachments.preview_AttachmentsView_7_en","",20420,],
+["features.messages.impl.attachments.preview_AttachmentsView_8_en","",20420,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_1_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_2_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_2_en",0,],
-["libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en","libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en",20413,],
+["libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en","libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en",20420,],
 ["libraries.designsystem.components.avatar.internal_AvatarCluster_Avatars_en","",0,],
 ["libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Day_0_en","libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Night_0_en",0,],
 ["libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Day_1_en","libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Night_1_en",0,],
@@ -123,22 +123,22 @@ export const screenshots = [
 ["libraries.designsystem.modifiers_BackgroundVerticalGradientDisabled_Day_0_en","libraries.designsystem.modifiers_BackgroundVerticalGradientDisabled_Night_0_en",0,],
 ["libraries.designsystem.modifiers_BackgroundVerticalGradient_Day_0_en","libraries.designsystem.modifiers_BackgroundVerticalGradient_Night_0_en",0,],
 ["libraries.designsystem.components_Badge_Day_0_en","libraries.designsystem.components_Badge_Night_0_en",0,],
-["features.home.impl.components_BatteryOptimizationBanner_Day_0_en","features.home.impl.components_BatteryOptimizationBanner_Night_0_en",20413,],
+["features.home.impl.components_BatteryOptimizationBanner_Day_0_en","features.home.impl.components_BatteryOptimizationBanner_Night_0_en",20420,],
 ["libraries.designsystem.atomic.atoms_BetaLabel_Day_0_en","libraries.designsystem.atomic.atoms_BetaLabel_Night_0_en",0,],
 ["libraries.designsystem.components_BigIcon_Day_0_en","libraries.designsystem.components_BigIcon_Night_0_en",0,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en",20413,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en",20413,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en",20413,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en",20413,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en",20413,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en",20413,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en",20413,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en",20420,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en",20420,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en",20420,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en",20420,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en",20420,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en",20420,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en",20420,],
 ["libraries.designsystem.theme.components_BottomSheetDragHandle_Day_0_en","libraries.designsystem.theme.components_BottomSheetDragHandle_Night_0_en",0,],
-["features.rageshake.impl.bugreport_BugReportViewDay_0_en","",20413,],
-["features.rageshake.impl.bugreport_BugReportViewDay_1_en","",20413,],
-["features.rageshake.impl.bugreport_BugReportViewDay_2_en","",20413,],
-["features.rageshake.impl.bugreport_BugReportViewDay_3_en","",20413,],
-["features.rageshake.impl.bugreport_BugReportViewDay_4_en","",20413,],
+["features.rageshake.impl.bugreport_BugReportViewDay_0_en","",20420,],
+["features.rageshake.impl.bugreport_BugReportViewDay_1_en","",20420,],
+["features.rageshake.impl.bugreport_BugReportViewDay_2_en","",20420,],
+["features.rageshake.impl.bugreport_BugReportViewDay_3_en","",20420,],
+["features.rageshake.impl.bugreport_BugReportViewDay_4_en","",20420,],
 ["features.rageshake.impl.bugreport_BugReportViewNight_0_en","",0,],
 ["features.rageshake.impl.bugreport_BugReportViewNight_1_en","",0,],
 ["features.rageshake.impl.bugreport_BugReportViewNight_2_en","",0,],
@@ -148,133 +148,133 @@ export const screenshots = [
 ["libraries.designsystem.atomic.molecules_ButtonRowMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ButtonRowMolecule_Night_0_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_0_en","features.messages.impl.timeline.components_CallMenuItem_Night_0_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_1_en","features.messages.impl.timeline.components_CallMenuItem_Night_1_en",0,],
-["features.messages.impl.timeline.components_CallMenuItem_Day_2_en","features.messages.impl.timeline.components_CallMenuItem_Night_2_en",20413,],
-["features.messages.impl.timeline.components_CallMenuItem_Day_3_en","features.messages.impl.timeline.components_CallMenuItem_Night_3_en",20413,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_2_en","features.messages.impl.timeline.components_CallMenuItem_Night_2_en",20420,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_3_en","features.messages.impl.timeline.components_CallMenuItem_Night_3_en",20420,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_4_en","features.messages.impl.timeline.components_CallMenuItem_Night_4_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_5_en","features.messages.impl.timeline.components_CallMenuItem_Night_5_en",0,],
 ["features.call.impl.ui_CallScreenView_Day_0_en","features.call.impl.ui_CallScreenView_Night_0_en",0,],
-["features.call.impl.ui_CallScreenView_Day_1_en","features.call.impl.ui_CallScreenView_Night_1_en",20413,],
-["features.call.impl.ui_CallScreenView_Day_2_en","features.call.impl.ui_CallScreenView_Night_2_en",20413,],
-["features.call.impl.ui_CallScreenView_Day_3_en","features.call.impl.ui_CallScreenView_Night_3_en",20413,],
-["libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en","libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en",20413,],
-["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en",20413,],
-["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_0_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en",20416,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en",20413,],
+["features.call.impl.ui_CallScreenView_Day_1_en","features.call.impl.ui_CallScreenView_Night_1_en",20420,],
+["features.call.impl.ui_CallScreenView_Day_2_en","features.call.impl.ui_CallScreenView_Night_2_en",20420,],
+["features.call.impl.ui_CallScreenView_Day_3_en","features.call.impl.ui_CallScreenView_Night_3_en",20420,],
+["libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en","libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en",20420,],
+["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en",20420,],
+["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_0_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en",20420,],
 ["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_5_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_5_en",0,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en",20413,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en",20413,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en",20413,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en",20413,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en",20413,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en",20413,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en",20413,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en",20420,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en",20420,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en",20420,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en",20420,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en",20420,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en",20420,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en",20420,],
 ["features.login.impl.changeserver_ChangeServerView_Day_0_en","features.login.impl.changeserver_ChangeServerView_Night_0_en",0,],
-["features.login.impl.changeserver_ChangeServerView_Day_1_en","features.login.impl.changeserver_ChangeServerView_Night_1_en",20413,],
-["features.login.impl.changeserver_ChangeServerView_Day_2_en","features.login.impl.changeserver_ChangeServerView_Night_2_en",20413,],
-["features.login.impl.changeserver_ChangeServerView_Day_3_en","features.login.impl.changeserver_ChangeServerView_Night_3_en",20413,],
-["features.login.impl.changeserver_ChangeServerView_Day_4_en","features.login.impl.changeserver_ChangeServerView_Night_4_en",20413,],
-["features.login.impl.changeserver_ChangeServerView_Day_5_en","features.login.impl.changeserver_ChangeServerView_Night_5_en",20413,],
+["features.login.impl.changeserver_ChangeServerView_Day_1_en","features.login.impl.changeserver_ChangeServerView_Night_1_en",20420,],
+["features.login.impl.changeserver_ChangeServerView_Day_2_en","features.login.impl.changeserver_ChangeServerView_Night_2_en",20420,],
+["features.login.impl.changeserver_ChangeServerView_Day_3_en","features.login.impl.changeserver_ChangeServerView_Night_3_en",20420,],
+["features.login.impl.changeserver_ChangeServerView_Day_4_en","features.login.impl.changeserver_ChangeServerView_Night_4_en",20420,],
+["features.login.impl.changeserver_ChangeServerView_Day_5_en","features.login.impl.changeserver_ChangeServerView_Night_5_en",20420,],
 ["libraries.matrix.ui.components_CheckableResolvedUserRow_en","",0,],
-["libraries.matrix.ui.components_CheckableUnresolvedUserRow_en","",20413,],
+["libraries.matrix.ui.components_CheckableUnresolvedUserRow_en","",20420,],
 ["libraries.designsystem.theme.components_Checkboxes_Toggles_en","",0,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en",20413,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en",20413,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en",20413,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en",20413,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en",20413,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en",20413,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en",20413,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_4_en",20413,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en",20420,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en",20420,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en",20420,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en",20420,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en",20420,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en",20420,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en",20420,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_4_en",20420,],
 ["libraries.designsystem.theme.components_CircularProgressIndicator_Progress_Indicators_en","",0,],
 ["libraries.designsystem.components_ClickableLinkText_Text_en","",0,],
 ["libraries.designsystem.theme_ColorAliases_Day_0_en","libraries.designsystem.theme_ColorAliases_Night_0_en",0,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en",20413,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_1_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_1_en",20413,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_2_en",20413,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_3_en",20413,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_4_en",20413,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_5_en",20413,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_6_en",20413,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_7_en",20413,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_8_en",20413,],
-["libraries.textcomposer_ComposerModeView_Day_0_en","libraries.textcomposer_ComposerModeView_Night_0_en",20413,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en",20420,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_1_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_1_en",20420,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_2_en",20420,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_3_en",20420,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_4_en",20420,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_5_en",20420,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_6_en",20420,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_7_en",20420,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_8_en",20420,],
+["libraries.textcomposer_ComposerModeView_Day_0_en","libraries.textcomposer_ComposerModeView_Night_0_en",20420,],
 ["libraries.textcomposer_ComposerModeView_Day_1_en","libraries.textcomposer_ComposerModeView_Night_1_en",0,],
 ["libraries.textcomposer_ComposerModeView_Day_2_en","libraries.textcomposer_ComposerModeView_Night_2_en",0,],
 ["libraries.textcomposer_ComposerModeView_Day_3_en","libraries.textcomposer_ComposerModeView_Night_3_en",0,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en","",20413,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en","",20413,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en",20413,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en",20413,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en",20413,],
-["features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en","features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en",20413,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en","",20420,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en","",20420,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en",20420,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en",20420,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en",20420,],
+["features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en","features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en",20420,],
 ["libraries.designsystem.components.dialogs_ConfirmationDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_ConfirmationDialog_Day_0_en","libraries.designsystem.components.dialogs_ConfirmationDialog_Night_0_en",0,],
 ["features.networkmonitor.api.ui_ConnectivityIndicator_Day_0_en","features.networkmonitor.api.ui_ConnectivityIndicator_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_CounterAtom_Day_0_en","libraries.designsystem.atomic.atoms_CounterAtom_Night_0_en",0,],
-["features.rageshake.api.crash_CrashDetectionView_Day_0_en","features.rageshake.api.crash_CrashDetectionView_Night_0_en",20413,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_0_en","features.login.impl.screens.createaccount_CreateAccountView_Night_0_en",20413,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_1_en","features.login.impl.screens.createaccount_CreateAccountView_Night_1_en",20413,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_2_en","features.login.impl.screens.createaccount_CreateAccountView_Night_2_en",20413,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_3_en","features.login.impl.screens.createaccount_CreateAccountView_Night_3_en",20413,],
-["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en",20413,],
-["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en",20413,],
-["features.poll.impl.create_CreatePollView_Day_0_en","features.poll.impl.create_CreatePollView_Night_0_en",20413,],
-["features.poll.impl.create_CreatePollView_Day_1_en","features.poll.impl.create_CreatePollView_Night_1_en",20413,],
-["features.poll.impl.create_CreatePollView_Day_2_en","features.poll.impl.create_CreatePollView_Night_2_en",20413,],
-["features.poll.impl.create_CreatePollView_Day_3_en","features.poll.impl.create_CreatePollView_Night_3_en",20413,],
-["features.poll.impl.create_CreatePollView_Day_4_en","features.poll.impl.create_CreatePollView_Night_4_en",20413,],
-["features.poll.impl.create_CreatePollView_Day_5_en","features.poll.impl.create_CreatePollView_Night_5_en",20413,],
-["features.poll.impl.create_CreatePollView_Day_6_en","features.poll.impl.create_CreatePollView_Night_6_en",20413,],
-["features.poll.impl.create_CreatePollView_Day_7_en","features.poll.impl.create_CreatePollView_Night_7_en",20413,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_0_en","",20413,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_1_en","",20413,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_2_en","",20413,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_3_en","",20413,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_4_en","",20413,],
+["features.rageshake.api.crash_CrashDetectionView_Day_0_en","features.rageshake.api.crash_CrashDetectionView_Night_0_en",20420,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_0_en","features.login.impl.screens.createaccount_CreateAccountView_Night_0_en",20420,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_1_en","features.login.impl.screens.createaccount_CreateAccountView_Night_1_en",20420,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_2_en","features.login.impl.screens.createaccount_CreateAccountView_Night_2_en",20420,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_3_en","features.login.impl.screens.createaccount_CreateAccountView_Night_3_en",20420,],
+["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en",20420,],
+["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en",20420,],
+["features.poll.impl.create_CreatePollView_Day_0_en","features.poll.impl.create_CreatePollView_Night_0_en",20420,],
+["features.poll.impl.create_CreatePollView_Day_1_en","features.poll.impl.create_CreatePollView_Night_1_en",20420,],
+["features.poll.impl.create_CreatePollView_Day_2_en","features.poll.impl.create_CreatePollView_Night_2_en",20420,],
+["features.poll.impl.create_CreatePollView_Day_3_en","features.poll.impl.create_CreatePollView_Night_3_en",20420,],
+["features.poll.impl.create_CreatePollView_Day_4_en","features.poll.impl.create_CreatePollView_Night_4_en",20420,],
+["features.poll.impl.create_CreatePollView_Day_5_en","features.poll.impl.create_CreatePollView_Night_5_en",20420,],
+["features.poll.impl.create_CreatePollView_Day_6_en","features.poll.impl.create_CreatePollView_Night_6_en",20420,],
+["features.poll.impl.create_CreatePollView_Day_7_en","features.poll.impl.create_CreatePollView_Night_7_en",20420,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_0_en","",20420,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_1_en","",20420,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_2_en","",20420,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_3_en","",20420,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_4_en","",20420,],
 ["libraries.mediaviewer.impl.gallery.ui_DateItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_DateItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_DateItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_DateItemView_Night_1_en",0,],
-["libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en","",20413,],
-["libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en","",20413,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en",20413,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en",20413,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en",20413,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en",20413,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en",20413,],
+["libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en","",20420,],
+["libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en","",20420,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en",20420,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en",20420,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en",20420,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en",20420,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en",20420,],
 ["features.logout.impl.direct_DefaultDirectLogoutView_Day_0_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_0_en",0,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_1_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_1_en",20413,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_2_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_2_en",20413,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_3_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_3_en",20413,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_1_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_1_en",20420,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_2_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_2_en",20420,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_3_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_3_en",20420,],
 ["features.logout.impl.direct_DefaultDirectLogoutView_Day_4_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_4_en",0,],
-["features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en","features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en",20413,],
+["features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en","features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en",20420,],
 ["features.licenses.impl.details_DependenciesDetailsView_Day_0_en","features.licenses.impl.details_DependenciesDetailsView_Night_0_en",0,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_0_en","features.licenses.impl.list_DependencyLicensesListView_Night_0_en",20413,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_1_en","features.licenses.impl.list_DependencyLicensesListView_Night_1_en",20413,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_2_en","features.licenses.impl.list_DependencyLicensesListView_Night_2_en",20413,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_3_en","features.licenses.impl.list_DependencyLicensesListView_Night_3_en",20413,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_0_en","features.preferences.impl.developer_DeveloperSettingsView_Night_0_en",20413,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_1_en","features.preferences.impl.developer_DeveloperSettingsView_Night_1_en",20413,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_2_en","features.preferences.impl.developer_DeveloperSettingsView_Night_2_en",20413,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_3_en","features.preferences.impl.developer_DeveloperSettingsView_Night_3_en",20413,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_0_en","features.licenses.impl.list_DependencyLicensesListView_Night_0_en",20420,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_1_en","features.licenses.impl.list_DependencyLicensesListView_Night_1_en",20420,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_2_en","features.licenses.impl.list_DependencyLicensesListView_Night_2_en",20420,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_3_en","features.licenses.impl.list_DependencyLicensesListView_Night_3_en",20420,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_0_en","features.preferences.impl.developer_DeveloperSettingsView_Night_0_en",20420,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_1_en","features.preferences.impl.developer_DeveloperSettingsView_Night_1_en",20420,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_2_en","features.preferences.impl.developer_DeveloperSettingsView_Night_2_en",20420,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_3_en","features.preferences.impl.developer_DeveloperSettingsView_Night_3_en",20420,],
 ["libraries.designsystem.theme.components_DialogWithDestructiveButton_Dialog_with_destructive_button_Dialogs_en","",0,],
 ["libraries.designsystem.theme.components_DialogWithOnlyMessageAndOkButton_Dialog_with_only_message_and_ok_button_Dialogs_en","",0,],
 ["libraries.designsystem.theme.components_DialogWithThirdButton_Dialog_with_third_button_Dialogs_en","",0,],
@@ -289,18 +289,19 @@ export const screenshots = [
 ["libraries.designsystem.text_DpScale_1_0f__en","",0,],
 ["libraries.designsystem.text_DpScale_1_5f__en","",0,],
 ["libraries.designsystem.theme.components_DropdownMenuItem_Menus_en","",0,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en",20413,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en",20413,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en",20413,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en",20413,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en",20413,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en",20413,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en",20413,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en",20413,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en",20413,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en",20413,],
-["features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en",20413,],
-["features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en",20413,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en",20420,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en",20420,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en",20420,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en",20420,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en",20420,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_0_en",0,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_1_en",0,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_2_en",0,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_3_en",0,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_4_en",0,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en",20420,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en",20420,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en",0,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_0_en","libraries.matrix.ui.components_EditableAvatarView_Night_0_en",0,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_1_en","libraries.matrix.ui.components_EditableAvatarView_Night_1_en",0,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_2_en","libraries.matrix.ui.components_EditableAvatarView_Night_2_en",0,],
@@ -311,14 +312,14 @@ export const screenshots = [
 ["libraries.designsystem.atomic.atoms_ElementLogoAtomMediumNoBlurShadow_Day_0_en","libraries.designsystem.atomic.atoms_ElementLogoAtomMediumNoBlurShadow_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_ElementLogoAtomMedium_Day_0_en","libraries.designsystem.atomic.atoms_ElementLogoAtomMedium_Night_0_en",0,],
 ["features.messages.impl.timeline.components.customreaction_EmojiItem_Day_0_en","features.messages.impl.timeline.components.customreaction_EmojiItem_Night_0_en",0,],
-["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_0_en",20413,],
-["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en",20413,],
+["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_0_en",20420,],
+["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en",20420,],
 ["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_2_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_2_en",0,],
 ["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_3_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_3_en",0,],
 ["libraries.ui.common.nodes_EmptyView_Day_0_en","libraries.ui.common.nodes_EmptyView_Night_0_en",0,],
-["libraries.designsystem.components.dialogs_ErrorDialogContent_Dialogs_en","",20413,],
-["libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Night_0_en",20413,],
-["libraries.designsystem.components.dialogs_ErrorDialog_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialog_Night_0_en",20413,],
+["libraries.designsystem.components.dialogs_ErrorDialogContent_Dialogs_en","",20420,],
+["libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Night_0_en",20420,],
+["libraries.designsystem.components.dialogs_ErrorDialog_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialog_Night_0_en",20420,],
 ["features.messages.impl.timeline.debug_EventDebugInfoView_Day_0_en","features.messages.impl.timeline.debug_EventDebugInfoView_Night_0_en",0,],
 ["libraries.designsystem.components_ExpandableBottomSheetLayout_en","",0,],
 ["libraries.featureflag.ui_FeatureListView_Day_0_en","libraries.featureflag.ui_FeatureListView_Night_0_en",0,],
@@ -337,43 +338,43 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_FloatingActionButton_Floating_Action_Buttons_en","",0,],
 ["libraries.designsystem.atomic.pages_FlowStepPage_Day_0_en","libraries.designsystem.atomic.pages_FlowStepPage_Night_0_en",0,],
 ["features.messages.impl.timeline.focus_FocusRequestStateView_Day_0_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_0_en",0,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_1_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_1_en",20413,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_2_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_2_en",20413,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_3_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_3_en",20413,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_1_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_1_en",20420,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_2_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_2_en",20420,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_3_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_3_en",20420,],
 ["features.messages.impl.timeline.components_FocusedEvent_Day_0_en","features.messages.impl.timeline.components_FocusedEvent_Night_0_en",0,],
 ["libraries.textcomposer.components_FormattingOption_Day_0_en","libraries.textcomposer.components_FormattingOption_Night_0_en",0,],
 ["features.forward.impl_ForwardMessagesView_Day_0_en","features.forward.impl_ForwardMessagesView_Night_0_en",0,],
 ["features.forward.impl_ForwardMessagesView_Day_1_en","features.forward.impl_ForwardMessagesView_Night_1_en",0,],
 ["features.forward.impl_ForwardMessagesView_Day_2_en","features.forward.impl_ForwardMessagesView_Night_2_en",0,],
-["features.forward.impl_ForwardMessagesView_Day_3_en","features.forward.impl_ForwardMessagesView_Night_3_en",20413,],
-["features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en","features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en",20413,],
+["features.forward.impl_ForwardMessagesView_Day_3_en","features.forward.impl_ForwardMessagesView_Night_3_en",20420,],
+["features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en","features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en",20420,],
 ["libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Day_0_en","libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Night_0_en",0,],
 ["libraries.designsystem.components.button_GradientFloatingActionButton_Day_0_en","libraries.designsystem.components.button_GradientFloatingActionButton_Night_0_en",0,],
 ["features.messages.impl.timeline.components.group_GroupHeaderView_Day_0_en","features.messages.impl.timeline.components.group_GroupHeaderView_Night_0_en",0,],
 ["libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Day_0_en","libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Night_0_en",0,],
 ["libraries.designsystem.atomic.pages_HeaderFooterPage_Day_0_en","libraries.designsystem.atomic.pages_HeaderFooterPage_Night_0_en",0,],
-["features.home.impl.spaces_HomeSpacesView_Day_0_en","features.home.impl.spaces_HomeSpacesView_Night_0_en",20413,],
-["features.home.impl.spaces_HomeSpacesView_Day_1_en","features.home.impl.spaces_HomeSpacesView_Night_1_en",20413,],
-["features.home.impl.components_HomeTopBarMultiAccount_Day_0_en","features.home.impl.components_HomeTopBarMultiAccount_Night_0_en",20413,],
-["features.home.impl.components_HomeTopBarWithIndicator_Day_0_en","features.home.impl.components_HomeTopBarWithIndicator_Night_0_en",20413,],
-["features.home.impl.components_HomeTopBar_Day_0_en","features.home.impl.components_HomeTopBar_Night_0_en",20413,],
+["features.home.impl.spaces_HomeSpacesView_Day_0_en","features.home.impl.spaces_HomeSpacesView_Night_0_en",20420,],
+["features.home.impl.spaces_HomeSpacesView_Day_1_en","features.home.impl.spaces_HomeSpacesView_Night_1_en",20420,],
+["features.home.impl.components_HomeTopBarMultiAccount_Day_0_en","features.home.impl.components_HomeTopBarMultiAccount_Night_0_en",20420,],
+["features.home.impl.components_HomeTopBarWithIndicator_Day_0_en","features.home.impl.components_HomeTopBarWithIndicator_Night_0_en",20420,],
+["features.home.impl.components_HomeTopBar_Day_0_en","features.home.impl.components_HomeTopBar_Night_0_en",20420,],
 ["features.home.impl_HomeViewA11y_en","",0,],
-["features.home.impl_HomeView_Day_0_en","features.home.impl_HomeView_Night_0_en",20413,],
-["features.home.impl_HomeView_Day_10_en","features.home.impl_HomeView_Night_10_en",20413,],
+["features.home.impl_HomeView_Day_0_en","features.home.impl_HomeView_Night_0_en",20420,],
+["features.home.impl_HomeView_Day_10_en","features.home.impl_HomeView_Night_10_en",20420,],
 ["features.home.impl_HomeView_Day_11_en","features.home.impl_HomeView_Night_11_en",0,],
 ["features.home.impl_HomeView_Day_12_en","features.home.impl_HomeView_Night_12_en",0,],
-["features.home.impl_HomeView_Day_13_en","features.home.impl_HomeView_Night_13_en",20413,],
-["features.home.impl_HomeView_Day_14_en","features.home.impl_HomeView_Night_14_en",20413,],
-["features.home.impl_HomeView_Day_15_en","features.home.impl_HomeView_Night_15_en",20413,],
-["features.home.impl_HomeView_Day_1_en","features.home.impl_HomeView_Night_1_en",20413,],
-["features.home.impl_HomeView_Day_2_en","features.home.impl_HomeView_Night_2_en",20413,],
-["features.home.impl_HomeView_Day_3_en","features.home.impl_HomeView_Night_3_en",20413,],
-["features.home.impl_HomeView_Day_4_en","features.home.impl_HomeView_Night_4_en",20413,],
-["features.home.impl_HomeView_Day_5_en","features.home.impl_HomeView_Night_5_en",20413,],
-["features.home.impl_HomeView_Day_6_en","features.home.impl_HomeView_Night_6_en",20413,],
-["features.home.impl_HomeView_Day_7_en","features.home.impl_HomeView_Night_7_en",20413,],
-["features.home.impl_HomeView_Day_8_en","features.home.impl_HomeView_Night_8_en",20413,],
-["features.home.impl_HomeView_Day_9_en","features.home.impl_HomeView_Night_9_en",20413,],
+["features.home.impl_HomeView_Day_13_en","features.home.impl_HomeView_Night_13_en",20420,],
+["features.home.impl_HomeView_Day_14_en","features.home.impl_HomeView_Night_14_en",20420,],
+["features.home.impl_HomeView_Day_15_en","features.home.impl_HomeView_Night_15_en",20420,],
+["features.home.impl_HomeView_Day_1_en","features.home.impl_HomeView_Night_1_en",20420,],
+["features.home.impl_HomeView_Day_2_en","features.home.impl_HomeView_Night_2_en",20420,],
+["features.home.impl_HomeView_Day_3_en","features.home.impl_HomeView_Night_3_en",20420,],
+["features.home.impl_HomeView_Day_4_en","features.home.impl_HomeView_Night_4_en",20420,],
+["features.home.impl_HomeView_Day_5_en","features.home.impl_HomeView_Night_5_en",20420,],
+["features.home.impl_HomeView_Day_6_en","features.home.impl_HomeView_Night_6_en",20420,],
+["features.home.impl_HomeView_Day_7_en","features.home.impl_HomeView_Night_7_en",20420,],
+["features.home.impl_HomeView_Day_8_en","features.home.impl_HomeView_Night_8_en",20420,],
+["features.home.impl_HomeView_Day_9_en","features.home.impl_HomeView_Night_9_en",20420,],
 ["libraries.designsystem.theme.components_HorizontalDivider_Dividers_en","",0,],
 ["libraries.designsystem.ruler_HorizontalRuler_Day_0_en","libraries.designsystem.ruler_HorizontalRuler_Night_0_en",0,],
 ["libraries.designsystem.theme.components_IconButton_Buttons_en","",0,],
@@ -386,8 +387,8 @@ export const screenshots = [
 ["appicon.enterprise_Icon_en","",0,],
 ["libraries.designsystem.icons_IconsOther_Day_0_en","libraries.designsystem.icons_IconsOther_Night_0_en",0,],
 ["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_0_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_0_en",0,],
-["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en",20413,],
-["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_2_en",20413,],
+["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en",20420,],
+["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_2_en",20420,],
 ["libraries.mediaviewer.impl.gallery.ui_ImageItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_ImageItemView_Night_0_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_0_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_0_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_10_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_10_en",0,],
@@ -395,109 +396,109 @@ export const screenshots = [
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_1_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_1_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_2_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_2_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_3_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_3_en",0,],
-["libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en",20413,],
+["libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en",20420,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_5_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_5_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_6_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_6_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_7_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_7_en",0,],
-["libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en",20413,],
+["libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en",20420,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_9_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_9_en",0,],
-["features.call.impl.ui_IncomingCallScreen_Day_0_en","features.call.impl.ui_IncomingCallScreen_Night_0_en",20413,],
+["features.call.impl.ui_IncomingCallScreen_Day_0_en","features.call.impl.ui_IncomingCallScreen_Night_0_en",20420,],
 ["features.verifysession.impl.incoming_IncomingVerificationViewA11y_en","",0,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en",20413,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en",20413,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en",20420,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en",20420,],
 ["libraries.designsystem.atomic.molecules_InfoListItemMolecule_Day_0_en","libraries.designsystem.atomic.molecules_InfoListItemMolecule_Night_0_en",0,],
 ["libraries.designsystem.atomic.organisms_InfoListOrganism_Day_0_en","libraries.designsystem.atomic.organisms_InfoListOrganism_Night_0_en",0,],
 ["libraries.matrix.ui.media_InitialsAvatarBitmapGenerator_Day_0_en","libraries.matrix.ui.media_InitialsAvatarBitmapGenerator_Night_0_en",0,],
-["features.call.impl.ui_InvalidAudioDeviceDialog_Day_0_en","features.call.impl.ui_InvalidAudioDeviceDialog_Night_0_en",20413,],
-["features.invitepeople.impl_InvitePeopleView_Day_0_en","features.invitepeople.impl_InvitePeopleView_Night_0_en",20413,],
-["features.invitepeople.impl_InvitePeopleView_Day_1_en","features.invitepeople.impl_InvitePeopleView_Night_1_en",20413,],
+["features.call.impl.ui_InvalidAudioDeviceDialog_Day_0_en","features.call.impl.ui_InvalidAudioDeviceDialog_Night_0_en",20420,],
+["features.invitepeople.impl_InvitePeopleView_Day_0_en","features.invitepeople.impl_InvitePeopleView_Night_0_en",20420,],
+["features.invitepeople.impl_InvitePeopleView_Day_1_en","features.invitepeople.impl_InvitePeopleView_Night_1_en",20420,],
 ["features.invitepeople.impl_InvitePeopleView_Day_2_en","features.invitepeople.impl_InvitePeopleView_Night_2_en",0,],
 ["features.invitepeople.impl_InvitePeopleView_Day_3_en","features.invitepeople.impl_InvitePeopleView_Night_3_en",0,],
-["features.invitepeople.impl_InvitePeopleView_Day_4_en","features.invitepeople.impl_InvitePeopleView_Night_4_en",20413,],
-["features.invitepeople.impl_InvitePeopleView_Day_5_en","features.invitepeople.impl_InvitePeopleView_Night_5_en",20413,],
-["features.invitepeople.impl_InvitePeopleView_Day_6_en","features.invitepeople.impl_InvitePeopleView_Night_6_en",20413,],
-["features.invitepeople.impl_InvitePeopleView_Day_7_en","features.invitepeople.impl_InvitePeopleView_Night_7_en",20413,],
+["features.invitepeople.impl_InvitePeopleView_Day_4_en","features.invitepeople.impl_InvitePeopleView_Night_4_en",20420,],
+["features.invitepeople.impl_InvitePeopleView_Day_5_en","features.invitepeople.impl_InvitePeopleView_Night_5_en",20420,],
+["features.invitepeople.impl_InvitePeopleView_Day_6_en","features.invitepeople.impl_InvitePeopleView_Night_6_en",20420,],
+["features.invitepeople.impl_InvitePeopleView_Day_7_en","features.invitepeople.impl_InvitePeopleView_Night_7_en",20420,],
 ["features.invitepeople.impl_InvitePeopleView_Day_8_en","features.invitepeople.impl_InvitePeopleView_Night_8_en",0,],
-["features.invitepeople.impl_InvitePeopleView_Day_9_en","features.invitepeople.impl_InvitePeopleView_Night_9_en",20413,],
-["libraries.matrix.ui.components_InviteSenderView_Day_0_en","libraries.matrix.ui.components_InviteSenderView_Night_0_en",20413,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en",20413,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_1_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_1_en",20413,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en",20413,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_3_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_3_en",20413,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en",20413,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en",20413,],
+["features.invitepeople.impl_InvitePeopleView_Day_9_en","features.invitepeople.impl_InvitePeopleView_Night_9_en",20420,],
+["libraries.matrix.ui.components_InviteSenderView_Day_0_en","libraries.matrix.ui.components_InviteSenderView_Night_0_en",20420,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en",20420,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_1_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_1_en",20420,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en",20420,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_3_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_3_en",20420,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en",20420,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en",20420,],
 ["features.joinroom.impl_JoinRoomView_Day_0_en","features.joinroom.impl_JoinRoomView_Night_0_en",0,],
-["features.joinroom.impl_JoinRoomView_Day_10_en","features.joinroom.impl_JoinRoomView_Night_10_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_11_en","features.joinroom.impl_JoinRoomView_Night_11_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_12_en","features.joinroom.impl_JoinRoomView_Night_12_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_13_en","features.joinroom.impl_JoinRoomView_Night_13_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_14_en","features.joinroom.impl_JoinRoomView_Night_14_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_15_en","features.joinroom.impl_JoinRoomView_Night_15_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_16_en","features.joinroom.impl_JoinRoomView_Night_16_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_1_en","features.joinroom.impl_JoinRoomView_Night_1_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_2_en","features.joinroom.impl_JoinRoomView_Night_2_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_3_en","features.joinroom.impl_JoinRoomView_Night_3_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_4_en","features.joinroom.impl_JoinRoomView_Night_4_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_5_en","features.joinroom.impl_JoinRoomView_Night_5_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_6_en","features.joinroom.impl_JoinRoomView_Night_6_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_7_en","features.joinroom.impl_JoinRoomView_Night_7_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_8_en","features.joinroom.impl_JoinRoomView_Night_8_en",20413,],
-["features.joinroom.impl_JoinRoomView_Day_9_en","features.joinroom.impl_JoinRoomView_Night_9_en",20413,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en",20413,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en",20413,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en",20413,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en",20413,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en",20413,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en",20413,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_0_en","features.knockrequests.impl.list_KnockRequestsListView_Night_0_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_10_en","features.knockrequests.impl.list_KnockRequestsListView_Night_10_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_1_en","features.knockrequests.impl.list_KnockRequestsListView_Night_1_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_2_en","features.knockrequests.impl.list_KnockRequestsListView_Night_2_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_3_en","features.knockrequests.impl.list_KnockRequestsListView_Night_3_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_4_en","features.knockrequests.impl.list_KnockRequestsListView_Night_4_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_5_en","features.knockrequests.impl.list_KnockRequestsListView_Night_5_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_6_en","features.knockrequests.impl.list_KnockRequestsListView_Night_6_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_7_en","features.knockrequests.impl.list_KnockRequestsListView_Night_7_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_8_en","features.knockrequests.impl.list_KnockRequestsListView_Night_8_en",20413,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_9_en","features.knockrequests.impl.list_KnockRequestsListView_Night_9_en",20413,],
+["features.joinroom.impl_JoinRoomView_Day_10_en","features.joinroom.impl_JoinRoomView_Night_10_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_11_en","features.joinroom.impl_JoinRoomView_Night_11_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_12_en","features.joinroom.impl_JoinRoomView_Night_12_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_13_en","features.joinroom.impl_JoinRoomView_Night_13_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_14_en","features.joinroom.impl_JoinRoomView_Night_14_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_15_en","features.joinroom.impl_JoinRoomView_Night_15_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_16_en","features.joinroom.impl_JoinRoomView_Night_16_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_1_en","features.joinroom.impl_JoinRoomView_Night_1_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_2_en","features.joinroom.impl_JoinRoomView_Night_2_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_3_en","features.joinroom.impl_JoinRoomView_Night_3_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_4_en","features.joinroom.impl_JoinRoomView_Night_4_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_5_en","features.joinroom.impl_JoinRoomView_Night_5_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_6_en","features.joinroom.impl_JoinRoomView_Night_6_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_7_en","features.joinroom.impl_JoinRoomView_Night_7_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_8_en","features.joinroom.impl_JoinRoomView_Night_8_en",20420,],
+["features.joinroom.impl_JoinRoomView_Day_9_en","features.joinroom.impl_JoinRoomView_Night_9_en",20420,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en",20420,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en",20420,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en",20420,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en",20420,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en",20420,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en",20420,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_0_en","features.knockrequests.impl.list_KnockRequestsListView_Night_0_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_10_en","features.knockrequests.impl.list_KnockRequestsListView_Night_10_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_1_en","features.knockrequests.impl.list_KnockRequestsListView_Night_1_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_2_en","features.knockrequests.impl.list_KnockRequestsListView_Night_2_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_3_en","features.knockrequests.impl.list_KnockRequestsListView_Night_3_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_4_en","features.knockrequests.impl.list_KnockRequestsListView_Night_4_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_5_en","features.knockrequests.impl.list_KnockRequestsListView_Night_5_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_6_en","features.knockrequests.impl.list_KnockRequestsListView_Night_6_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_7_en","features.knockrequests.impl.list_KnockRequestsListView_Night_7_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_8_en","features.knockrequests.impl.list_KnockRequestsListView_Night_8_en",20420,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_9_en","features.knockrequests.impl.list_KnockRequestsListView_Night_9_en",20420,],
 ["libraries.designsystem.components_LabelledCheckbox_Toggles_en","",0,],
-["features.preferences.impl.labs_LabsView_Day_0_en","features.preferences.impl.labs_LabsView_Night_0_en",20413,],
-["features.preferences.impl.labs_LabsView_Day_1_en","features.preferences.impl.labs_LabsView_Night_1_en",20413,],
+["features.preferences.impl.labs_LabsView_Day_0_en","features.preferences.impl.labs_LabsView_Night_0_en",20420,],
+["features.preferences.impl.labs_LabsView_Day_1_en","features.preferences.impl.labs_LabsView_Night_1_en",20420,],
 ["features.leaveroom.impl_LeaveRoomView_Day_0_en","features.leaveroom.impl_LeaveRoomView_Night_0_en",0,],
-["features.leaveroom.impl_LeaveRoomView_Day_1_en","features.leaveroom.impl_LeaveRoomView_Night_1_en",20413,],
-["features.leaveroom.impl_LeaveRoomView_Day_2_en","features.leaveroom.impl_LeaveRoomView_Night_2_en",20413,],
-["features.leaveroom.impl_LeaveRoomView_Day_3_en","features.leaveroom.impl_LeaveRoomView_Night_3_en",20413,],
-["features.leaveroom.impl_LeaveRoomView_Day_4_en","features.leaveroom.impl_LeaveRoomView_Night_4_en",20413,],
-["features.leaveroom.impl_LeaveRoomView_Day_5_en","features.leaveroom.impl_LeaveRoomView_Night_5_en",20413,],
-["features.leaveroom.impl_LeaveRoomView_Day_6_en","features.leaveroom.impl_LeaveRoomView_Night_6_en",20413,],
-["features.leaveroom.impl_LeaveRoomView_Day_7_en","features.leaveroom.impl_LeaveRoomView_Night_7_en",20413,],
-["features.space.impl.leave_LeaveSpaceView_Day_0_en","features.space.impl.leave_LeaveSpaceView_Night_0_en",20413,],
-["features.space.impl.leave_LeaveSpaceView_Day_1_en","features.space.impl.leave_LeaveSpaceView_Night_1_en",20413,],
-["features.space.impl.leave_LeaveSpaceView_Day_2_en","features.space.impl.leave_LeaveSpaceView_Night_2_en",20413,],
-["features.space.impl.leave_LeaveSpaceView_Day_3_en","features.space.impl.leave_LeaveSpaceView_Night_3_en",20413,],
-["features.space.impl.leave_LeaveSpaceView_Day_4_en","features.space.impl.leave_LeaveSpaceView_Night_4_en",20413,],
-["features.space.impl.leave_LeaveSpaceView_Day_5_en","features.space.impl.leave_LeaveSpaceView_Night_5_en",20413,],
-["features.space.impl.leave_LeaveSpaceView_Day_6_en","features.space.impl.leave_LeaveSpaceView_Night_6_en",20413,],
-["features.space.impl.leave_LeaveSpaceView_Day_7_en","features.space.impl.leave_LeaveSpaceView_Night_7_en",20413,],
-["features.space.impl.leave_LeaveSpaceView_Day_8_en","features.space.impl.leave_LeaveSpaceView_Night_8_en",20413,],
-["features.space.impl.leave_LeaveSpaceView_Day_9_en","features.space.impl.leave_LeaveSpaceView_Night_9_en",20413,],
+["features.leaveroom.impl_LeaveRoomView_Day_1_en","features.leaveroom.impl_LeaveRoomView_Night_1_en",20420,],
+["features.leaveroom.impl_LeaveRoomView_Day_2_en","features.leaveroom.impl_LeaveRoomView_Night_2_en",20420,],
+["features.leaveroom.impl_LeaveRoomView_Day_3_en","features.leaveroom.impl_LeaveRoomView_Night_3_en",20420,],
+["features.leaveroom.impl_LeaveRoomView_Day_4_en","features.leaveroom.impl_LeaveRoomView_Night_4_en",20420,],
+["features.leaveroom.impl_LeaveRoomView_Day_5_en","features.leaveroom.impl_LeaveRoomView_Night_5_en",20420,],
+["features.leaveroom.impl_LeaveRoomView_Day_6_en","features.leaveroom.impl_LeaveRoomView_Night_6_en",20420,],
+["features.leaveroom.impl_LeaveRoomView_Day_7_en","features.leaveroom.impl_LeaveRoomView_Night_7_en",20420,],
+["features.space.impl.leave_LeaveSpaceView_Day_0_en","features.space.impl.leave_LeaveSpaceView_Night_0_en",20420,],
+["features.space.impl.leave_LeaveSpaceView_Day_1_en","features.space.impl.leave_LeaveSpaceView_Night_1_en",20420,],
+["features.space.impl.leave_LeaveSpaceView_Day_2_en","features.space.impl.leave_LeaveSpaceView_Night_2_en",20420,],
+["features.space.impl.leave_LeaveSpaceView_Day_3_en","features.space.impl.leave_LeaveSpaceView_Night_3_en",20420,],
+["features.space.impl.leave_LeaveSpaceView_Day_4_en","features.space.impl.leave_LeaveSpaceView_Night_4_en",20420,],
+["features.space.impl.leave_LeaveSpaceView_Day_5_en","features.space.impl.leave_LeaveSpaceView_Night_5_en",20420,],
+["features.space.impl.leave_LeaveSpaceView_Day_6_en","features.space.impl.leave_LeaveSpaceView_Night_6_en",20420,],
+["features.space.impl.leave_LeaveSpaceView_Day_7_en","features.space.impl.leave_LeaveSpaceView_Night_7_en",20420,],
+["features.space.impl.leave_LeaveSpaceView_Day_8_en","features.space.impl.leave_LeaveSpaceView_Night_8_en",20420,],
+["features.space.impl.leave_LeaveSpaceView_Day_9_en","features.space.impl.leave_LeaveSpaceView_Night_9_en",20420,],
 ["libraries.designsystem.background_LightGradientBackground_Day_0_en","libraries.designsystem.background_LightGradientBackground_Night_0_en",0,],
 ["libraries.designsystem.theme.components_LinearProgressIndicator_Progress_Indicators_en","",0,],
 ["features.messages.impl.link_LinkView_Day_0_en","features.messages.impl.link_LinkView_Night_0_en",0,],
-["features.messages.impl.link_LinkView_Day_1_en","features.messages.impl.link_LinkView_Night_1_en",20413,],
+["features.messages.impl.link_LinkView_Day_1_en","features.messages.impl.link_LinkView_Night_1_en",20420,],
 ["libraries.designsystem.components.dialogs_ListDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_ListDialog_Day_0_en","libraries.designsystem.components.dialogs_ListDialog_Night_0_en",0,],
 ["libraries.designsystem.theme.components_ListItemPrimaryActionWithIcon_List_item_-_Primary_action_&_Icon_List_items_en","",0,],
@@ -552,38 +553,38 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_ListSupportingTextSmallPadding_List_supporting_text_-_small_padding_List_sections_en","",0,],
 ["libraries.textcomposer.components_LiveWaveformView_Day_0_en","libraries.textcomposer.components_LiveWaveformView_Night_0_en",0,],
 ["appnav.room.joined_LoadingRoomNodeView_Day_0_en","appnav.room.joined_LoadingRoomNodeView_Night_0_en",0,],
-["appnav.room.joined_LoadingRoomNodeView_Day_1_en","appnav.room.joined_LoadingRoomNodeView_Night_1_en",20413,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en",20413,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en",20413,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en",20413,],
+["appnav.room.joined_LoadingRoomNodeView_Day_1_en","appnav.room.joined_LoadingRoomNodeView_Night_1_en",20420,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en",20420,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en",20420,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en",20420,],
 ["appnav.loggedin_LoggedInView_Day_0_en","appnav.loggedin_LoggedInView_Night_0_en",0,],
-["appnav.loggedin_LoggedInView_Day_1_en","appnav.loggedin_LoggedInView_Night_1_en",20413,],
-["appnav.loggedin_LoggedInView_Day_2_en","appnav.loggedin_LoggedInView_Night_2_en",20413,],
-["appnav.loggedin_LoggedInView_Day_3_en","appnav.loggedin_LoggedInView_Night_3_en",20413,],
-["features.login.impl.login_LoginModeView_Day_0_en","features.login.impl.login_LoginModeView_Night_0_en",20413,],
-["features.login.impl.login_LoginModeView_Day_1_en","features.login.impl.login_LoginModeView_Night_1_en",20413,],
-["features.login.impl.login_LoginModeView_Day_2_en","features.login.impl.login_LoginModeView_Night_2_en",20413,],
-["features.login.impl.login_LoginModeView_Day_3_en","features.login.impl.login_LoginModeView_Night_3_en",20413,],
-["features.login.impl.login_LoginModeView_Day_4_en","features.login.impl.login_LoginModeView_Night_4_en",20413,],
-["features.login.impl.login_LoginModeView_Day_5_en","features.login.impl.login_LoginModeView_Night_5_en",20413,],
-["features.login.impl.login_LoginModeView_Day_6_en","features.login.impl.login_LoginModeView_Night_6_en",20413,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en",20413,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en",20413,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en",20413,],
-["features.logout.impl_LogoutView_Day_0_en","features.logout.impl_LogoutView_Night_0_en",20413,],
-["features.logout.impl_LogoutView_Day_10_en","features.logout.impl_LogoutView_Night_10_en",20413,],
-["features.logout.impl_LogoutView_Day_11_en","features.logout.impl_LogoutView_Night_11_en",20413,],
-["features.logout.impl_LogoutView_Day_1_en","features.logout.impl_LogoutView_Night_1_en",20413,],
-["features.logout.impl_LogoutView_Day_2_en","features.logout.impl_LogoutView_Night_2_en",20413,],
-["features.logout.impl_LogoutView_Day_3_en","features.logout.impl_LogoutView_Night_3_en",20413,],
-["features.logout.impl_LogoutView_Day_4_en","features.logout.impl_LogoutView_Night_4_en",20413,],
-["features.logout.impl_LogoutView_Day_5_en","features.logout.impl_LogoutView_Night_5_en",20413,],
-["features.logout.impl_LogoutView_Day_6_en","features.logout.impl_LogoutView_Night_6_en",20413,],
-["features.logout.impl_LogoutView_Day_7_en","features.logout.impl_LogoutView_Night_7_en",20413,],
-["features.logout.impl_LogoutView_Day_8_en","features.logout.impl_LogoutView_Night_8_en",20413,],
-["features.logout.impl_LogoutView_Day_9_en","features.logout.impl_LogoutView_Night_9_en",20413,],
+["appnav.loggedin_LoggedInView_Day_1_en","appnav.loggedin_LoggedInView_Night_1_en",20420,],
+["appnav.loggedin_LoggedInView_Day_2_en","appnav.loggedin_LoggedInView_Night_2_en",20420,],
+["appnav.loggedin_LoggedInView_Day_3_en","appnav.loggedin_LoggedInView_Night_3_en",20420,],
+["features.login.impl.login_LoginModeView_Day_0_en","features.login.impl.login_LoginModeView_Night_0_en",20420,],
+["features.login.impl.login_LoginModeView_Day_1_en","features.login.impl.login_LoginModeView_Night_1_en",20420,],
+["features.login.impl.login_LoginModeView_Day_2_en","features.login.impl.login_LoginModeView_Night_2_en",20420,],
+["features.login.impl.login_LoginModeView_Day_3_en","features.login.impl.login_LoginModeView_Night_3_en",20420,],
+["features.login.impl.login_LoginModeView_Day_4_en","features.login.impl.login_LoginModeView_Night_4_en",20420,],
+["features.login.impl.login_LoginModeView_Day_5_en","features.login.impl.login_LoginModeView_Night_5_en",20420,],
+["features.login.impl.login_LoginModeView_Day_6_en","features.login.impl.login_LoginModeView_Night_6_en",20420,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en",20420,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en",20420,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en",20420,],
+["features.logout.impl_LogoutView_Day_0_en","features.logout.impl_LogoutView_Night_0_en",20420,],
+["features.logout.impl_LogoutView_Day_10_en","features.logout.impl_LogoutView_Night_10_en",20420,],
+["features.logout.impl_LogoutView_Day_11_en","features.logout.impl_LogoutView_Night_11_en",20420,],
+["features.logout.impl_LogoutView_Day_1_en","features.logout.impl_LogoutView_Night_1_en",20420,],
+["features.logout.impl_LogoutView_Day_2_en","features.logout.impl_LogoutView_Night_2_en",20420,],
+["features.logout.impl_LogoutView_Day_3_en","features.logout.impl_LogoutView_Night_3_en",20420,],
+["features.logout.impl_LogoutView_Day_4_en","features.logout.impl_LogoutView_Night_4_en",20420,],
+["features.logout.impl_LogoutView_Day_5_en","features.logout.impl_LogoutView_Night_5_en",20420,],
+["features.logout.impl_LogoutView_Day_6_en","features.logout.impl_LogoutView_Night_6_en",20420,],
+["features.logout.impl_LogoutView_Day_7_en","features.logout.impl_LogoutView_Night_7_en",20420,],
+["features.logout.impl_LogoutView_Day_8_en","features.logout.impl_LogoutView_Night_8_en",20420,],
+["features.logout.impl_LogoutView_Day_9_en","features.logout.impl_LogoutView_Night_9_en",20420,],
 ["libraries.designsystem.components.button_MainActionButton_Buttons_en","",0,],
-["libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en","libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en",20413,],
+["libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en","libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en",20420,],
 ["libraries.textcomposer.components.markdown_MarkdownTextInput_Day_0_en","libraries.textcomposer.components.markdown_MarkdownTextInput_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Night_0_en",0,],
@@ -596,22 +597,22 @@ export const screenshots = [
 ["libraries.matrix.ui.components_MatrixUserRow_Day_1_en","libraries.matrix.ui.components_MatrixUserRow_Night_1_en",0,],
 ["libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en","libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en","libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_1_en",0,],
-["libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en",20413,],
-["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en",20413,],
+["libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en",20420,],
+["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en",20420,],
 ["libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_en","libraries.mediaviewer.impl.local.file_MediaFileView_Night_0_en",0,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en",20413,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en",20413,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en",20420,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en",20420,],
 ["libraries.mediaviewer.impl.local.image_MediaImageView_Day_0_en","libraries.mediaviewer.impl.local.image_MediaImageView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en","libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en","libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_1_en",0,],
@@ -619,14 +620,14 @@ export const screenshots = [
 ["libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en","libraries.mediaviewer.impl.local.video_MediaVideoView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_0_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_10_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_11_en","",20413,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_12_en","",20413,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_11_en","",20420,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_12_en","",20420,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_13_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_14_en","",20413,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_14_en","",20420,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_15_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_16_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_1_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_2_en","",20413,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_2_en","",20420,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_3_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_4_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_5_en","",0,],
@@ -640,7 +641,7 @@ export const screenshots = [
 ["libraries.textcomposer.mentions_MentionSpanTheme_Day_0_en","libraries.textcomposer.mentions_MentionSpanTheme_Night_0_en",0,],
 ["libraries.designsystem.theme.components.previews_Menu_Menus_en","",0,],
 ["features.messages.impl.messagecomposer_MessageComposerViewVoice_Day_0_en","features.messages.impl.messagecomposer_MessageComposerViewVoice_Night_0_en",0,],
-["features.messages.impl.messagecomposer_MessageComposerView_Day_0_en","features.messages.impl.messagecomposer_MessageComposerView_Night_0_en",20413,],
+["features.messages.impl.messagecomposer_MessageComposerView_Day_0_en","features.messages.impl.messagecomposer_MessageComposerView_Night_0_en",20420,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_0_en","features.messages.impl.timeline.components_MessageEventBubble_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_1_en","features.messages.impl.timeline.components_MessageEventBubble_Night_1_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_2_en","features.messages.impl.timeline.components_MessageEventBubble_Night_2_en",0,],
@@ -649,7 +650,7 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_5_en","features.messages.impl.timeline.components_MessageEventBubble_Night_5_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_6_en","features.messages.impl.timeline.components_MessageEventBubble_Night_6_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_7_en","features.messages.impl.timeline.components_MessageEventBubble_Night_7_en",0,],
-["features.messages.impl.timeline.components_MessageShieldView_Day_0_en","features.messages.impl.timeline.components_MessageShieldView_Night_0_en",20413,],
+["features.messages.impl.timeline.components_MessageShieldView_Day_0_en","features.messages.impl.timeline.components_MessageShieldView_Night_0_en",20420,],
 ["features.messages.impl.timeline.components_MessageStateEventContainer_Day_0_en","features.messages.impl.timeline.components_MessageStateEventContainer_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButtonAdd_Day_0_en","features.messages.impl.timeline.components_MessagesReactionButtonAdd_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButtonExtra_Day_0_en","features.messages.impl.timeline.components_MessagesReactionButtonExtra_Night_0_en",0,],
@@ -657,137 +658,137 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_1_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_1_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_2_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_2_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_3_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_3_en",0,],
-["features.messages.impl.topbars_MessagesViewTopBar_Day_0_en","features.messages.impl.topbars_MessagesViewTopBar_Night_0_en",20413,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en",20413,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en",20413,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en",20413,],
-["features.messages.impl_MessagesView_Day_0_en","features.messages.impl_MessagesView_Night_0_en",20413,],
-["features.messages.impl_MessagesView_Day_1_en","features.messages.impl_MessagesView_Night_1_en",20413,],
-["features.messages.impl_MessagesView_Day_2_en","features.messages.impl_MessagesView_Night_2_en",20413,],
-["features.messages.impl_MessagesView_Day_3_en","features.messages.impl_MessagesView_Night_3_en",20413,],
-["features.messages.impl_MessagesView_Day_4_en","features.messages.impl_MessagesView_Night_4_en",20413,],
-["features.messages.impl_MessagesView_Day_5_en","features.messages.impl_MessagesView_Night_5_en",20413,],
-["features.messages.impl_MessagesView_Day_6_en","features.messages.impl_MessagesView_Night_6_en",20413,],
-["features.messages.impl_MessagesView_Day_7_en","features.messages.impl_MessagesView_Night_7_en",20413,],
-["features.messages.impl_MessagesView_Day_8_en","features.messages.impl_MessagesView_Night_8_en",20413,],
-["features.messages.impl_MessagesView_Day_9_en","features.messages.impl_MessagesView_Night_9_en",20413,],
+["features.messages.impl.topbars_MessagesViewTopBar_Day_0_en","features.messages.impl.topbars_MessagesViewTopBar_Night_0_en",20420,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en",20420,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en",20420,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en",20420,],
+["features.messages.impl_MessagesView_Day_0_en","features.messages.impl_MessagesView_Night_0_en",20420,],
+["features.messages.impl_MessagesView_Day_1_en","features.messages.impl_MessagesView_Night_1_en",20420,],
+["features.messages.impl_MessagesView_Day_2_en","features.messages.impl_MessagesView_Night_2_en",20420,],
+["features.messages.impl_MessagesView_Day_3_en","features.messages.impl_MessagesView_Night_3_en",20420,],
+["features.messages.impl_MessagesView_Day_4_en","features.messages.impl_MessagesView_Night_4_en",20420,],
+["features.messages.impl_MessagesView_Day_5_en","features.messages.impl_MessagesView_Night_5_en",20420,],
+["features.messages.impl_MessagesView_Day_6_en","features.messages.impl_MessagesView_Night_6_en",20420,],
+["features.messages.impl_MessagesView_Day_7_en","features.messages.impl_MessagesView_Night_7_en",20420,],
+["features.messages.impl_MessagesView_Day_8_en","features.messages.impl_MessagesView_Night_8_en",20420,],
+["features.messages.impl_MessagesView_Day_9_en","features.messages.impl_MessagesView_Night_9_en",20420,],
 ["features.migration.impl_MigrationView_Day_0_en","features.migration.impl_MigrationView_Night_0_en",0,],
-["features.migration.impl_MigrationView_Day_1_en","features.migration.impl_MigrationView_Night_1_en",20413,],
+["features.migration.impl_MigrationView_Day_1_en","features.migration.impl_MigrationView_Night_1_en",20420,],
 ["libraries.designsystem.theme.components_ModalBottomSheetDark_Bottom_Sheets_en","",0,],
 ["libraries.designsystem.theme.components_ModalBottomSheetLight_Bottom_Sheets_en","",0,],
 ["appicon.element_MonochromeIcon_en","",0,],
-["features.preferences.impl.root_MultiAccountSection_Day_0_en","features.preferences.impl.root_MultiAccountSection_Night_0_en",20413,],
+["features.preferences.impl.root_MultiAccountSection_Day_0_en","features.preferences.impl.root_MultiAccountSection_Night_0_en",20420,],
 ["libraries.designsystem.components.dialogs_MultipleSelectionDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_MultipleSelectionDialog_Day_0_en","libraries.designsystem.components.dialogs_MultipleSelectionDialog_Night_0_en",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItemSelectedTrailingContent_Multiple_selection_List_item_-_selection_in_trailing_content_List_items_en","",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItemSelected_Multiple_selection_List_item_-_selection_in_supporting_text_List_items_en","",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItem_Multiple_selection_List_item_-_no_selection_List_items_en","",0,],
 ["libraries.designsystem.theme.components_NavigationBar_App_Bars_en","",0,],
-["features.home.impl.components_NewNotificationSoundBanner_Day_0_en","features.home.impl.components_NewNotificationSoundBanner_Night_0_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_0_en","features.preferences.impl.notifications_NotificationSettingsView_Night_0_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_10_en","features.preferences.impl.notifications_NotificationSettingsView_Night_10_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_11_en","features.preferences.impl.notifications_NotificationSettingsView_Night_11_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_12_en","features.preferences.impl.notifications_NotificationSettingsView_Night_12_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_13_en","features.preferences.impl.notifications_NotificationSettingsView_Night_13_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_1_en","features.preferences.impl.notifications_NotificationSettingsView_Night_1_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_2_en","features.preferences.impl.notifications_NotificationSettingsView_Night_2_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_3_en","features.preferences.impl.notifications_NotificationSettingsView_Night_3_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_4_en","features.preferences.impl.notifications_NotificationSettingsView_Night_4_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_5_en","features.preferences.impl.notifications_NotificationSettingsView_Night_5_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_6_en","features.preferences.impl.notifications_NotificationSettingsView_Night_6_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_7_en","features.preferences.impl.notifications_NotificationSettingsView_Night_7_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_8_en","features.preferences.impl.notifications_NotificationSettingsView_Night_8_en",20413,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_9_en","features.preferences.impl.notifications_NotificationSettingsView_Night_9_en",20413,],
-["features.ftue.impl.notifications_NotificationsOptInView_Day_0_en","features.ftue.impl.notifications_NotificationsOptInView_Night_0_en",20413,],
+["features.home.impl.components_NewNotificationSoundBanner_Day_0_en","features.home.impl.components_NewNotificationSoundBanner_Night_0_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_0_en","features.preferences.impl.notifications_NotificationSettingsView_Night_0_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_10_en","features.preferences.impl.notifications_NotificationSettingsView_Night_10_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_11_en","features.preferences.impl.notifications_NotificationSettingsView_Night_11_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_12_en","features.preferences.impl.notifications_NotificationSettingsView_Night_12_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_13_en","features.preferences.impl.notifications_NotificationSettingsView_Night_13_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_1_en","features.preferences.impl.notifications_NotificationSettingsView_Night_1_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_2_en","features.preferences.impl.notifications_NotificationSettingsView_Night_2_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_3_en","features.preferences.impl.notifications_NotificationSettingsView_Night_3_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_4_en","features.preferences.impl.notifications_NotificationSettingsView_Night_4_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_5_en","features.preferences.impl.notifications_NotificationSettingsView_Night_5_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_6_en","features.preferences.impl.notifications_NotificationSettingsView_Night_6_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_7_en","features.preferences.impl.notifications_NotificationSettingsView_Night_7_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_8_en","features.preferences.impl.notifications_NotificationSettingsView_Night_8_en",20420,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_9_en","features.preferences.impl.notifications_NotificationSettingsView_Night_9_en",20420,],
+["features.ftue.impl.notifications_NotificationsOptInView_Day_0_en","features.ftue.impl.notifications_NotificationsOptInView_Night_0_en",20420,],
 ["libraries.designsystem.atomic.pages_OnBoardingPage_Day_0_en","libraries.designsystem.atomic.pages_OnBoardingPage_Night_0_en",0,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_0_en","features.login.impl.screens.onboarding_OnBoardingView_Night_0_en",20413,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_1_en","features.login.impl.screens.onboarding_OnBoardingView_Night_1_en",20413,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_2_en","features.login.impl.screens.onboarding_OnBoardingView_Night_2_en",20413,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_3_en","features.login.impl.screens.onboarding_OnBoardingView_Night_3_en",20413,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_4_en","features.login.impl.screens.onboarding_OnBoardingView_Night_4_en",20413,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_5_en","features.login.impl.screens.onboarding_OnBoardingView_Night_5_en",20413,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_6_en","features.login.impl.screens.onboarding_OnBoardingView_Night_6_en",20413,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_7_en","features.login.impl.screens.onboarding_OnBoardingView_Night_7_en",20413,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_0_en","features.login.impl.screens.onboarding_OnBoardingView_Night_0_en",20420,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_1_en","features.login.impl.screens.onboarding_OnBoardingView_Night_1_en",20420,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_2_en","features.login.impl.screens.onboarding_OnBoardingView_Night_2_en",20420,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_3_en","features.login.impl.screens.onboarding_OnBoardingView_Night_3_en",20420,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_4_en","features.login.impl.screens.onboarding_OnBoardingView_Night_4_en",20420,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_5_en","features.login.impl.screens.onboarding_OnBoardingView_Night_5_en",20420,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_6_en","features.login.impl.screens.onboarding_OnBoardingView_Night_6_en",20420,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_7_en","features.login.impl.screens.onboarding_OnBoardingView_Night_7_en",20420,],
 ["libraries.designsystem.background_OnboardingBackground_Day_0_en","libraries.designsystem.background_OnboardingBackground_Night_0_en",0,],
-["libraries.matrix.ui.components_OrganizationHeader_Day_0_en","libraries.matrix.ui.components_OrganizationHeader_Night_0_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en",20413,],
+["libraries.matrix.ui.components_OrganizationHeader_Day_0_en","libraries.matrix.ui.components_OrganizationHeader_Night_0_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en",20420,],
 ["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_12_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_12_en",0,],
 ["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_13_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_13_en",0,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en",20413,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en",20413,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en",20420,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en",20420,],
 ["libraries.designsystem.theme.components_OutlinedButtonLargeLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonLarge_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonMediumLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonMedium_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonSmall_Buttons_en","",0,],
-["libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Day_0_en","libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Night_0_en",20413,],
-["features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Day_0_en","features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Night_0_en",20413,],
-["libraries.permissions.api_PermissionsView_Day_0_en","libraries.permissions.api_PermissionsView_Night_0_en",20413,],
-["libraries.permissions.api_PermissionsView_Day_1_en","libraries.permissions.api_PermissionsView_Night_1_en",20413,],
-["libraries.permissions.api_PermissionsView_Day_2_en","libraries.permissions.api_PermissionsView_Night_2_en",20413,],
-["libraries.permissions.api_PermissionsView_Day_3_en","libraries.permissions.api_PermissionsView_Night_3_en",20413,],
+["libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Day_0_en","libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Night_0_en",20420,],
+["features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Day_0_en","features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Night_0_en",20420,],
+["libraries.permissions.api_PermissionsView_Day_0_en","libraries.permissions.api_PermissionsView_Night_0_en",20420,],
+["libraries.permissions.api_PermissionsView_Day_1_en","libraries.permissions.api_PermissionsView_Night_1_en",20420,],
+["libraries.permissions.api_PermissionsView_Day_2_en","libraries.permissions.api_PermissionsView_Night_2_en",20420,],
+["libraries.permissions.api_PermissionsView_Day_3_en","libraries.permissions.api_PermissionsView_Night_3_en",20420,],
 ["features.lockscreen.impl.components_PinEntryTextField_Day_0_en","features.lockscreen.impl.components_PinEntryTextField_Night_0_en",0,],
 ["libraries.designsystem.components_PinIcon_Day_0_en","libraries.designsystem.components_PinIcon_Night_0_en",0,],
 ["features.lockscreen.impl.unlock.keypad_PinKeypad_Day_0_en","features.lockscreen.impl.unlock.keypad_PinKeypad_Night_0_en",0,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_0_en","features.lockscreen.impl.unlock_PinUnlockView_Night_0_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_1_en","features.lockscreen.impl.unlock_PinUnlockView_Night_1_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_2_en","features.lockscreen.impl.unlock_PinUnlockView_Night_2_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_3_en","features.lockscreen.impl.unlock_PinUnlockView_Night_3_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_4_en","features.lockscreen.impl.unlock_PinUnlockView_Night_4_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_5_en","features.lockscreen.impl.unlock_PinUnlockView_Night_5_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_6_en","features.lockscreen.impl.unlock_PinUnlockView_Night_6_en",20413,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_7_en","features.lockscreen.impl.unlock_PinUnlockView_Night_7_en",20413,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_0_en","features.lockscreen.impl.unlock_PinUnlockView_Night_0_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_1_en","features.lockscreen.impl.unlock_PinUnlockView_Night_1_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_2_en","features.lockscreen.impl.unlock_PinUnlockView_Night_2_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_3_en","features.lockscreen.impl.unlock_PinUnlockView_Night_3_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_4_en","features.lockscreen.impl.unlock_PinUnlockView_Night_4_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_5_en","features.lockscreen.impl.unlock_PinUnlockView_Night_5_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_6_en","features.lockscreen.impl.unlock_PinUnlockView_Night_6_en",20420,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_7_en","features.lockscreen.impl.unlock_PinUnlockView_Night_7_en",20420,],
 ["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_0_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_0_en",0,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_10_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_10_en",20413,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en",20413,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en",20413,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_3_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_3_en",20413,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_4_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_4_en",20413,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_5_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_5_en",20413,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_6_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_6_en",20413,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_7_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_7_en",20413,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_8_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_8_en",20413,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_9_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_9_en",20413,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en",20413,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en",20413,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en",20413,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en",20413,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_10_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_10_en",20420,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en",20420,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en",20420,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_3_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_3_en",20420,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_4_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_4_en",20420,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_5_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_5_en",20420,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_6_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_6_en",20420,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_7_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_7_en",20420,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_8_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_8_en",20420,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_9_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_9_en",20420,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en",20420,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en",20420,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en",20420,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en",20420,],
 ["libraries.designsystem.atomic.atoms_PlaceholderAtom_Day_0_en","libraries.designsystem.atomic.atoms_PlaceholderAtom_Night_0_en",0,],
-["features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en",20413,],
-["features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en",20413,],
-["features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en",20413,],
-["features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en",20413,],
-["features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en",20413,],
+["features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en",20420,],
+["features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en",20420,],
+["features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en",20420,],
+["features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en",20420,],
+["features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en",20420,],
 ["features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Night_0_en",0,],
 ["features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Night_0_en",0,],
-["features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en",20413,],
-["features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en",20413,],
-["features.poll.api.pollcontent_PollContentViewCreator_Day_0_en","features.poll.api.pollcontent_PollContentViewCreator_Night_0_en",20413,],
-["features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en",20413,],
-["features.poll.api.pollcontent_PollContentViewEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewEnded_Night_0_en",20413,],
-["features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en",20413,],
-["features.poll.impl.history_PollHistoryView_Day_0_en","features.poll.impl.history_PollHistoryView_Night_0_en",20413,],
-["features.poll.impl.history_PollHistoryView_Day_1_en","features.poll.impl.history_PollHistoryView_Night_1_en",20413,],
-["features.poll.impl.history_PollHistoryView_Day_2_en","features.poll.impl.history_PollHistoryView_Night_2_en",20413,],
-["features.poll.impl.history_PollHistoryView_Day_3_en","features.poll.impl.history_PollHistoryView_Night_3_en",20413,],
-["features.poll.impl.history_PollHistoryView_Day_4_en","features.poll.impl.history_PollHistoryView_Night_4_en",20413,],
+["features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en",20420,],
+["features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en",20420,],
+["features.poll.api.pollcontent_PollContentViewCreator_Day_0_en","features.poll.api.pollcontent_PollContentViewCreator_Night_0_en",20420,],
+["features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en",20420,],
+["features.poll.api.pollcontent_PollContentViewEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewEnded_Night_0_en",20420,],
+["features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en",20420,],
+["features.poll.impl.history_PollHistoryView_Day_0_en","features.poll.impl.history_PollHistoryView_Night_0_en",20420,],
+["features.poll.impl.history_PollHistoryView_Day_1_en","features.poll.impl.history_PollHistoryView_Night_1_en",20420,],
+["features.poll.impl.history_PollHistoryView_Day_2_en","features.poll.impl.history_PollHistoryView_Night_2_en",20420,],
+["features.poll.impl.history_PollHistoryView_Day_3_en","features.poll.impl.history_PollHistoryView_Night_3_en",20420,],
+["features.poll.impl.history_PollHistoryView_Day_4_en","features.poll.impl.history_PollHistoryView_Night_4_en",20420,],
 ["features.poll.api.pollcontent_PollTitleView_Day_0_en","features.poll.api.pollcontent_PollTitleView_Night_0_en",0,],
 ["libraries.designsystem.components.preferences_PreferenceCategory_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceCheckbox_Preferences_en","",0,],
@@ -801,211 +802,205 @@ export const screenshots = [
 ["libraries.designsystem.components.preferences_PreferenceRow_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceSlide_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceSwitch_Preferences_en","",0,],
-["features.preferences.impl.root_PreferencesRootViewDark_0_en","",20413,],
-["features.preferences.impl.root_PreferencesRootViewDark_1_en","",20413,],
-["features.preferences.impl.root_PreferencesRootViewLight_0_en","",20413,],
-["features.preferences.impl.root_PreferencesRootViewLight_1_en","",20413,],
+["features.preferences.impl.root_PreferencesRootViewDark_0_en","",20420,],
+["features.preferences.impl.root_PreferencesRootViewDark_1_en","",20420,],
+["features.preferences.impl.root_PreferencesRootViewLight_0_en","",20420,],
+["features.preferences.impl.root_PreferencesRootViewLight_1_en","",20420,],
 ["features.messages.impl.timeline.components.event_ProgressButton_Day_0_en","features.messages.impl.timeline.components.event_ProgressButton_Night_0_en",0,],
-["libraries.designsystem.components_ProgressDialogContent_Dialogs_en","",20413,],
-["libraries.designsystem.components_ProgressDialogWithContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithContent_Night_0_en",20413,],
+["libraries.designsystem.components_ProgressDialogContent_Dialogs_en","",20420,],
+["libraries.designsystem.components_ProgressDialogWithContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithContent_Night_0_en",20420,],
 ["libraries.designsystem.components_ProgressDialogWithTextAndContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithTextAndContent_Night_0_en",0,],
-["libraries.designsystem.components_ProgressDialog_Day_0_en","libraries.designsystem.components_ProgressDialog_Night_0_en",20413,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_0_en","features.messages.impl.timeline.protection_ProtectedView_Night_0_en",20413,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_1_en","features.messages.impl.timeline.protection_ProtectedView_Night_1_en",20413,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_2_en","features.messages.impl.timeline.protection_ProtectedView_Night_2_en",20413,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_3_en","features.messages.impl.timeline.protection_ProtectedView_Night_3_en",20413,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en",20413,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en",20413,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en",20413,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en",20413,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en",20413,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en",20413,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en",20413,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en",20413,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en",20413,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en",20413,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en",20413,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en",20413,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en",20413,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en",20413,],
-["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en",20413,],
-["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en",20413,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en",20413,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en",20413,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en",20413,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en",20413,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en",20413,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en",20413,],
+["libraries.designsystem.components_ProgressDialog_Day_0_en","libraries.designsystem.components_ProgressDialog_Night_0_en",20420,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_0_en","features.messages.impl.timeline.protection_ProtectedView_Night_0_en",20420,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_1_en","features.messages.impl.timeline.protection_ProtectedView_Night_1_en",20420,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_2_en","features.messages.impl.timeline.protection_ProtectedView_Night_2_en",20420,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_3_en","features.messages.impl.timeline.protection_ProtectedView_Night_3_en",20420,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en",20420,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en",20420,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en",20420,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en",20420,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en",20420,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en",20420,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en",20420,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en",20420,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en",20420,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en",20420,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en",20420,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en",20420,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en",20420,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en",20420,],
+["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en",20420,],
+["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en",20420,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en",20420,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en",20420,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en",20420,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en",20420,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en",20420,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en",20420,],
 ["libraries.designsystem.theme.components_RadioButton_Toggles_en","",0,],
-["features.rageshake.api.detection_RageshakeDialogContent_Day_0_en","features.rageshake.api.detection_RageshakeDialogContent_Night_0_en",20413,],
-["features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en",20413,],
+["features.rageshake.api.detection_RageshakeDialogContent_Day_0_en","features.rageshake.api.detection_RageshakeDialogContent_Night_0_en",20420,],
+["features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en",20420,],
 ["features.rageshake.api.preferences_RageshakePreferencesView_Day_1_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.reactionsummary_ReactionSummaryViewContent_Day_0_en","features.messages.impl.timeline.components.reactionsummary_ReactionSummaryViewContent_Night_0_en",0,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en",20413,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en",20413,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en",20413,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en",20413,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en",20413,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_0_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_0_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_1_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_1_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_2_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_2_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_3_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_3_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_4_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_4_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_5_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_5_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_6_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_6_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_7_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_7_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en",20413,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en",20413,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en",20420,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en",20420,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en",20420,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en",20420,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en",20420,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_0_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_0_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_1_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_1_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_2_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_2_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_3_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_3_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_4_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_4_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_5_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_5_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_6_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_6_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_7_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_7_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en",20420,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en",20420,],
 ["libraries.designsystem.atomic.atoms_RedIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_RedIndicatorAtom_Night_0_en",0,],
 ["features.messages.impl.timeline.components_ReplySwipeIndicator_Day_0_en","features.messages.impl.timeline.components_ReplySwipeIndicator_Night_0_en",0,],
-["features.messages.impl.report_ReportMessageView_Day_0_en","features.messages.impl.report_ReportMessageView_Night_0_en",20413,],
-["features.messages.impl.report_ReportMessageView_Day_1_en","features.messages.impl.report_ReportMessageView_Night_1_en",20413,],
-["features.messages.impl.report_ReportMessageView_Day_2_en","features.messages.impl.report_ReportMessageView_Night_2_en",20413,],
-["features.messages.impl.report_ReportMessageView_Day_3_en","features.messages.impl.report_ReportMessageView_Night_3_en",20413,],
-["features.messages.impl.report_ReportMessageView_Day_4_en","features.messages.impl.report_ReportMessageView_Night_4_en",20413,],
-["features.messages.impl.report_ReportMessageView_Day_5_en","features.messages.impl.report_ReportMessageView_Night_5_en",20413,],
-["features.reportroom.impl_ReportRoomView_Day_0_en","features.reportroom.impl_ReportRoomView_Night_0_en",20413,],
-["features.reportroom.impl_ReportRoomView_Day_1_en","features.reportroom.impl_ReportRoomView_Night_1_en",20413,],
-["features.reportroom.impl_ReportRoomView_Day_2_en","features.reportroom.impl_ReportRoomView_Night_2_en",20413,],
-["features.reportroom.impl_ReportRoomView_Day_3_en","features.reportroom.impl_ReportRoomView_Night_3_en",20413,],
-["features.reportroom.impl_ReportRoomView_Day_4_en","features.reportroom.impl_ReportRoomView_Night_4_en",20413,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en",20413,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en",20413,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en",20413,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en",20413,],
-["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en",20413,],
-["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en",20413,],
+["features.messages.impl.report_ReportMessageView_Day_0_en","features.messages.impl.report_ReportMessageView_Night_0_en",20420,],
+["features.messages.impl.report_ReportMessageView_Day_1_en","features.messages.impl.report_ReportMessageView_Night_1_en",20420,],
+["features.messages.impl.report_ReportMessageView_Day_2_en","features.messages.impl.report_ReportMessageView_Night_2_en",20420,],
+["features.messages.impl.report_ReportMessageView_Day_3_en","features.messages.impl.report_ReportMessageView_Night_3_en",20420,],
+["features.messages.impl.report_ReportMessageView_Day_4_en","features.messages.impl.report_ReportMessageView_Night_4_en",20420,],
+["features.messages.impl.report_ReportMessageView_Day_5_en","features.messages.impl.report_ReportMessageView_Night_5_en",20420,],
+["features.reportroom.impl_ReportRoomView_Day_0_en","features.reportroom.impl_ReportRoomView_Night_0_en",20420,],
+["features.reportroom.impl_ReportRoomView_Day_1_en","features.reportroom.impl_ReportRoomView_Night_1_en",20420,],
+["features.reportroom.impl_ReportRoomView_Day_2_en","features.reportroom.impl_ReportRoomView_Night_2_en",20420,],
+["features.reportroom.impl_ReportRoomView_Day_3_en","features.reportroom.impl_ReportRoomView_Night_3_en",20420,],
+["features.reportroom.impl_ReportRoomView_Day_4_en","features.reportroom.impl_ReportRoomView_Night_4_en",20420,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en",20420,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en",20420,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en",20420,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en",20420,],
+["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en",20420,],
+["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en",20420,],
 ["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_0_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_0_en",0,],
-["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en",20413,],
-["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en",20413,],
-["libraries.designsystem.components.dialogs_RetryDialogContent_Dialogs_en","",20413,],
-["libraries.designsystem.components.dialogs_RetryDialog_Day_0_en","libraries.designsystem.components.dialogs_RetryDialog_Night_0_en",20413,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en",20413,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en",20413,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en",20413,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en",20413,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en",20413,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en",20413,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en",20413,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en",20413,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en",20413,],
+["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en",20420,],
+["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en",20420,],
+["libraries.designsystem.components.dialogs_RetryDialogContent_Dialogs_en","",20420,],
+["libraries.designsystem.components.dialogs_RetryDialog_Day_0_en","libraries.designsystem.components.dialogs_RetryDialog_Night_0_en",20420,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en",20420,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en",20420,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en",20420,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en",20420,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en",20420,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en",20420,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en",20420,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en",20420,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en",20420,],
 ["libraries.matrix.ui.room.address_RoomAddressField_Day_0_en","libraries.matrix.ui.room.address_RoomAddressField_Night_0_en",0,],
 ["features.roomaliasresolver.impl_RoomAliasResolverView_Day_0_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_0_en",0,],
-["features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en",20413,],
-["features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en",20413,],
-["features.roomdetails.impl_RoomDetailsDark_0_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_10_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_11_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_12_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_13_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_14_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_15_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_16_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_17_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_18_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_19_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_1_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_2_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_3_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_4_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_5_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_6_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_7_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_8_en","",20413,],
-["features.roomdetails.impl_RoomDetailsDark_9_en","",20413,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_0_en",20413,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_1_en",20413,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_2_en",20413,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_3_en",20413,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_4_en",20413,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_5_en",20413,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_6_en",20413,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_7_en",20413,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_8_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_8_en",20413,],
-["features.roomdetails.impl_RoomDetails_0_en","",20413,],
-["features.roomdetails.impl_RoomDetails_10_en","",20413,],
-["features.roomdetails.impl_RoomDetails_11_en","",20413,],
-["features.roomdetails.impl_RoomDetails_12_en","",20413,],
-["features.roomdetails.impl_RoomDetails_13_en","",20413,],
-["features.roomdetails.impl_RoomDetails_14_en","",20413,],
-["features.roomdetails.impl_RoomDetails_15_en","",20413,],
-["features.roomdetails.impl_RoomDetails_16_en","",20413,],
-["features.roomdetails.impl_RoomDetails_17_en","",20413,],
-["features.roomdetails.impl_RoomDetails_18_en","",20413,],
-["features.roomdetails.impl_RoomDetails_19_en","",20413,],
-["features.roomdetails.impl_RoomDetails_1_en","",20413,],
-["features.roomdetails.impl_RoomDetails_2_en","",20413,],
-["features.roomdetails.impl_RoomDetails_3_en","",20413,],
-["features.roomdetails.impl_RoomDetails_4_en","",20413,],
-["features.roomdetails.impl_RoomDetails_5_en","",20413,],
-["features.roomdetails.impl_RoomDetails_6_en","",20413,],
-["features.roomdetails.impl_RoomDetails_7_en","",20413,],
-["features.roomdetails.impl_RoomDetails_8_en","",20413,],
-["features.roomdetails.impl_RoomDetails_9_en","",20413,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en",20413,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en",20413,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en",20413,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en",20413,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en",20413,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en",20413,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en",20413,],
-["features.home.impl.components_RoomListContentView_Day_0_en","features.home.impl.components_RoomListContentView_Night_0_en",20413,],
-["features.home.impl.components_RoomListContentView_Day_1_en","features.home.impl.components_RoomListContentView_Night_1_en",20413,],
+["features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en",20420,],
+["features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en",20420,],
+["features.roomdetails.impl_RoomDetailsDark_0_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_10_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_11_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_12_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_13_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_14_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_15_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_16_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_17_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_18_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_19_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_1_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_2_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_3_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_4_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_5_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_6_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_7_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_8_en","",20420,],
+["features.roomdetails.impl_RoomDetailsDark_9_en","",20420,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_0_en",20420,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_1_en",20420,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_2_en",20420,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_3_en",20420,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_4_en",20420,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_5_en",20420,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_6_en",20420,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_7_en",20420,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_8_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_8_en",20420,],
+["features.roomdetails.impl_RoomDetails_0_en","",20420,],
+["features.roomdetails.impl_RoomDetails_10_en","",20420,],
+["features.roomdetails.impl_RoomDetails_11_en","",20420,],
+["features.roomdetails.impl_RoomDetails_12_en","",20420,],
+["features.roomdetails.impl_RoomDetails_13_en","",20420,],
+["features.roomdetails.impl_RoomDetails_14_en","",20420,],
+["features.roomdetails.impl_RoomDetails_15_en","",20420,],
+["features.roomdetails.impl_RoomDetails_16_en","",20420,],
+["features.roomdetails.impl_RoomDetails_17_en","",20420,],
+["features.roomdetails.impl_RoomDetails_18_en","",20420,],
+["features.roomdetails.impl_RoomDetails_19_en","",20420,],
+["features.roomdetails.impl_RoomDetails_1_en","",20420,],
+["features.roomdetails.impl_RoomDetails_2_en","",20420,],
+["features.roomdetails.impl_RoomDetails_3_en","",20420,],
+["features.roomdetails.impl_RoomDetails_4_en","",20420,],
+["features.roomdetails.impl_RoomDetails_5_en","",20420,],
+["features.roomdetails.impl_RoomDetails_6_en","",20420,],
+["features.roomdetails.impl_RoomDetails_7_en","",20420,],
+["features.roomdetails.impl_RoomDetails_8_en","",20420,],
+["features.roomdetails.impl_RoomDetails_9_en","",20420,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en",20420,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en",20420,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en",20420,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en",20420,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en",20420,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en",20420,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en",20420,],
+["features.home.impl.components_RoomListContentView_Day_0_en","features.home.impl.components_RoomListContentView_Night_0_en",20420,],
+["features.home.impl.components_RoomListContentView_Day_1_en","features.home.impl.components_RoomListContentView_Night_1_en",20420,],
 ["features.home.impl.components_RoomListContentView_Day_2_en","features.home.impl.components_RoomListContentView_Night_2_en",0,],
-["features.home.impl.components_RoomListContentView_Day_3_en","features.home.impl.components_RoomListContentView_Night_3_en",20413,],
-["features.home.impl.components_RoomListContentView_Day_4_en","features.home.impl.components_RoomListContentView_Night_4_en",20413,],
-["features.home.impl.components_RoomListContentView_Day_5_en","features.home.impl.components_RoomListContentView_Night_5_en",20413,],
-["features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_en","features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Night_0_en",20413,],
-["features.home.impl.filters_RoomListFiltersView_Day_0_en","features.home.impl.filters_RoomListFiltersView_Night_0_en",20413,],
-["features.home.impl.filters_RoomListFiltersView_Day_1_en","features.home.impl.filters_RoomListFiltersView_Night_1_en",20413,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_0_en",20413,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_1_en",20413,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_2_en",20413,],
+["features.home.impl.components_RoomListContentView_Day_3_en","features.home.impl.components_RoomListContentView_Night_3_en",20420,],
+["features.home.impl.components_RoomListContentView_Day_4_en","features.home.impl.components_RoomListContentView_Night_4_en",20420,],
+["features.home.impl.components_RoomListContentView_Day_5_en","features.home.impl.components_RoomListContentView_Night_5_en",20420,],
+["features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_en","features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Night_0_en",20420,],
+["features.home.impl.filters_RoomListFiltersView_Day_0_en","features.home.impl.filters_RoomListFiltersView_Night_0_en",20420,],
+["features.home.impl.filters_RoomListFiltersView_Day_1_en","features.home.impl.filters_RoomListFiltersView_Night_1_en",20420,],
+["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_0_en",20420,],
+["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_1_en",20420,],
+["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_2_en",20420,],
 ["features.home.impl.search_RoomListSearchContent_Day_0_en","features.home.impl.search_RoomListSearchContent_Night_0_en",0,],
-["features.home.impl.search_RoomListSearchContent_Day_1_en","features.home.impl.search_RoomListSearchContent_Night_1_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_0_en","features.roomdetails.impl.members_RoomMemberListView_Night_0_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_1_en","features.roomdetails.impl.members_RoomMemberListView_Night_1_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_2_en","features.roomdetails.impl.members_RoomMemberListView_Night_2_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_3_en","features.roomdetails.impl.members_RoomMemberListView_Night_3_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_4_en","features.roomdetails.impl.members_RoomMemberListView_Night_4_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_5_en","features.roomdetails.impl.members_RoomMemberListView_Night_5_en",20413,],
+["features.home.impl.search_RoomListSearchContent_Day_1_en","features.home.impl.search_RoomListSearchContent_Night_1_en",20420,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_0_en","features.roomdetails.impl.members_RoomMemberListView_Night_0_en",20420,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_1_en","features.roomdetails.impl.members_RoomMemberListView_Night_1_en",20420,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_2_en","features.roomdetails.impl.members_RoomMemberListView_Night_2_en",20420,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_3_en","features.roomdetails.impl.members_RoomMemberListView_Night_3_en",20420,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_4_en","features.roomdetails.impl.members_RoomMemberListView_Night_4_en",20420,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_5_en","features.roomdetails.impl.members_RoomMemberListView_Night_5_en",20420,],
 ["features.roomdetails.impl.members_RoomMemberListView_Day_6_en","features.roomdetails.impl.members_RoomMemberListView_Night_6_en",0,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_7_en","features.roomdetails.impl.members_RoomMemberListView_Night_7_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_8_en","features.roomdetails.impl.members_RoomMemberListView_Night_8_en",20413,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_9_en","features.roomdetails.impl.members_RoomMemberListView_Night_9_en",20413,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en",20413,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en",20413,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en",20413,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en",20413,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en",20413,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en",20413,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en",20413,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en",20413,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en",20413,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en",20420,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en",20420,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en",20420,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en",20420,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en",20420,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en",20420,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en",20420,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en",20420,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en",20420,],
 ["features.roommembermoderation.impl_RoomMemberModerationView_Day_9_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_9_en",0,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en",20413,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en",20413,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en",20413,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en",20413,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en",20413,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en",20413,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en",20413,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en",20413,],
-["libraries.roomselect.impl_RoomSelectView_Day_0_en","libraries.roomselect.impl_RoomSelectView_Night_0_en",20413,],
-["libraries.roomselect.impl_RoomSelectView_Day_1_en","libraries.roomselect.impl_RoomSelectView_Night_1_en",20413,],
-["libraries.roomselect.impl_RoomSelectView_Day_2_en","libraries.roomselect.impl_RoomSelectView_Night_2_en",20413,],
-["libraries.roomselect.impl_RoomSelectView_Day_3_en","libraries.roomselect.impl_RoomSelectView_Night_3_en",20413,],
-["libraries.roomselect.impl_RoomSelectView_Day_4_en","libraries.roomselect.impl_RoomSelectView_Night_4_en",20413,],
-["libraries.roomselect.impl_RoomSelectView_Day_5_en","libraries.roomselect.impl_RoomSelectView_Night_5_en",20413,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en",20420,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en",20420,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en",20420,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en",20420,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en",20420,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en",20420,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en",20420,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en",20420,],
+["libraries.roomselect.impl_RoomSelectView_Day_0_en","libraries.roomselect.impl_RoomSelectView_Night_0_en",20420,],
+["libraries.roomselect.impl_RoomSelectView_Day_1_en","libraries.roomselect.impl_RoomSelectView_Night_1_en",20420,],
+["libraries.roomselect.impl_RoomSelectView_Day_2_en","libraries.roomselect.impl_RoomSelectView_Night_2_en",20420,],
+["libraries.roomselect.impl_RoomSelectView_Day_3_en","libraries.roomselect.impl_RoomSelectView_Night_3_en",20420,],
+["libraries.roomselect.impl_RoomSelectView_Day_4_en","libraries.roomselect.impl_RoomSelectView_Night_4_en",20420,],
+["libraries.roomselect.impl_RoomSelectView_Day_5_en","libraries.roomselect.impl_RoomSelectView_Night_5_en",20420,],
 ["features.home.impl.components_RoomSummaryPlaceholderRow_Day_0_en","features.home.impl.components_RoomSummaryPlaceholderRow_Night_0_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_0_en","features.home.impl.components_RoomSummaryRow_Night_0_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_10_en","features.home.impl.components_RoomSummaryRow_Night_10_en",0,],
@@ -1028,14 +1023,14 @@ export const screenshots = [
 ["features.home.impl.components_RoomSummaryRow_Day_26_en","features.home.impl.components_RoomSummaryRow_Night_26_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_27_en","features.home.impl.components_RoomSummaryRow_Night_27_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_28_en","features.home.impl.components_RoomSummaryRow_Night_28_en",0,],
-["features.home.impl.components_RoomSummaryRow_Day_29_en","features.home.impl.components_RoomSummaryRow_Night_29_en",20413,],
-["features.home.impl.components_RoomSummaryRow_Day_2_en","features.home.impl.components_RoomSummaryRow_Night_2_en",20413,],
-["features.home.impl.components_RoomSummaryRow_Day_30_en","features.home.impl.components_RoomSummaryRow_Night_30_en",20413,],
-["features.home.impl.components_RoomSummaryRow_Day_31_en","features.home.impl.components_RoomSummaryRow_Night_31_en",20413,],
-["features.home.impl.components_RoomSummaryRow_Day_32_en","features.home.impl.components_RoomSummaryRow_Night_32_en",20413,],
-["features.home.impl.components_RoomSummaryRow_Day_33_en","features.home.impl.components_RoomSummaryRow_Night_33_en",20413,],
-["features.home.impl.components_RoomSummaryRow_Day_34_en","features.home.impl.components_RoomSummaryRow_Night_34_en",20413,],
-["features.home.impl.components_RoomSummaryRow_Day_35_en","features.home.impl.components_RoomSummaryRow_Night_35_en",20413,],
+["features.home.impl.components_RoomSummaryRow_Day_29_en","features.home.impl.components_RoomSummaryRow_Night_29_en",20420,],
+["features.home.impl.components_RoomSummaryRow_Day_2_en","features.home.impl.components_RoomSummaryRow_Night_2_en",20420,],
+["features.home.impl.components_RoomSummaryRow_Day_30_en","features.home.impl.components_RoomSummaryRow_Night_30_en",20420,],
+["features.home.impl.components_RoomSummaryRow_Day_31_en","features.home.impl.components_RoomSummaryRow_Night_31_en",20420,],
+["features.home.impl.components_RoomSummaryRow_Day_32_en","features.home.impl.components_RoomSummaryRow_Night_32_en",20420,],
+["features.home.impl.components_RoomSummaryRow_Day_33_en","features.home.impl.components_RoomSummaryRow_Night_33_en",20420,],
+["features.home.impl.components_RoomSummaryRow_Day_34_en","features.home.impl.components_RoomSummaryRow_Night_34_en",20420,],
+["features.home.impl.components_RoomSummaryRow_Day_35_en","features.home.impl.components_RoomSummaryRow_Night_35_en",20420,],
 ["features.home.impl.components_RoomSummaryRow_Day_3_en","features.home.impl.components_RoomSummaryRow_Night_3_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_4_en","features.home.impl.components_RoomSummaryRow_Night_4_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_5_en","features.home.impl.components_RoomSummaryRow_Night_5_en",0,],
@@ -1043,83 +1038,105 @@ export const screenshots = [
 ["features.home.impl.components_RoomSummaryRow_Day_7_en","features.home.impl.components_RoomSummaryRow_Night_7_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_8_en","features.home.impl.components_RoomSummaryRow_Night_8_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_9_en","features.home.impl.components_RoomSummaryRow_Night_9_en",0,],
-["appnav.root_RootView_Day_0_en","appnav.root_RootView_Night_0_en",20413,],
-["appnav.root_RootView_Day_1_en","appnav.root_RootView_Night_1_en",20413,],
-["appnav.root_RootView_Day_2_en","appnav.root_RootView_Night_2_en",20413,],
+["appnav.root_RootView_Day_0_en","appnav.root_RootView_Night_0_en",20420,],
+["appnav.root_RootView_Day_1_en","appnav.root_RootView_Night_1_en",20420,],
+["appnav.root_RootView_Day_2_en","appnav.root_RootView_Night_2_en",20420,],
 ["appicon.enterprise_RoundIcon_en","",0,],
 ["appicon.element_RoundIcon_en","",0,],
 ["libraries.designsystem.atomic.atoms_RoundedIconAtom_Day_0_en","libraries.designsystem.atomic.atoms_RoundedIconAtom_Night_0_en",0,],
-["features.verifysession.impl.emoji_SasEmojis_Day_0_en","features.verifysession.impl.emoji_SasEmojis_Night_0_en",20413,],
-["libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_en","libraries.designsystem.components.dialogs_SaveChangesDialog_Night_0_en",20413,],
-["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en",20413,],
-["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en",20413,],
+["features.verifysession.impl.emoji_SasEmojis_Day_0_en","features.verifysession.impl.emoji_SasEmojis_Night_0_en",20420,],
+["libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_en","libraries.designsystem.components.dialogs_SaveChangesDialog_Night_0_en",20420,],
+["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en",20420,],
+["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en",20420,],
 ["libraries.designsystem.theme.components_SearchBarActiveNoneQuery_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithContent_Search_views_en","",0,],
-["libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en","",20413,],
+["libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en","",20420,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithQueryNoBackButton_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithQuery_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarInactive_Search_views_en","",0,],
-["features.startchat.impl.components_SearchMultipleUsersResultItem_en","",20413,],
-["features.startchat.impl.components_SearchSingleUserResultItem_en","",20413,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en",20413,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en",20413,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en",20413,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en",20413,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en",20413,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en",20413,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en",20413,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en",20413,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_0_en","features.securebackup.impl.root_SecureBackupRootView_Night_0_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_10_en","features.securebackup.impl.root_SecureBackupRootView_Night_10_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_11_en","features.securebackup.impl.root_SecureBackupRootView_Night_11_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_12_en","features.securebackup.impl.root_SecureBackupRootView_Night_12_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_13_en","features.securebackup.impl.root_SecureBackupRootView_Night_13_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_14_en","features.securebackup.impl.root_SecureBackupRootView_Night_14_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_15_en","features.securebackup.impl.root_SecureBackupRootView_Night_15_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_16_en","features.securebackup.impl.root_SecureBackupRootView_Night_16_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_17_en","features.securebackup.impl.root_SecureBackupRootView_Night_17_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_1_en","features.securebackup.impl.root_SecureBackupRootView_Night_1_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_2_en","features.securebackup.impl.root_SecureBackupRootView_Night_2_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_3_en","features.securebackup.impl.root_SecureBackupRootView_Night_3_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_4_en","features.securebackup.impl.root_SecureBackupRootView_Night_4_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_5_en","features.securebackup.impl.root_SecureBackupRootView_Night_5_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_6_en","features.securebackup.impl.root_SecureBackupRootView_Night_6_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_7_en","features.securebackup.impl.root_SecureBackupRootView_Night_7_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_8_en","features.securebackup.impl.root_SecureBackupRootView_Night_8_en",20413,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_9_en","features.securebackup.impl.root_SecureBackupRootView_Night_9_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en",20413,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_9_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en","",20413,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_9_en","",20413,],
+["libraries.designsystem.theme.components_SearchFieldsDark_Search_views_en","",0,],
+["libraries.designsystem.theme.components_SearchFieldsLight_Search_views_en","",0,],
+["features.startchat.impl.components_SearchMultipleUsersResultItem_en","",20420,],
+["features.startchat.impl.components_SearchSingleUserResultItem_en","",20420,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en",20420,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en",20420,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en",20420,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en",20420,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en",20420,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en",20420,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en",20420,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en",20420,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_0_en","features.securebackup.impl.root_SecureBackupRootView_Night_0_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_10_en","features.securebackup.impl.root_SecureBackupRootView_Night_10_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_11_en","features.securebackup.impl.root_SecureBackupRootView_Night_11_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_12_en","features.securebackup.impl.root_SecureBackupRootView_Night_12_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_13_en","features.securebackup.impl.root_SecureBackupRootView_Night_13_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_14_en","features.securebackup.impl.root_SecureBackupRootView_Night_14_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_15_en","features.securebackup.impl.root_SecureBackupRootView_Night_15_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_16_en","features.securebackup.impl.root_SecureBackupRootView_Night_16_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_17_en","features.securebackup.impl.root_SecureBackupRootView_Night_17_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_1_en","features.securebackup.impl.root_SecureBackupRootView_Night_1_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_2_en","features.securebackup.impl.root_SecureBackupRootView_Night_2_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_3_en","features.securebackup.impl.root_SecureBackupRootView_Night_3_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_4_en","features.securebackup.impl.root_SecureBackupRootView_Night_4_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_5_en","features.securebackup.impl.root_SecureBackupRootView_Night_5_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_6_en","features.securebackup.impl.root_SecureBackupRootView_Night_6_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_7_en","features.securebackup.impl.root_SecureBackupRootView_Night_7_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_8_en","features.securebackup.impl.root_SecureBackupRootView_Night_8_en",20420,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_9_en","features.securebackup.impl.root_SecureBackupRootView_Night_9_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en",20420,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en",20420,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en","",0,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en","",0,],
 ["libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Night_0_en",0,],
 ["libraries.matrix.ui.components_SelectedRoomRtl_Day_0_en","libraries.matrix.ui.components_SelectedRoomRtl_Night_0_en",0,],
 ["libraries.matrix.ui.components_SelectedRoomRtl_Day_1_en","libraries.matrix.ui.components_SelectedRoomRtl_Night_1_en",0,],
@@ -1133,11 +1150,11 @@ export const screenshots = [
 ["libraries.matrix.ui.components_SelectedUser_Day_1_en","libraries.matrix.ui.components_SelectedUser_Night_1_en",0,],
 ["libraries.matrix.ui.components_SelectedUsersRowList_Day_0_en","libraries.matrix.ui.components_SelectedUsersRowList_Night_0_en",0,],
 ["libraries.textcomposer.components_SendButton_Day_0_en","libraries.textcomposer.components_SendButton_Night_0_en",0,],
-["features.location.impl.send_SendLocationView_Day_0_en","features.location.impl.send_SendLocationView_Night_0_en",20413,],
-["features.location.impl.send_SendLocationView_Day_1_en","features.location.impl.send_SendLocationView_Night_1_en",20413,],
-["features.location.impl.send_SendLocationView_Day_2_en","features.location.impl.send_SendLocationView_Night_2_en",20413,],
-["features.location.impl.send_SendLocationView_Day_3_en","features.location.impl.send_SendLocationView_Night_3_en",20413,],
-["features.location.impl.send_SendLocationView_Day_4_en","features.location.impl.send_SendLocationView_Night_4_en",20413,],
+["features.location.impl.send_SendLocationView_Day_0_en","features.location.impl.send_SendLocationView_Night_0_en",20420,],
+["features.location.impl.send_SendLocationView_Day_1_en","features.location.impl.send_SendLocationView_Night_1_en",20420,],
+["features.location.impl.send_SendLocationView_Day_2_en","features.location.impl.send_SendLocationView_Night_2_en",20420,],
+["features.location.impl.send_SendLocationView_Day_3_en","features.location.impl.send_SendLocationView_Night_3_en",20420,],
+["features.location.impl.send_SendLocationView_Day_4_en","features.location.impl.send_SendLocationView_Night_4_en",20420,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_0_en","libraries.matrix.ui.messages.sender_SenderName_Night_0_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_1_en","libraries.matrix.ui.messages.sender_SenderName_Night_1_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_2_en","libraries.matrix.ui.messages.sender_SenderName_Night_2_en",0,],
@@ -1147,27 +1164,27 @@ export const screenshots = [
 ["libraries.matrix.ui.messages.sender_SenderName_Day_6_en","libraries.matrix.ui.messages.sender_SenderName_Night_6_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_7_en","libraries.matrix.ui.messages.sender_SenderName_Night_7_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_8_en","libraries.matrix.ui.messages.sender_SenderName_Night_8_en",0,],
-["features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en","features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en",20413,],
-["features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en","features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en",20413,],
-["features.lockscreen.impl.setup.biometric_SetupBiometricView_Day_0_en","features.lockscreen.impl.setup.biometric_SetupBiometricView_Night_0_en",20413,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en",20413,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en",20413,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en",20413,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en",20413,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en",20413,],
+["features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en","features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en",20420,],
+["features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en","features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en",20420,],
+["features.lockscreen.impl.setup.biometric_SetupBiometricView_Day_0_en","features.lockscreen.impl.setup.biometric_SetupBiometricView_Night_0_en",20420,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en",20420,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en",20420,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en",20420,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en",20420,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en",20420,],
 ["features.share.impl_ShareView_Day_0_en","features.share.impl_ShareView_Night_0_en",0,],
 ["features.share.impl_ShareView_Day_1_en","features.share.impl_ShareView_Night_1_en",0,],
 ["features.share.impl_ShareView_Day_2_en","features.share.impl_ShareView_Night_2_en",0,],
-["features.share.impl_ShareView_Day_3_en","features.share.impl_ShareView_Night_3_en",20413,],
-["features.location.impl.show_ShowLocationView_Day_0_en","features.location.impl.show_ShowLocationView_Night_0_en",20413,],
-["features.location.impl.show_ShowLocationView_Day_1_en","features.location.impl.show_ShowLocationView_Night_1_en",20413,],
-["features.location.impl.show_ShowLocationView_Day_2_en","features.location.impl.show_ShowLocationView_Night_2_en",20413,],
-["features.location.impl.show_ShowLocationView_Day_3_en","features.location.impl.show_ShowLocationView_Night_3_en",20413,],
-["features.location.impl.show_ShowLocationView_Day_4_en","features.location.impl.show_ShowLocationView_Night_4_en",20413,],
-["features.location.impl.show_ShowLocationView_Day_5_en","features.location.impl.show_ShowLocationView_Night_5_en",20413,],
-["features.location.impl.show_ShowLocationView_Day_6_en","features.location.impl.show_ShowLocationView_Night_6_en",20413,],
-["features.location.impl.show_ShowLocationView_Day_7_en","features.location.impl.show_ShowLocationView_Night_7_en",20413,],
-["features.signedout.impl_SignedOutView_Day_0_en","features.signedout.impl_SignedOutView_Night_0_en",20413,],
+["features.share.impl_ShareView_Day_3_en","features.share.impl_ShareView_Night_3_en",20420,],
+["features.location.impl.show_ShowLocationView_Day_0_en","features.location.impl.show_ShowLocationView_Night_0_en",20420,],
+["features.location.impl.show_ShowLocationView_Day_1_en","features.location.impl.show_ShowLocationView_Night_1_en",20420,],
+["features.location.impl.show_ShowLocationView_Day_2_en","features.location.impl.show_ShowLocationView_Night_2_en",20420,],
+["features.location.impl.show_ShowLocationView_Day_3_en","features.location.impl.show_ShowLocationView_Night_3_en",20420,],
+["features.location.impl.show_ShowLocationView_Day_4_en","features.location.impl.show_ShowLocationView_Night_4_en",20420,],
+["features.location.impl.show_ShowLocationView_Day_5_en","features.location.impl.show_ShowLocationView_Night_5_en",20420,],
+["features.location.impl.show_ShowLocationView_Day_6_en","features.location.impl.show_ShowLocationView_Night_6_en",20420,],
+["features.location.impl.show_ShowLocationView_Day_7_en","features.location.impl.show_ShowLocationView_Night_7_en",20420,],
+["features.signedout.impl_SignedOutView_Day_0_en","features.signedout.impl_SignedOutView_Night_0_en",20420,],
 ["libraries.designsystem.components_SimpleModalBottomSheet_Day_0_en","libraries.designsystem.components_SimpleModalBottomSheet_Night_0_en",0,],
 ["libraries.designsystem.components.dialogs_SingleSelectionDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_SingleSelectionDialog_Day_0_en","libraries.designsystem.components.dialogs_SingleSelectionDialog_Night_0_en",0,],
@@ -1177,102 +1194,102 @@ export const screenshots = [
 ["libraries.designsystem.components.list_SingleSelectionListItemUnselectedWithSupportingText_Single_selection_List_item_-_no_selection,_supporting_text_List_items_en","",0,],
 ["libraries.designsystem.components.list_SingleSelectionListItem_Single_selection_List_item_-_no_selection_List_items_en","",0,],
 ["libraries.designsystem.theme.components_Sliders_Sliders_en","",0,],
-["features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en","features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en",20413,],
+["features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en","features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en",20420,],
 ["libraries.designsystem.theme.components_SnackbarWithActionAndCloseButton_Snackbar_with_action_and_close_button_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithActionOnNewLineAndCloseButton_Snackbar_with_action_and_close_button_on_new_line_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithActionOnNewLine_Snackbar_with_action_on_new_line_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithAction_Snackbar_with_action_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_Snackbar_Snackbar_Snackbars_en","",0,],
-["features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_en","features.announcement.impl.spaces_SpaceAnnouncementView_Night_0_en",20413,],
+["features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_en","features.announcement.impl.spaces_SpaceAnnouncementView_Night_0_en",20420,],
 ["libraries.designsystem.components.avatar.internal_SpaceAvatar_Avatars_en","",0,],
-["libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en",20413,],
-["libraries.matrix.ui.components_SpaceHeaderView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderView_Night_0_en",20413,],
-["libraries.matrix.ui.components_SpaceInfoRow_Day_0_en","libraries.matrix.ui.components_SpaceInfoRow_Night_0_en",20413,],
+["libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en",20420,],
+["libraries.matrix.ui.components_SpaceHeaderView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderView_Night_0_en",20420,],
+["libraries.matrix.ui.components_SpaceInfoRow_Day_0_en","libraries.matrix.ui.components_SpaceInfoRow_Night_0_en",20420,],
 ["libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Day_0_en","libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Night_0_en",0,],
 ["libraries.matrix.ui.components_SpaceMembersView_Day_0_en","libraries.matrix.ui.components_SpaceMembersView_Night_0_en",0,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en",20413,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en",20413,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en",20413,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en",20413,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en",20413,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en",20413,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en",20413,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en",20413,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en",20413,],
-["features.space.impl.settings_SpaceSettingsView_Day_0_en","features.space.impl.settings_SpaceSettingsView_Night_0_en",20413,],
-["features.space.impl.settings_SpaceSettingsView_Day_1_en","features.space.impl.settings_SpaceSettingsView_Night_1_en",20413,],
-["features.space.impl.settings_SpaceSettingsView_Day_2_en","features.space.impl.settings_SpaceSettingsView_Night_2_en",20413,],
-["features.space.impl.settings_SpaceSettingsView_Day_3_en","features.space.impl.settings_SpaceSettingsView_Night_3_en",20413,],
-["features.space.impl.root_SpaceView_Day_0_en","features.space.impl.root_SpaceView_Night_0_en",20413,],
-["features.space.impl.root_SpaceView_Day_1_en","features.space.impl.root_SpaceView_Night_1_en",20413,],
-["features.space.impl.root_SpaceView_Day_2_en","features.space.impl.root_SpaceView_Night_2_en",20413,],
-["features.space.impl.root_SpaceView_Day_3_en","features.space.impl.root_SpaceView_Night_3_en",20413,],
-["features.space.impl.root_SpaceView_Day_4_en","features.space.impl.root_SpaceView_Night_4_en",20413,],
-["features.space.impl.root_SpaceView_Day_5_en","features.space.impl.root_SpaceView_Night_5_en",20413,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en",20420,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en",20420,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en",20420,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en",20420,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en",20420,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en",20420,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en",20420,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en",20420,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en",20420,],
+["features.space.impl.settings_SpaceSettingsView_Day_0_en","features.space.impl.settings_SpaceSettingsView_Night_0_en",20420,],
+["features.space.impl.settings_SpaceSettingsView_Day_1_en","features.space.impl.settings_SpaceSettingsView_Night_1_en",20420,],
+["features.space.impl.settings_SpaceSettingsView_Day_2_en","features.space.impl.settings_SpaceSettingsView_Night_2_en",20420,],
+["features.space.impl.settings_SpaceSettingsView_Day_3_en","features.space.impl.settings_SpaceSettingsView_Night_3_en",20420,],
+["features.space.impl.root_SpaceView_Day_0_en","features.space.impl.root_SpaceView_Night_0_en",20420,],
+["features.space.impl.root_SpaceView_Day_1_en","features.space.impl.root_SpaceView_Night_1_en",20420,],
+["features.space.impl.root_SpaceView_Day_2_en","features.space.impl.root_SpaceView_Night_2_en",20420,],
+["features.space.impl.root_SpaceView_Day_3_en","features.space.impl.root_SpaceView_Night_3_en",20420,],
+["features.space.impl.root_SpaceView_Day_4_en","features.space.impl.root_SpaceView_Night_4_en",20420,],
+["features.space.impl.root_SpaceView_Day_5_en","features.space.impl.root_SpaceView_Night_5_en",20420,],
 ["libraries.designsystem.modifiers_SquareSizeModifierInsideSquare_en","",0,],
 ["libraries.designsystem.modifiers_SquareSizeModifierLargeHeight_en","",0,],
 ["libraries.designsystem.modifiers_SquareSizeModifierLargeWidth_en","",0,],
-["features.startchat.impl.root_StartChatView_Day_0_en","features.startchat.impl.root_StartChatView_Night_0_en",20413,],
-["features.startchat.impl.root_StartChatView_Day_1_en","features.startchat.impl.root_StartChatView_Night_1_en",20413,],
-["features.startchat.impl.root_StartChatView_Day_2_en","features.startchat.impl.root_StartChatView_Night_2_en",20413,],
-["features.startchat.impl.root_StartChatView_Day_3_en","features.startchat.impl.root_StartChatView_Night_3_en",20413,],
-["features.startchat.impl.root_StartChatView_Day_4_en","features.startchat.impl.root_StartChatView_Night_4_en",20413,],
-["features.startchat.impl.root_StartChatView_Day_5_en","features.startchat.impl.root_StartChatView_Night_5_en",20413,],
-["features.location.api.internal_StaticMapPlaceholder_Day_0_en","features.location.api.internal_StaticMapPlaceholder_Night_0_en",20413,],
+["features.startchat.impl.root_StartChatView_Day_0_en","features.startchat.impl.root_StartChatView_Night_0_en",20420,],
+["features.startchat.impl.root_StartChatView_Day_1_en","features.startchat.impl.root_StartChatView_Night_1_en",20420,],
+["features.startchat.impl.root_StartChatView_Day_2_en","features.startchat.impl.root_StartChatView_Night_2_en",20420,],
+["features.startchat.impl.root_StartChatView_Day_3_en","features.startchat.impl.root_StartChatView_Night_3_en",20420,],
+["features.startchat.impl.root_StartChatView_Day_4_en","features.startchat.impl.root_StartChatView_Night_4_en",20420,],
+["features.startchat.impl.root_StartChatView_Day_5_en","features.startchat.impl.root_StartChatView_Night_5_en",20420,],
+["features.location.api.internal_StaticMapPlaceholder_Day_0_en","features.location.api.internal_StaticMapPlaceholder_Night_0_en",20420,],
 ["features.location.api_StaticMapView_Day_0_en","features.location.api_StaticMapView_Night_0_en",0,],
-["features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en","features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en",20413,],
+["features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en","features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en",20420,],
 ["libraries.designsystem.atomic.pages_SunsetPage_Day_0_en","libraries.designsystem.atomic.pages_SunsetPage_Night_0_en",0,],
 ["libraries.designsystem.components.button_SuperButton_Day_0_en","libraries.designsystem.components.button_SuperButton_Night_0_en",0,],
 ["libraries.designsystem.theme.components_Surface_en","",0,],
 ["libraries.designsystem.theme.components_Switch_Toggles_en","",0,],
-["appnav.loggedin_SyncStateView_Day_0_en","appnav.loggedin_SyncStateView_Night_0_en",20413,],
+["appnav.loggedin_SyncStateView_Day_0_en","appnav.loggedin_SyncStateView_Night_0_en",20420,],
 ["libraries.designsystem.components.avatar.internal_TextAvatar_Avatars_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonLargeLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonLarge_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonMediumLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonMedium_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonSmall_Buttons_en","",0,],
-["libraries.textcomposer_TextComposerAddCaption_Day_0_en","libraries.textcomposer_TextComposerAddCaption_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerCaption_Day_0_en","libraries.textcomposer_TextComposerCaption_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerEditCaption_Day_0_en","libraries.textcomposer_TextComposerEditCaption_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerEdit_Day_0_en","libraries.textcomposer_TextComposerEdit_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerFormatting_Day_0_en","libraries.textcomposer_TextComposerFormatting_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerLinkDialogCreateLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLink_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerLinkDialogEditLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogEditLink_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en",20413,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_0_en","libraries.textcomposer_TextComposerReply_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_10_en","libraries.textcomposer_TextComposerReply_Night_10_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_11_en","libraries.textcomposer_TextComposerReply_Night_11_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_1_en","libraries.textcomposer_TextComposerReply_Night_1_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_2_en","libraries.textcomposer_TextComposerReply_Night_2_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_3_en","libraries.textcomposer_TextComposerReply_Night_3_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_4_en","libraries.textcomposer_TextComposerReply_Night_4_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_5_en","libraries.textcomposer_TextComposerReply_Night_5_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_6_en","libraries.textcomposer_TextComposerReply_Night_6_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_7_en","libraries.textcomposer_TextComposerReply_Night_7_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_8_en","libraries.textcomposer_TextComposerReply_Night_8_en",20413,],
-["libraries.textcomposer_TextComposerReply_Day_9_en","libraries.textcomposer_TextComposerReply_Night_9_en",20413,],
-["libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerSimple_Day_0_en","libraries.textcomposer_TextComposerSimple_Night_0_en",20413,],
-["libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en",20413,],
+["libraries.textcomposer_TextComposerAddCaption_Day_0_en","libraries.textcomposer_TextComposerAddCaption_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerCaption_Day_0_en","libraries.textcomposer_TextComposerCaption_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerEditCaption_Day_0_en","libraries.textcomposer_TextComposerEditCaption_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerEdit_Day_0_en","libraries.textcomposer_TextComposerEdit_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerFormatting_Day_0_en","libraries.textcomposer_TextComposerFormatting_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerLinkDialogCreateLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLink_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerLinkDialogEditLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogEditLink_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en",20420,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_0_en","libraries.textcomposer_TextComposerReply_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_10_en","libraries.textcomposer_TextComposerReply_Night_10_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_11_en","libraries.textcomposer_TextComposerReply_Night_11_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_1_en","libraries.textcomposer_TextComposerReply_Night_1_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_2_en","libraries.textcomposer_TextComposerReply_Night_2_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_3_en","libraries.textcomposer_TextComposerReply_Night_3_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_4_en","libraries.textcomposer_TextComposerReply_Night_4_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_5_en","libraries.textcomposer_TextComposerReply_Night_5_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_6_en","libraries.textcomposer_TextComposerReply_Night_6_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_7_en","libraries.textcomposer_TextComposerReply_Night_7_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_8_en","libraries.textcomposer_TextComposerReply_Night_8_en",20420,],
+["libraries.textcomposer_TextComposerReply_Day_9_en","libraries.textcomposer_TextComposerReply_Night_9_en",20420,],
+["libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerSimple_Day_0_en","libraries.textcomposer_TextComposerSimple_Night_0_en",20420,],
+["libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en",20420,],
 ["libraries.textcomposer_TextComposerVoice_Day_0_en","libraries.textcomposer_TextComposerVoice_Night_0_en",0,],
 ["libraries.designsystem.theme.components_TextDark_Text_en","",0,],
-["libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en",20413,],
-["libraries.designsystem.components.dialogs_TextFieldDialog_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialog_Night_0_en",20413,],
+["libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en",20420,],
+["libraries.designsystem.components.dialogs_TextFieldDialog_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialog_Night_0_en",20420,],
 ["libraries.designsystem.components.list_TextFieldListItemEmpty_Text_field_List_item_-_empty_List_items_en","",0,],
 ["libraries.designsystem.components.list_TextFieldListItemTextFieldValue_Text_field_List_item_-_textfieldvalue_List_items_en","",0,],
 ["libraries.designsystem.components.list_TextFieldListItem_Text_field_List_item_-_text_List_items_en","",0,],
@@ -1284,16 +1301,16 @@ export const screenshots = [
 ["libraries.mediaviewer.impl.local.txt_TextFileContentView_Day_3_en","libraries.mediaviewer.impl.local.txt_TextFileContentView_Night_3_en",0,],
 ["libraries.textcomposer.components_TextFormatting_Day_0_en","libraries.textcomposer.components_TextFormatting_Night_0_en",0,],
 ["libraries.designsystem.theme.components_TextLight_Text_en","",0,],
-["features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en","features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en",20413,],
-["features.messages.impl.topbars_ThreadTopBar_Day_0_en","features.messages.impl.topbars_ThreadTopBar_Night_0_en",20413,],
-["libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en","",20413,],
-["libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en","",20413,],
-["libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en","",20413,],
+["features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en","features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en",20420,],
+["features.messages.impl.topbars_ThreadTopBar_Day_0_en","features.messages.impl.topbars_ThreadTopBar_Night_0_en",20420,],
+["libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en","",20420,],
+["libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en","",20420,],
+["libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en","",20420,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_0_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_1_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_2_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en",20413,],
-["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en",20413,],
+["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en",20420,],
+["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en",20420,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_5_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_6_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_6_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_7_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_7_en",0,],
@@ -1303,18 +1320,18 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_4_en",0,],
-["features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en","features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en","features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en",20420,],
 ["features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Day_1_en","features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Night_1_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en",20420,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_en","",0,],
@@ -1322,18 +1339,18 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_3_en",20413,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_3_en",20420,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en",20420,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_5_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_6_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_6_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en",20413,],
-["features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en",20413,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en",20420,],
+["features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en",20420,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en",20420,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en",20413,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en",20420,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en",20420,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en",0,],
@@ -1342,41 +1359,41 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en",20420,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en",20420,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en",20420,],
 ["features.messages.impl.timeline.components_TimelineItemEventRow_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRow_Night_0_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en","",20413,],
+["features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en","",20420,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_4_en",0,],
-["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en",20413,],
-["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Night_0_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en",20420,],
+["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Night_0_en",20420,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemInformativeView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemInformativeView_Night_0_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en",20420,],
 ["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_1_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en",20413,],
-["features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en",20420,],
+["features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en",20420,],
 ["features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Night_0_en",0,],
-["features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en",20413,],
-["features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en",20413,],
+["features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en",20420,],
+["features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en",20420,],
 ["features.messages.impl.timeline.components_TimelineItemReactionsView_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsView_Night_0_en",0,],
-["features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en",20413,],
+["features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en",20420,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_0_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_1_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_2_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_2_en",0,],
@@ -1385,8 +1402,8 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_5_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_5_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_6_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_6_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_7_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_7_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en",20413,],
-["features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en",20420,],
+["features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en",20420,],
 ["features.messages.impl.timeline.components_TimelineItemStateEventRow_Day_0_en","features.messages.impl.timeline.components_TimelineItemStateEventRow_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemStateView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemStateView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemStickerView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemStickerView_Night_0_en",0,],
@@ -1401,8 +1418,8 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_4_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_5_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en",20413,],
-["features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Night_0_en",20413,],
+["features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en",20420,],
+["features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Night_0_en",20420,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_2_en",0,],
@@ -1425,85 +1442,85 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_9_en","features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_9_en",0,],
 ["features.messages.impl.timeline.components.virtual_TimelineLoadingMoreIndicator_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineLoadingMoreIndicator_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Day_0_en","features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Night_0_en",0,],
-["features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en","features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en",20413,],
-["features.messages.impl.timeline_TimelineView_Day_0_en","features.messages.impl.timeline_TimelineView_Night_0_en",20413,],
+["features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en","features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en",20420,],
+["features.messages.impl.timeline_TimelineView_Day_0_en","features.messages.impl.timeline_TimelineView_Night_0_en",20420,],
 ["features.messages.impl.timeline_TimelineView_Day_10_en","features.messages.impl.timeline_TimelineView_Night_10_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_11_en","features.messages.impl.timeline_TimelineView_Night_11_en",20413,],
-["features.messages.impl.timeline_TimelineView_Day_12_en","features.messages.impl.timeline_TimelineView_Night_12_en",20413,],
-["features.messages.impl.timeline_TimelineView_Day_13_en","features.messages.impl.timeline_TimelineView_Night_13_en",20413,],
-["features.messages.impl.timeline_TimelineView_Day_14_en","features.messages.impl.timeline_TimelineView_Night_14_en",20413,],
-["features.messages.impl.timeline_TimelineView_Day_15_en","features.messages.impl.timeline_TimelineView_Night_15_en",20413,],
-["features.messages.impl.timeline_TimelineView_Day_16_en","features.messages.impl.timeline_TimelineView_Night_16_en",20413,],
-["features.messages.impl.timeline_TimelineView_Day_17_en","features.messages.impl.timeline_TimelineView_Night_17_en",20413,],
-["features.messages.impl.timeline_TimelineView_Day_1_en","features.messages.impl.timeline_TimelineView_Night_1_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_11_en","features.messages.impl.timeline_TimelineView_Night_11_en",20420,],
+["features.messages.impl.timeline_TimelineView_Day_12_en","features.messages.impl.timeline_TimelineView_Night_12_en",20420,],
+["features.messages.impl.timeline_TimelineView_Day_13_en","features.messages.impl.timeline_TimelineView_Night_13_en",20420,],
+["features.messages.impl.timeline_TimelineView_Day_14_en","features.messages.impl.timeline_TimelineView_Night_14_en",20420,],
+["features.messages.impl.timeline_TimelineView_Day_15_en","features.messages.impl.timeline_TimelineView_Night_15_en",20420,],
+["features.messages.impl.timeline_TimelineView_Day_16_en","features.messages.impl.timeline_TimelineView_Night_16_en",20420,],
+["features.messages.impl.timeline_TimelineView_Day_17_en","features.messages.impl.timeline_TimelineView_Night_17_en",20420,],
+["features.messages.impl.timeline_TimelineView_Day_1_en","features.messages.impl.timeline_TimelineView_Night_1_en",20420,],
 ["features.messages.impl.timeline_TimelineView_Day_2_en","features.messages.impl.timeline_TimelineView_Night_2_en",0,],
 ["features.messages.impl.timeline_TimelineView_Day_3_en","features.messages.impl.timeline_TimelineView_Night_3_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_4_en","features.messages.impl.timeline_TimelineView_Night_4_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_4_en","features.messages.impl.timeline_TimelineView_Night_4_en",20420,],
 ["features.messages.impl.timeline_TimelineView_Day_5_en","features.messages.impl.timeline_TimelineView_Night_5_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_6_en","features.messages.impl.timeline_TimelineView_Night_6_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_6_en","features.messages.impl.timeline_TimelineView_Night_6_en",20420,],
 ["features.messages.impl.timeline_TimelineView_Day_7_en","features.messages.impl.timeline_TimelineView_Night_7_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_8_en","features.messages.impl.timeline_TimelineView_Night_8_en",20413,],
+["features.messages.impl.timeline_TimelineView_Day_8_en","features.messages.impl.timeline_TimelineView_Night_8_en",20420,],
 ["features.messages.impl.timeline_TimelineView_Day_9_en","features.messages.impl.timeline_TimelineView_Night_9_en",0,],
 ["libraries.designsystem.components.avatar.internal_TombstonedRoomAvatar_Avatars_en","",0,],
 ["libraries.designsystem.theme.components_TopAppBarStr_App_Bars_en","",0,],
 ["libraries.designsystem.theme.components_TopAppBar_App_Bars_en","",0,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en",20413,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en",20413,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en",20413,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en",20413,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en",20413,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en",20413,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en",20413,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en",20413,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en",20420,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en",20420,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en",20420,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en",20420,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en",20420,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en",20420,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en",20420,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en",20420,],
 ["features.messages.impl.typing_TypingNotificationView_Day_0_en","features.messages.impl.typing_TypingNotificationView_Night_0_en",0,],
-["features.messages.impl.typing_TypingNotificationView_Day_1_en","features.messages.impl.typing_TypingNotificationView_Night_1_en",20413,],
-["features.messages.impl.typing_TypingNotificationView_Day_2_en","features.messages.impl.typing_TypingNotificationView_Night_2_en",20413,],
-["features.messages.impl.typing_TypingNotificationView_Day_3_en","features.messages.impl.typing_TypingNotificationView_Night_3_en",20413,],
-["features.messages.impl.typing_TypingNotificationView_Day_4_en","features.messages.impl.typing_TypingNotificationView_Night_4_en",20413,],
-["features.messages.impl.typing_TypingNotificationView_Day_5_en","features.messages.impl.typing_TypingNotificationView_Night_5_en",20413,],
-["features.messages.impl.typing_TypingNotificationView_Day_6_en","features.messages.impl.typing_TypingNotificationView_Night_6_en",20413,],
+["features.messages.impl.typing_TypingNotificationView_Day_1_en","features.messages.impl.typing_TypingNotificationView_Night_1_en",20420,],
+["features.messages.impl.typing_TypingNotificationView_Day_2_en","features.messages.impl.typing_TypingNotificationView_Night_2_en",20420,],
+["features.messages.impl.typing_TypingNotificationView_Day_3_en","features.messages.impl.typing_TypingNotificationView_Night_3_en",20420,],
+["features.messages.impl.typing_TypingNotificationView_Day_4_en","features.messages.impl.typing_TypingNotificationView_Night_4_en",20420,],
+["features.messages.impl.typing_TypingNotificationView_Day_5_en","features.messages.impl.typing_TypingNotificationView_Night_5_en",20420,],
+["features.messages.impl.typing_TypingNotificationView_Day_6_en","features.messages.impl.typing_TypingNotificationView_Night_6_en",20420,],
 ["features.messages.impl.typing_TypingNotificationView_Day_7_en","features.messages.impl.typing_TypingNotificationView_Night_7_en",0,],
 ["features.messages.impl.typing_TypingNotificationView_Day_8_en","features.messages.impl.typing_TypingNotificationView_Night_8_en",0,],
 ["libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Night_0_en",0,],
-["libraries.matrix.ui.components_UnresolvedUserRow_en","",20413,],
+["libraries.matrix.ui.components_UnresolvedUserRow_en","",20420,],
 ["libraries.matrix.ui.components_UnsavedAvatar_Day_0_en","libraries.matrix.ui.components_UnsavedAvatar_Night_0_en",0,],
 ["libraries.designsystem.components.avatar.internal_UserAvatarColors_Day_0_en","libraries.designsystem.components.avatar.internal_UserAvatarColors_Night_0_en",0,],
-["features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en",20413,],
-["features.startchat.impl.components_UserListView_Day_0_en","features.startchat.impl.components_UserListView_Night_0_en",20413,],
-["features.startchat.impl.components_UserListView_Day_1_en","features.startchat.impl.components_UserListView_Night_1_en",20413,],
-["features.startchat.impl.components_UserListView_Day_2_en","features.startchat.impl.components_UserListView_Night_2_en",20413,],
+["features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en",20420,],
+["features.startchat.impl.components_UserListView_Day_0_en","features.startchat.impl.components_UserListView_Night_0_en",20420,],
+["features.startchat.impl.components_UserListView_Day_1_en","features.startchat.impl.components_UserListView_Night_1_en",20420,],
+["features.startchat.impl.components_UserListView_Day_2_en","features.startchat.impl.components_UserListView_Night_2_en",20420,],
 ["features.startchat.impl.components_UserListView_Day_3_en","features.startchat.impl.components_UserListView_Night_3_en",0,],
 ["features.startchat.impl.components_UserListView_Day_4_en","features.startchat.impl.components_UserListView_Night_4_en",0,],
 ["features.startchat.impl.components_UserListView_Day_5_en","features.startchat.impl.components_UserListView_Night_5_en",0,],
 ["features.startchat.impl.components_UserListView_Day_6_en","features.startchat.impl.components_UserListView_Night_6_en",0,],
-["features.startchat.impl.components_UserListView_Day_7_en","features.startchat.impl.components_UserListView_Night_7_en",20413,],
+["features.startchat.impl.components_UserListView_Day_7_en","features.startchat.impl.components_UserListView_Night_7_en",20420,],
 ["features.startchat.impl.components_UserListView_Day_8_en","features.startchat.impl.components_UserListView_Night_8_en",0,],
-["features.startchat.impl.components_UserListView_Day_9_en","features.startchat.impl.components_UserListView_Night_9_en",20413,],
+["features.startchat.impl.components_UserListView_Day_9_en","features.startchat.impl.components_UserListView_Night_9_en",20420,],
 ["features.preferences.impl.user_UserPreferences_Day_0_en","features.preferences.impl.user_UserPreferences_Night_0_en",0,],
 ["features.preferences.impl.user_UserPreferences_Day_1_en","features.preferences.impl.user_UserPreferences_Night_1_en",0,],
 ["features.preferences.impl.user_UserPreferences_Day_2_en","features.preferences.impl.user_UserPreferences_Night_2_en",0,],
-["features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en","features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en",20413,],
-["features.userprofile.shared_UserProfileHeaderSection_Day_0_en","features.userprofile.shared_UserProfileHeaderSection_Night_0_en",20413,],
-["features.userprofile.shared_UserProfileView_Day_0_en","features.userprofile.shared_UserProfileView_Night_0_en",20413,],
-["features.userprofile.shared_UserProfileView_Day_1_en","features.userprofile.shared_UserProfileView_Night_1_en",20413,],
-["features.userprofile.shared_UserProfileView_Day_2_en","features.userprofile.shared_UserProfileView_Night_2_en",20413,],
-["features.userprofile.shared_UserProfileView_Day_3_en","features.userprofile.shared_UserProfileView_Night_3_en",20413,],
-["features.userprofile.shared_UserProfileView_Day_4_en","features.userprofile.shared_UserProfileView_Night_4_en",20413,],
-["features.userprofile.shared_UserProfileView_Day_5_en","features.userprofile.shared_UserProfileView_Night_5_en",20413,],
-["features.userprofile.shared_UserProfileView_Day_6_en","features.userprofile.shared_UserProfileView_Night_6_en",20413,],
-["features.userprofile.shared_UserProfileView_Day_7_en","features.userprofile.shared_UserProfileView_Night_7_en",20413,],
-["features.userprofile.shared_UserProfileView_Day_8_en","features.userprofile.shared_UserProfileView_Night_8_en",20413,],
-["features.userprofile.shared_UserProfileView_Day_9_en","features.userprofile.shared_UserProfileView_Night_9_en",20413,],
+["features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en","features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en",20420,],
+["features.userprofile.shared_UserProfileHeaderSection_Day_0_en","features.userprofile.shared_UserProfileHeaderSection_Night_0_en",20420,],
+["features.userprofile.shared_UserProfileView_Day_0_en","features.userprofile.shared_UserProfileView_Night_0_en",20420,],
+["features.userprofile.shared_UserProfileView_Day_1_en","features.userprofile.shared_UserProfileView_Night_1_en",20420,],
+["features.userprofile.shared_UserProfileView_Day_2_en","features.userprofile.shared_UserProfileView_Night_2_en",20420,],
+["features.userprofile.shared_UserProfileView_Day_3_en","features.userprofile.shared_UserProfileView_Night_3_en",20420,],
+["features.userprofile.shared_UserProfileView_Day_4_en","features.userprofile.shared_UserProfileView_Night_4_en",20420,],
+["features.userprofile.shared_UserProfileView_Day_5_en","features.userprofile.shared_UserProfileView_Night_5_en",20420,],
+["features.userprofile.shared_UserProfileView_Day_6_en","features.userprofile.shared_UserProfileView_Night_6_en",20420,],
+["features.userprofile.shared_UserProfileView_Day_7_en","features.userprofile.shared_UserProfileView_Night_7_en",20420,],
+["features.userprofile.shared_UserProfileView_Day_8_en","features.userprofile.shared_UserProfileView_Night_8_en",20420,],
+["features.userprofile.shared_UserProfileView_Day_9_en","features.userprofile.shared_UserProfileView_Night_9_en",20420,],
 ["features.verifysession.impl.ui_VerificationUserProfileContent_Day_0_en","features.verifysession.impl.ui_VerificationUserProfileContent_Night_0_en",0,],
 ["libraries.designsystem.ruler_VerticalRuler_Day_0_en","libraries.designsystem.ruler_VerticalRuler_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_1_en",0,],
-["features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en","features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en",20413,],
-["features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en","features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en",20413,],
+["features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en","features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en",20420,],
+["features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en","features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en",20420,],
 ["features.viewfolder.impl.file_ViewFileView_Day_0_en","features.viewfolder.impl.file_ViewFileView_Night_0_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_1_en","features.viewfolder.impl.file_ViewFileView_Night_1_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_2_en","features.viewfolder.impl.file_ViewFileView_Night_2_en",0,],
-["features.viewfolder.impl.file_ViewFileView_Day_3_en","features.viewfolder.impl.file_ViewFileView_Night_3_en",20413,],
+["features.viewfolder.impl.file_ViewFileView_Day_3_en","features.viewfolder.impl.file_ViewFileView_Night_3_en",20420,],
 ["features.viewfolder.impl.file_ViewFileView_Day_4_en","features.viewfolder.impl.file_ViewFileView_Night_4_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_5_en","features.viewfolder.impl.file_ViewFileView_Night_5_en",0,],
 ["features.viewfolder.impl.folder_ViewFolderView_Day_0_en","features.viewfolder.impl.folder_ViewFolderView_Night_0_en",0,],

From eedaeb6b3547a6811cd2bd3d2e48cc6fa56282c4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 13:35:11 +0000
Subject: [PATCH 101/113] fix(deps): update dependency
 com.posthog:posthog-android to v3.27.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1a8ebd36a2..95b431d67d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -216,7 +216,7 @@ haze_materials = { module = "dev.chrisbanes.haze:haze-materials", version.ref =
 color_picker = "io.mhssn:colorpicker:1.0.0"
 
 # Analytics
-posthog = "com.posthog:posthog-android:3.26.0"
+posthog = "com.posthog:posthog-android:3.27.0"
 sentry = "io.sentry:sentry-android:8.27.1"
 # main branch can be tested replacing the version with main-SNAPSHOT
 matrix_analytics_events = "com.github.matrix-org:matrix-analytics-events:0.29.2"

From 2e2d68ba83044f359718b466ea26026a23b7f7bd Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Tue, 2 Dec 2025 16:22:55 +0100
Subject: [PATCH 102/113] Load `JoinedRoom` in home screen, pass it to the room
 flow (#5817)

* Load `JoinedRoom` in `HomeFlowNode.navigateToRoom`, then pass it to the next navigation nodes

* Add delayed loading indicator for cases when loading the room takes too long

* Avoid an extra FFI call in `RustRoomFactory`.

Use `RoomInfo.membership` instead.

Also use `computation` dispatcher, since it should reduce the delay when switching contexts.

* Remove the dispatcher usage when loading the room in `HomeFlowNode`, we immediately call a method that changes the dispatcher used

* Make sure only a single room is opened at a time
---
 .../android/appnav/LoggedInFlowNode.kt        | 20 ++++--
 .../android/appnav/room/RoomFlowNode.kt       | 39 ++++++++---
 .../appnav/room/RoomNavigationTarget.kt       |  3 +
 .../appnav/room/joined/JoinedRoomFlowNode.kt  |  4 +-
 .../LoadingBaseRoomStateFlowFactoryTest.kt    | 19 ++++-
 .../features/home/api/HomeEntryPoint.kt       |  3 +-
 .../features/home/impl/HomeFlowNode.kt        | 69 ++++++++++++++++++-
 .../home/impl/DefaultHomeEntryPointTest.kt    |  7 +-
 .../impl/timeline/TimelinePresenter.kt        |  2 +
 .../matrix/impl/room/RustRoomFactory.kt       | 38 +++++-----
 .../matrix/ui/room/LoadingRoomState.kt        | 24 ++++---
 tests/uitests/build.gradle.kts                |  5 ++
 12 files changed, 180 insertions(+), 53 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index 7e782c7cc4..38dc39ee83 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -39,7 +39,6 @@ import com.bumble.appyx.navmodel.backstack.operation.replace
 import com.bumble.appyx.navmodel.backstack.operation.singleTop
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
-import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.loggedin.LoggedInNode
 import io.element.android.appnav.loggedin.MediaPreviewConfigMigration
@@ -84,6 +83,7 @@ import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.verification.SessionVerificationServiceListener
 import io.element.android.libraries.matrix.api.verification.VerificationRequest
@@ -109,6 +109,7 @@ import java.util.UUID
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toKotlinDuration
+import im.vector.app.features.analytics.plan.JoinedRoom as JoinedRoomAnalyticsEvent
 
 @ContributesNode(SessionScope::class)
 @AssistedInject
@@ -265,7 +266,7 @@ class LoggedInFlowNode(
         data class Room(
             val roomIdOrAlias: RoomIdOrAlias,
             val serverNames: List<String> = emptyList(),
-            val trigger: JoinedRoom.Trigger? = null,
+            val trigger: JoinedRoomAnalyticsEvent.Trigger? = null,
             val roomDescription: RoomDescription? = null,
             val initialElement: RoomNavigationTarget = RoomNavigationTarget.Root(),
             val targetId: UUID = UUID.randomUUID(),
@@ -315,8 +316,13 @@ class LoggedInFlowNode(
             }
             NavTarget.Home -> {
                 val callback = object : HomeEntryPoint.Callback {
-                    override fun navigateToRoom(roomId: RoomId) {
-                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
+                    override fun navigateToRoom(roomId: RoomId, joinedRoom: JoinedRoom?) {
+                        backstack.push(
+                            NavTarget.Room(
+                                roomIdOrAlias = roomId.toRoomIdOrAlias(),
+                                initialElement = RoomNavigationTarget.Root(joinedRoom = joinedRoom)
+                            )
+                        )
                     }
 
                     override fun navigateToSettings() {
@@ -365,7 +371,7 @@ class LoggedInFlowNode(
                                 val target = NavTarget.Room(
                                     roomIdOrAlias = data.roomIdOrAlias,
                                     serverNames = data.viaParameters,
-                                    trigger = JoinedRoom.Trigger.Timeline,
+                                    trigger = JoinedRoomAnalyticsEvent.Trigger.Timeline,
                                     initialElement = RoomNavigationTarget.Root(data.eventId),
                                 )
                                 if (pushToBackstack) {
@@ -479,7 +485,7 @@ class LoggedInFlowNode(
                                 NavTarget.Room(
                                     roomIdOrAlias = roomDescription.roomId.toRoomIdOrAlias(),
                                     roomDescription = roomDescription,
-                                    trigger = JoinedRoom.Trigger.RoomDirectory,
+                                    trigger = JoinedRoomAnalyticsEvent.Trigger.RoomDirectory,
                                 )
                             )
                         }
@@ -519,7 +525,7 @@ class LoggedInFlowNode(
     suspend fun attachRoom(
         roomIdOrAlias: RoomIdOrAlias,
         serverNames: List<String> = emptyList(),
-        trigger: JoinedRoom.Trigger? = null,
+        trigger: JoinedRoomAnalyticsEvent.Trigger? = null,
         eventId: EventId? = null,
         clearBackstack: Boolean,
     ): RoomFlowNode {
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
index 9aa62d6b16..1bf3516900 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
@@ -19,10 +19,10 @@ import com.bumble.appyx.core.node.node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.active
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
-import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.room.joined.JoinedRoomFlowNode
 import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
@@ -60,10 +60,13 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.launch
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 import java.util.Optional
 import kotlin.jvm.optionals.getOrNull
+import im.vector.app.features.analytics.plan.JoinedRoom as JoinedRoomAnalyticsEvent
+import io.element.android.libraries.matrix.api.room.JoinedRoom as JoinedRoomInstance
 
 @ContributesNode(SessionScope::class)
 @AssistedInject
@@ -77,7 +80,14 @@ class RoomFlowNode(
     private val analyticsService: AnalyticsService,
 ) : BaseFlowNode<RoomFlowNode.NavTarget>(
     backstack = BackStack(
-        initialElement = NavTarget.Loading,
+        initialElement = run {
+            val joinedRoom = (plugins.filterIsInstance<Inputs>().first().initialElement as? RoomNavigationTarget.Root)?.joinedRoom
+            if (joinedRoom != null) {
+                NavTarget.JoinedRoom(joinedRoom)
+            } else {
+                NavTarget.Loading
+            }
+        },
         savedStateMap = buildContext.savedStateMap,
     ),
     buildContext = buildContext,
@@ -87,7 +97,7 @@ class RoomFlowNode(
         val roomIdOrAlias: RoomIdOrAlias,
         val roomDescription: Optional<RoomDescription>,
         val serverNames: List<String>,
-        val trigger: Optional<JoinedRoom.Trigger>,
+        val trigger: Optional<JoinedRoomAnalyticsEvent.Trigger>,
         val initialElement: RoomNavigationTarget,
     ) : NodeInputs
 
@@ -104,11 +114,16 @@ class RoomFlowNode(
         data class JoinRoom(
             val roomId: RoomId,
             val serverNames: List<String>,
-            val trigger: im.vector.app.features.analytics.plan.JoinedRoom.Trigger,
+            val trigger: JoinedRoomAnalyticsEvent.Trigger,
         ) : NavTarget
 
         @Parcelize
-        data class JoinedRoom(val roomId: RoomId) : NavTarget
+        data class JoinedRoom(
+            val roomId: RoomId,
+            @IgnoredOnParcel val joinedRoom: JoinedRoomInstance? = null,
+        ) : NavTarget {
+            constructor(joinedRoom: JoinedRoomInstance) : this(joinedRoom.roomId, joinedRoom)
+        }
     }
 
     override fun onBuilt() {
@@ -133,7 +148,9 @@ class RoomFlowNode(
     }
 
     private fun subscribeToRoomInfoFlow(roomId: RoomId, serverNames: List<String>) {
-        val roomInfoFlow = client.getRoomInfoFlow(roomId)
+        val joinedRoom = (inputs.initialElement as? RoomNavigationTarget.Root)?.joinedRoom
+        val roomInfoFlow = joinedRoom?.roomInfoFlow?.map { Optional.of(it) }
+            ?: client.getRoomInfoFlow(roomId)
 
         // This observes the local membership changes for the room
         val membershipUpdateFlow = membershipObserver.updates
@@ -149,6 +166,11 @@ class RoomFlowNode(
         currentMembershipFlow.onEach { (previousMembership, membership) ->
             Timber.d("Room membership: $membership")
             if (membership == CurrentUserMembership.JOINED) {
+                val currentNavTarget = backstack.active?.key?.navTarget
+                if (currentNavTarget is NavTarget.JoinedRoom && currentNavTarget.roomId == roomId) {
+                    Timber.d("Already in JoinedRoom $roomId, do nothing")
+                    return@onEach
+                }
                 backstack.newRoot(NavTarget.JoinedRoom(roomId))
             } else {
                 val leavingFromCurrentDevice =
@@ -163,7 +185,7 @@ class RoomFlowNode(
                         NavTarget.JoinRoom(
                             roomId = roomId,
                             serverNames = serverNames,
-                            trigger = inputs.trigger.getOrNull() ?: JoinedRoom.Trigger.Invite,
+                            trigger = inputs.trigger.getOrNull() ?: JoinedRoomAnalyticsEvent.Trigger.Invite,
                         )
                     )
                 }
@@ -209,7 +231,8 @@ class RoomFlowNode(
                 val roomFlowNodeCallback = plugins<JoinedRoomLoadedFlowNode.Callback>()
                 val inputs = JoinedRoomFlowNode.Inputs(
                     roomId = navTarget.roomId,
-                    initialElement = inputs.initialElement
+                    initialElement = inputs.initialElement,
+                    joinedRoom = navTarget.joinedRoom,
                 )
                 createNode<JoinedRoomFlowNode>(buildContext, plugins = listOf(inputs) + roomFlowNodeCallback)
             }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt
index 93403371c9..aac916ab9d 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt
@@ -10,12 +10,15 @@ package io.element.android.appnav.room
 
 import android.os.Parcelable
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 sealed interface RoomNavigationTarget : Parcelable {
     @Parcelize
     data class Root(
         val eventId: EventId? = null,
+        @IgnoredOnParcel val joinedRoom: JoinedRoom? = null,
     ) : RoomNavigationTarget
 
     @Parcelize
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
index 85710deffe..504bdfec58 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
@@ -38,6 +38,7 @@ import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.ThreadId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.ui.room.LoadingRoomState
 import io.element.android.libraries.matrix.ui.room.LoadingRoomStateFlowFactory
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -63,11 +64,12 @@ class JoinedRoomFlowNode(
     ) {
     data class Inputs(
         val roomId: RoomId,
+        val joinedRoom: JoinedRoom?,
         val initialElement: RoomNavigationTarget,
     ) : NodeInputs
 
     private val inputs: Inputs = inputs()
-    private val loadingRoomStateStateFlow = loadingRoomStateFlowFactory.create(lifecycleScope, inputs.roomId)
+    private val loadingRoomStateStateFlow = loadingRoomStateFlowFactory.create(lifecycleScope, inputs.roomId, inputs.joinedRoom)
 
     sealed interface NavTarget : Parcelable {
         @Parcelize
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt
index c8810dff92..14128ac33a 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt
@@ -23,6 +23,19 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class LoadingBaseRoomStateFlowFactoryTest {
+    @Test
+    fun `flow should emit only Loaded when we already pass a JoinedRoom`() = runTest {
+        val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID))
+        val matrixClient = FakeMatrixClient(A_SESSION_ID)
+        val flowFactory = LoadingRoomStateFlowFactory(matrixClient)
+        flowFactory
+            .create(lifecycleScope = this, roomId = A_ROOM_ID, joinedRoom = room)
+            .test {
+                assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loaded(room))
+                ensureAllEventsConsumed()
+            }
+    }
+
     @Test
     fun `flow should emit Loading and then Loaded when there is a room in cache`() = runTest {
         val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID))
@@ -31,7 +44,7 @@ class LoadingBaseRoomStateFlowFactoryTest {
         }
         val flowFactory = LoadingRoomStateFlowFactory(matrixClient)
         flowFactory
-            .create(this, A_ROOM_ID)
+            .create(lifecycleScope = this, roomId = A_ROOM_ID, joinedRoom = null)
             .test {
                 assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loading)
                 assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loaded(room))
@@ -45,7 +58,7 @@ class LoadingBaseRoomStateFlowFactoryTest {
         val matrixClient = FakeMatrixClient(A_SESSION_ID, roomListService = roomListService)
         val flowFactory = LoadingRoomStateFlowFactory(matrixClient)
         flowFactory
-            .create(this, A_ROOM_ID)
+            .create(lifecycleScope = this, roomId = A_ROOM_ID, joinedRoom = null)
             .test {
                 assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loading)
                 matrixClient.givenGetRoomResult(A_ROOM_ID, room)
@@ -60,7 +73,7 @@ class LoadingBaseRoomStateFlowFactoryTest {
         val matrixClient = FakeMatrixClient(A_SESSION_ID, roomListService = roomListService)
         val flowFactory = LoadingRoomStateFlowFactory(matrixClient)
         flowFactory
-            .create(this, A_ROOM_ID)
+            .create(lifecycleScope = this, roomId = A_ROOM_ID, joinedRoom = null)
             .test {
                 assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loading)
                 roomListService.postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1))
diff --git a/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt b/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt
index b3dd8f1ee1..71ee093985 100644
--- a/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt
+++ b/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt
@@ -13,6 +13,7 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 interface HomeEntryPoint : FeatureEntryPoint {
     fun createNode(
@@ -22,7 +23,7 @@ interface HomeEntryPoint : FeatureEntryPoint {
     ): Node
 
     interface Callback : Plugin {
-        fun navigateToRoom(roomId: RoomId)
+        fun navigateToRoom(roomId: RoomId, joinedRoom: JoinedRoom?)
         fun navigateToCreateRoom()
         fun navigateToSettings()
         fun navigateToSetUpRecovery()
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt
index 78e48fad79..d9f87e2edd 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt
@@ -14,6 +14,8 @@ import androidx.activity.compose.LocalActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
@@ -41,20 +43,33 @@ import io.element.android.features.logout.api.direct.DirectLogoutView
 import io.element.android.features.reportroom.api.ReportRoomEntryPoint
 import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesEntryPoint
 import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesListType
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.appyx.launchMolecule
 import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.deeplink.api.usecase.InviteFriendsUseCase
+import io.element.android.libraries.designsystem.components.ProgressDialog
+import io.element.android.libraries.designsystem.utils.DelayedVisibility
 import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.services.analytics.api.AnalyticsService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
+import timber.log.Timber
+import kotlin.coroutines.cancellation.CancellationException
+import kotlin.time.Duration.Companion.milliseconds
 
 @ContributesNode(SessionScope::class)
 @AssistedInject
@@ -71,6 +86,7 @@ class HomeFlowNode(
     private val declineInviteAndBlockUserEntryPoint: DeclineInviteAndBlockEntryPoint,
     private val changeRoomMemberRolesEntryPoint: ChangeRoomMemberRolesEntryPoint,
     private val leaveRoomRenderer: LeaveRoomRenderer,
+    @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
 ) : BaseFlowNode<HomeFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Root,
@@ -150,9 +166,58 @@ class HomeFlowNode(
         return node(buildContext) { modifier ->
             val state by stateFlow.collectAsState()
             val activity = requireNotNull(LocalActivity.current)
+
+            val loadingJoinedRoomJob = remember { mutableStateOf<AsyncData<Job>>(AsyncData.Uninitialized) }
+            if (loadingJoinedRoomJob.value.isLoading()) {
+                DelayedVisibility(duration = 400.milliseconds) {
+                    ProgressDialog(
+                        onDismissRequest = {
+                            loadingJoinedRoomJob.value.dataOrNull()?.cancel()
+                            loadingJoinedRoomJob.value = AsyncData.Uninitialized
+                        }
+                    )
+                }
+            }
+
+            fun navigateToRoom(
+                roomId: RoomId,
+            ) {
+                if (!loadingJoinedRoomJob.value.isUninitialized()) {
+                    Timber.w("Already loading a room, ignoring navigateToRoom for $roomId")
+                    return
+                }
+
+                val job = sessionCoroutineScope.launch {
+                    runCatchingExceptions {
+                        matrixClient.getJoinedRoom(roomId)
+                    }.fold(
+                        onSuccess = { joinedRoom ->
+                            if (isActive) {
+                                callback.navigateToRoom(roomId, joinedRoom)
+                                loadingJoinedRoomJob.value = AsyncData.Success(coroutineContext.job)
+                                // Wait a bit before resetting the state to avoid allowing to open several rooms
+                                delay(200.milliseconds)
+                                loadingJoinedRoomJob.value = AsyncData.Uninitialized
+                            }
+                        },
+                        onFailure = {
+                            // If the operation wasn't cancelled, navigate without the room, using the room id
+                            if (it !is CancellationException) {
+                                callback.navigateToRoom(roomId, null)
+                            }
+                            loadingJoinedRoomJob.value = AsyncData.Failure(error = it, prevData = coroutineContext.job)
+                            // Wait a bit before resetting the state to avoid allowing to open several rooms
+                            delay(200.milliseconds)
+                            loadingJoinedRoomJob.value = AsyncData.Uninitialized
+                        }
+                    )
+                }
+                loadingJoinedRoomJob.value = AsyncData.Loading(job)
+            }
+
             HomeView(
                 homeState = state,
-                onRoomClick = callback::navigateToRoom,
+                onRoomClick = ::navigateToRoom,
                 onSettingsClick = callback::navigateToSettings,
                 onStartChatClick = callback::navigateToCreateRoom,
                 onSetUpRecoveryClick = callback::navigateToSetUpRecovery,
@@ -165,7 +230,7 @@ class HomeFlowNode(
                 acceptDeclineInviteView = {
                     acceptDeclineInviteView.Render(
                         state = state.roomListState.acceptDeclineInviteState,
-                        onAcceptInviteSuccess = callback::navigateToRoom,
+                        onAcceptInviteSuccess = ::navigateToRoom,
                         onDeclineInviteSuccess = { },
                         modifier = Modifier
                     )
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt
index ed6482b0e7..9778556dd2 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt
@@ -13,17 +13,19 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.home.api.HomeEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
+import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class DefaultHomeEntryPointTest {
     @Test
-    fun `test node builder`() {
+    fun `test node builder`() = runTest {
         val entryPoint = DefaultHomeEntryPoint()
         val parentNode = TestParentNode.create { buildContext, plugins ->
             HomeFlowNode(
@@ -39,10 +41,11 @@ class DefaultHomeEntryPointTest {
                 declineInviteAndBlockUserEntryPoint = { _, _, _ -> lambdaError() },
                 changeRoomMemberRolesEntryPoint = { _, _, _, _ -> lambdaError() },
                 leaveRoomRenderer = { _, _, _ -> lambdaError() },
+                sessionCoroutineScope = backgroundScope,
             )
         }
         val callback = object : HomeEntryPoint.Callback {
-            override fun navigateToRoom(roomId: RoomId) = lambdaError()
+            override fun navigateToRoom(roomId: RoomId, joinedRoom: JoinedRoom?) = lambdaError()
             override fun navigateToCreateRoom() = lambdaError()
             override fun navigateToSettings() = lambdaError()
             override fun navigateToSetUpRecovery() = lambdaError()
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
index 7b8ff837c1..e44cac4f27 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -65,6 +65,7 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
@@ -261,6 +262,7 @@ class TimelinePresenter(
                 items
             }
                 .onEach(redactedVoiceMessageManager::onEachMatrixTimelineItem)
+                .flowOn(dispatchers.computation)
                 .launchIn(this)
         }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
index 5ff8e5d999..55498c150d 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
@@ -36,6 +36,7 @@ import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.DateDividerMode
 import org.matrix.rustcomponents.sdk.Membership
 import org.matrix.rustcomponents.sdk.Room
+import org.matrix.rustcomponents.sdk.RoomInfo
 import org.matrix.rustcomponents.sdk.TimelineConfiguration
 import org.matrix.rustcomponents.sdk.TimelineFilter
 import org.matrix.rustcomponents.sdk.TimelineFocus
@@ -60,7 +61,7 @@ class RustRoomFactory(
     private val roomInfoMapper: RoomInfoMapper,
     private val analyticsService: AnalyticsService,
 ) {
-    private val dispatcher = dispatchers.io.limitedParallelism(1)
+    private val dispatcher = dispatchers.computation.limitedParallelism(1)
     private val mutex = Mutex()
     private val isDestroyed: AtomicBoolean = AtomicBoolean(false)
 
@@ -86,24 +87,21 @@ class RustRoomFactory(
                 return@withContext null
             }
             val room = awaitRoomInRoomList(roomId) ?: return@withContext null
-            getBaseRoom(room)
+            getBaseRoom(sdkRoom = room, roomInfo = room.roomInfo())
         }
     }
 
-    private suspend fun getBaseRoom(sdkRoom: Room): RustBaseRoom {
-        val initialRoomInfo = sdkRoom.roomInfo()
-        return RustBaseRoom(
-            sessionId = sessionId,
-            deviceId = deviceId,
-            innerRoom = sdkRoom,
-            coroutineDispatchers = dispatchers,
-            roomSyncSubscriber = roomSyncSubscriber,
-            roomMembershipObserver = roomMembershipObserver,
-            roomInfoMapper = roomInfoMapper,
-            initialRoomInfo = roomInfoMapper.map(initialRoomInfo),
-            sessionCoroutineScope = sessionCoroutineScope,
-        )
-    }
+    private fun getBaseRoom(sdkRoom: Room, roomInfo: RoomInfo) = RustBaseRoom(
+        sessionId = sessionId,
+        deviceId = deviceId,
+        innerRoom = sdkRoom,
+        coroutineDispatchers = dispatchers,
+        roomSyncSubscriber = roomSyncSubscriber,
+        roomMembershipObserver = roomMembershipObserver,
+        roomInfoMapper = roomInfoMapper,
+        initialRoomInfo = roomInfoMapper.map(roomInfo),
+        sessionCoroutineScope = sessionCoroutineScope,
+    )
 
     suspend fun getJoinedRoomOrPreview(roomId: RoomId, serverNames: List<String>): GetRoomResult? = withContext(dispatcher) {
         mutex.withLock {
@@ -113,10 +111,11 @@ class RustRoomFactory(
             }
 
             val sdkRoom = awaitRoomInRoomList(roomId) ?: return@withLock null
+            val roomInfo = sdkRoom.roomInfo()
 
             val parentTransaction = analyticsService.getLongRunningTransaction(AnalyticsLongRunningTransaction.OpenRoom)
 
-            if (sdkRoom.membership() == Membership.JOINED) {
+            if (roomInfo.membership == Membership.JOINED) {
                 analyticsService.recordTransaction(
                     name = "Get joined room",
                     operation = "RustRoomFactory.getJoinedRoomOrPreview",
@@ -140,10 +139,9 @@ class RustRoomFactory(
                         )
                     }
 
-                    val baseRoom = transaction.recordChildTransaction(operation = "getBaseRoom", description = "Get room from SDK") { getBaseRoom(sdkRoom) }
                     GetRoomResult.Joined(
                         JoinedRustRoom(
-                            baseRoom = baseRoom,
+                            baseRoom = getBaseRoom(sdkRoom, roomInfo),
                             notificationSettingsService = notificationSettingsService,
                             roomContentForwarder = roomContentForwarder,
                             liveInnerTimeline = timeline,
@@ -169,7 +167,7 @@ class RustRoomFactory(
                     GetRoomResult.NotJoined(
                         NotJoinedRustRoom(
                             sessionId = sessionId,
-                            localRoom = getBaseRoom(sdkRoom),
+                            localRoom = getBaseRoom(sdkRoom, roomInfo),
                             previewInfo = RoomPreviewInfoMapper.map(preview.info()),
                         )
                     )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt
index 0b7c16b3a0..cbbe79b480 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt
@@ -16,6 +16,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asFlow
@@ -39,16 +40,21 @@ open class LoadingRoomStateProvider : PreviewParameterProvider<LoadingRoomState>
 
 @Inject
 class LoadingRoomStateFlowFactory(private val matrixClient: MatrixClient) {
-    fun create(lifecycleScope: CoroutineScope, roomId: RoomId): StateFlow<LoadingRoomState> =
-        getJoinedRoomFlow(roomId)
-            .map { room ->
-                if (room != null) {
-                    LoadingRoomState.Loaded(room)
-                } else {
-                    LoadingRoomState.Error
+    fun create(lifecycleScope: CoroutineScope, roomId: RoomId, joinedRoom: JoinedRoom?): StateFlow<LoadingRoomState> {
+        return if (joinedRoom != null) {
+            MutableStateFlow<LoadingRoomState>(LoadingRoomState.Loaded(joinedRoom))
+        } else {
+            getJoinedRoomFlow(roomId)
+                .map { room ->
+                    if (room != null) {
+                        LoadingRoomState.Loaded(room)
+                    } else {
+                        LoadingRoomState.Error
+                    }
                 }
-            }
-            .stateIn(lifecycleScope, SharingStarted.Eagerly, LoadingRoomState.Loading)
+                .stateIn(lifecycleScope, SharingStarted.Eagerly, LoadingRoomState.Loading)
+        }
+    }
 
     private fun getJoinedRoomFlow(roomId: RoomId): Flow<JoinedRoom?> = suspend {
         matrixClient.getJoinedRoom(roomId = roomId)
diff --git a/tests/uitests/build.gradle.kts b/tests/uitests/build.gradle.kts
index ea43284476..53876b0c8c 100644
--- a/tests/uitests/build.gradle.kts
+++ b/tests/uitests/build.gradle.kts
@@ -20,6 +20,11 @@ android {
     namespace = "ui"
 }
 
+tasks.withType(Test::class.java) {
+    // Don't fail the test run if there are no tests, this can happen if we run them with screenshot test disabled
+    failOnNoDiscoveredTests = false
+}
+
 dependencies {
     // Paparazzi 1.3.2 workaround (see https://github.com/cashapp/paparazzi/blob/master/CHANGELOG.md#132---2024-01-13)
     constraints.add("testImplementation", "com.google.guava:guava") {

From 011378aa76ac430f6b047fc5c14945060bdd11ed Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Dec 2025 16:51:23 +0100
Subject: [PATCH 103/113] Update API of RoomLatestEventFormatter.

---
 .../RoomListRoomSummaryFactoryTest.kt         |  5 ++-
 .../api/RoomLatestEventFormatter.kt           |  5 ++-
 .../impl/DefaultRoomLatestEventFormatter.kt   | 40 ++++++++++---------
 .../DefaultRoomLatestEventFormatterTest.kt    |  2 +-
 .../test/FakeRoomLatestEventFormatter.kt      |  6 ++-
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt
index 941f889f69..5f307918be 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt
@@ -11,11 +11,12 @@ package io.element.android.features.home.impl.datasource
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
 import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
+import io.element.android.libraries.eventformatter.test.FakeRoomLatestEventFormatter
 
 fun aRoomListRoomSummaryFactory(
     dateFormatter: DateFormatter = FakeDateFormatter { _, _, _ -> "Today" },
-    roomLatestEventFormatter: RoomLatestEventFormatter = RoomLatestEventFormatter { _, _ -> "Hey" }
+    roomLatestEventFormatter: RoomLatestEventFormatter = FakeRoomLatestEventFormatter(),
 ) = RoomListRoomSummaryFactory(
     dateFormatter = dateFormatter,
-    roomLatestEventFormatter = roomLatestEventFormatter
+    roomLatestEventFormatter = roomLatestEventFormatter,
 )
diff --git a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLatestEventFormatter.kt b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLatestEventFormatter.kt
index 5eb7713b54..abb5cc929d 100644
--- a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLatestEventFormatter.kt
+++ b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLatestEventFormatter.kt
@@ -10,6 +10,7 @@ package io.element.android.libraries.eventformatter.api
 
 import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 
-fun interface RoomLatestEventFormatter {
-    fun format(latestEvent: LatestEventValue, isDmRoom: Boolean): CharSequence?
+interface RoomLatestEventFormatter {
+    fun format(latestEvent: LatestEventValue.Local, isDmRoom: Boolean): CharSequence?
+    fun format(latestEvent: LatestEventValue.Remote, isDmRoom: Boolean): CharSequence?
 }
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
index 48b8c83bc6..7e1ffc3ee6 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
@@ -59,25 +59,27 @@ class DefaultRoomLatestEventFormatter(
         private const val MAX_SAFE_LENGTH = 500
     }
 
-    override fun format(latestEvent: LatestEventValue, isDmRoom: Boolean): CharSequence? {
-        return when (latestEvent) {
-            LatestEventValue.None -> null
-            is LatestEventValue.Local -> formatContent(
-                content = latestEvent.content,
-                isDmRoom = isDmRoom,
-                isOutgoing = true,
-                senderId = latestEvent.senderId,
-                senderDisambiguatedDisplayName = latestEvent.senderProfile.getDisambiguatedDisplayName(latestEvent.senderId)
-            )
-            is LatestEventValue.Remote -> formatContent(
-                content = latestEvent.content,
-                isDmRoom = isDmRoom,
-                isOutgoing = latestEvent.isOwn,
-                senderId = latestEvent.senderId,
-                senderDisambiguatedDisplayName = latestEvent.senderProfile.getDisambiguatedDisplayName(latestEvent.senderId)
-            )
-        }
-    }
+    override fun format(
+        latestEvent: LatestEventValue.Local,
+        isDmRoom: Boolean,
+    ): CharSequence? = formatContent(
+        content = latestEvent.content,
+        isDmRoom = isDmRoom,
+        isOutgoing = true,
+        senderId = latestEvent.senderId,
+        senderDisambiguatedDisplayName = latestEvent.senderProfile.getDisambiguatedDisplayName(latestEvent.senderId)
+    )
+
+    override fun format(
+        latestEvent: LatestEventValue.Remote,
+        isDmRoom: Boolean,
+    ): CharSequence? = formatContent(
+        content = latestEvent.content,
+        isDmRoom = isDmRoom,
+        isOutgoing = latestEvent.isOwn,
+        senderId = latestEvent.senderId,
+        senderDisambiguatedDisplayName = latestEvent.senderProfile.getDisambiguatedDisplayName(latestEvent.senderId)
+    )
 
     private fun formatContent(
         content: EventContent,
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
index 96d341f447..c06b79ead9 100644
--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
@@ -929,7 +929,7 @@ class DefaultRoomLatestEventFormatterTest {
         sentByYou: Boolean,
         senderDisplayName: String?,
         content: EventContent,
-    ): LatestEventValue {
+    ): LatestEventValue.Remote {
         val sender = if (sentByYou) A_USER_ID else someoneElseId
         val profile = aProfileDetails(senderDisplayName)
         return aRemoteLatestEvent(
diff --git a/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLatestEventFormatter.kt b/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLatestEventFormatter.kt
index d82128b2d3..5e1a056a6c 100644
--- a/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLatestEventFormatter.kt
+++ b/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLatestEventFormatter.kt
@@ -14,7 +14,11 @@ import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 class FakeRoomLatestEventFormatter : RoomLatestEventFormatter {
     private var result: CharSequence? = null
 
-    override fun format(latestEvent: LatestEventValue, isDmRoom: Boolean): CharSequence? {
+    override fun format(latestEvent: LatestEventValue.Local, isDmRoom: Boolean): CharSequence? {
+        return result
+    }
+
+    override fun format(latestEvent: LatestEventValue.Remote, isDmRoom: Boolean): CharSequence? {
         return result
     }
 

From 43de65a61201b2e149d8c3b41980da09c6892847 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Dec 2025 16:54:50 +0100
Subject: [PATCH 104/113] Rename LatestEvent.Regular to LatestEvent.Synced

---
 .../impl/datasource/RoomListRoomSummaryFactory.kt    |  2 +-
 .../android/features/home/impl/model/LatestEvent.kt  |  4 ++--
 .../home/impl/model/RoomListRoomSummaryProvider.kt   | 12 ++++++------
 .../home/impl/roomlist/RoomListStateProvider.kt      |  6 +++---
 .../home/impl/model/RoomListBaseRoomSummaryTest.kt   |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
index 14121516d6..0200f495ef 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
@@ -91,7 +91,7 @@ class RoomListRoomSummaryFactory(
             }
             is LatestEventValue.Remote -> {
                 val content = roomLatestEventFormatter.format(latestEvent, dm).orEmpty()
-                LatestEvent.Regular(
+                LatestEvent.Synced(
                     content = content,
                 )
             }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt
index 6a268e8284..d6ddcf258c 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt
@@ -13,7 +13,7 @@ import androidx.compose.runtime.Immutable
 sealed interface LatestEvent {
     data object None : LatestEvent
 
-    data class Regular(
+    data class Synced(
         val content: CharSequence?,
     ) : LatestEvent
 
@@ -26,7 +26,7 @@ sealed interface LatestEvent {
     fun content(): CharSequence? {
         return when (this) {
             is None -> null
-            is Regular -> content
+            is Synced -> content
             is Sending -> content
             is Error -> null
         }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
index 65c70f98ed..400decff6f 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
@@ -28,7 +28,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                 aRoomListRoomSummary(latestEvent = LatestEvent.None),
                 aRoomListRoomSummary(
                     name = "A very long room name that should be truncated",
-                    latestEvent = LatestEvent.Regular(
+                    latestEvent = LatestEvent.Synced(
                         "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt" +
                             " ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea com" +
                             "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur."
@@ -46,7 +46,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     listOf(
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            latestEvent = LatestEvent.Regular("No activity" + if (hasCall) ", call" else ""),
+                            latestEvent = LatestEvent.Synced("No activity" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 0,
                             numberOfUnreadMentions = 0,
@@ -54,7 +54,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                         ),
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            latestEvent = LatestEvent.Regular("New messages" + if (hasCall) ", call" else ""),
+                            latestEvent = LatestEvent.Synced("New messages" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 1,
                             numberOfUnreadMentions = 0,
@@ -62,7 +62,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                         ),
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            latestEvent = LatestEvent.Regular("New messages, mentions" + if (hasCall) ", call" else ""),
+                            latestEvent = LatestEvent.Synced("New messages, mentions" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 1,
                             numberOfUnreadMentions = 1,
@@ -70,7 +70,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                         ),
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            latestEvent = LatestEvent.Regular("New mentions" + if (hasCall) ", call" else ""),
+                            latestEvent = LatestEvent.Synced("New mentions" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 0,
                             numberOfUnreadMentions = 1,
@@ -154,7 +154,7 @@ internal fun aRoomListRoomSummary(
     numberOfUnreadMentions: Long = 0,
     numberOfUnreadNotifications: Long = 0,
     isMarkedUnread: Boolean = false,
-    latestEvent: LatestEvent = LatestEvent.Regular("Last message"),
+    latestEvent: LatestEvent = LatestEvent.Synced("Last message"),
     timestamp: String? = latestEvent.takeIf { it !is LatestEvent.None }?.let { "88:88" },
     notificationMode: RoomNotificationMode? = null,
     hasRoomCall: Boolean = false,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt
index b0cc0a4809..188f4468de 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt
@@ -89,7 +89,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
             name = "Room",
             numberOfUnreadMessages = 1,
             timestamp = "14:18",
-            latestEvent = LatestEvent.Regular("A very very very very long message which suites on two lines"),
+            latestEvent = LatestEvent.Synced("A very very very very long message which suites on two lines"),
             avatarData = AvatarData("!id", "R", size = AvatarSize.RoomListItem),
             id = "!roomId:domain",
         ),
@@ -97,7 +97,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
             name = "Room#2",
             numberOfUnreadMessages = 0,
             timestamp = "14:16",
-            latestEvent = LatestEvent.Regular("A short message"),
+            latestEvent = LatestEvent.Synced("A short message"),
             avatarData = AvatarData("!id", "Z", size = AvatarSize.RoomListItem),
             id = "!roomId2:domain",
         ),
@@ -120,7 +120,7 @@ internal fun generateRoomListRoomSummaryList(
             name = "Room#$index",
             numberOfUnreadMessages = 0,
             timestamp = "14:16",
-            latestEvent = LatestEvent.Regular("A message"),
+            latestEvent = LatestEvent.Synced("A message"),
             avatarData = AvatarData("!id$index", "${(65 + index % 26).toChar()}", size = AvatarSize.RoomListItem),
             id = "!roomId$index:domain",
         )
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
index 0a5350d086..28e7051a55 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
@@ -96,7 +96,7 @@ internal fun createRoomListRoomSummary(
     numberOfUnreadNotifications = numberOfUnreadNotifications,
     isMarkedUnread = isMarkedUnread,
     timestamp = timestamp,
-    latestEvent = LatestEvent.Regular(""),
+    latestEvent = LatestEvent.Synced(""),
     avatarData = AvatarData(id = A_ROOM_ID.value, name = A_ROOM_NAME, size = AvatarSize.RoomListItem),
     displayType = displayType,
     userDefinedNotificationMode = userDefinedNotificationMode,

From 6874d29532ee6eac304290df24ab89fd722cf5f9 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 2 Dec 2025 17:03:56 +0100
Subject: [PATCH 105/113] fix(security&privacy): update string resources

---
 .../securityandprivacy/impl/root/SecurityAndPrivacyView.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
index 32674ef34f..30e93ecb58 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
@@ -214,7 +214,7 @@ private fun RoomAccessSection(
         if (saved == SecurityAndPrivacyRoomAccess.SpaceMember) {
             ListItem(
                 headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_title)) },
-                supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_description)) },
+                supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_unavailable_description)) },
                 trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.SpaceMember, enabled = false),
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Workspace())),
                 enabled = false,
@@ -280,7 +280,7 @@ private fun RoomAddressSection(
                 Text(text = roomAddress ?: stringResource(R.string.screen_security_and_privacy_add_room_address_action))
             },
             trailingContent = if (roomAddress.isNullOrEmpty()) ListItemContent.Icon(IconSource.Vector(CompoundIcons.Plus())) else null,
-            supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_address_description)) },
+            supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_address_section_footer)) },
             onClick = onRoomAddressClick,
             colors = ListItemDefaults.colors(trailingIconColor = ElementTheme.colors.iconAccentPrimary),
         )

From 78439c17aba0e7073864648eacae7ae8845977c2 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <angel.arasthel@gmail.com>
Date: Tue, 2 Dec 2025 16:42:05 +0100
Subject: [PATCH 106/113] Revert "fix(deps): update dependency
 com.posthog:posthog-android to v3.27.0"

This reverts commit eedaeb6b3547a6811cd2bd3d2e48cc6fa56282c4.
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 95b431d67d..1a8ebd36a2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -216,7 +216,7 @@ haze_materials = { module = "dev.chrisbanes.haze:haze-materials", version.ref =
 color_picker = "io.mhssn:colorpicker:1.0.0"
 
 # Analytics
-posthog = "com.posthog:posthog-android:3.27.0"
+posthog = "com.posthog:posthog-android:3.26.0"
 sentry = "io.sentry:sentry-android:8.27.1"
 # main branch can be tested replacing the version with main-SNAPSHOT
 matrix_analytics_events = "com.github.matrix-org:matrix-analytics-events:0.29.2"

From c9bd8ec0bd04b4f02ac9e080611626c338fcd998 Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Tue, 2 Dec 2025 16:18:44 +0000
Subject: [PATCH 107/113] Update screenshots

---
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png | 4 ++--
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png | 4 ++--
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png | 4 ++--
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png | 4 ++--
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png | 4 ++--
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png | 4 ++--
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png | 4 ++--
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png | 4 ++--
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png | 4 ++--
 ...tyandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png | 4 ++--
 ...andprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png | 4 ++--
 ...andprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png | 4 ++--
 ...andprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png | 4 ++--
 ...andprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png | 4 ++--
 ...andprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png | 4 ++--
 ...andprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png | 4 ++--
 ...andprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png | 4 ++--
 ...andprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png | 4 ++--
 ...andprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png | 4 ++--
 ...andprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png | 4 ++--
 ...yandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png | 4 ++--
 40 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png
index ae15fd2efd..a52b20decc 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59cfdfa8b68af10024d8650b680481a37b5717d981999adce49a0e62d55e433f
-size 38619
+oid sha256:71acb17375db16b8777221e3a09c85ce821920dfaf7853c456493371e4778b9d
+size 37050
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png
index 9ac055352b..5015b5c995 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9c5983ff1143ef6c517dc948b9b60102607ff397748e8d87f3b565ab86efc4b
-size 46360
+oid sha256:bef6e6c4cdd362577cf5dc91914a84c72465014a71a08f48c1f4a526be44c85c
+size 39535
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png
index d5640cc559..fbef6afae3 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64d0aecdae4cd8c7581ded462d8534620cd006a78a089a4333c1608e8023ead1
-size 46768
+oid sha256:39222fd299a2dec3cc60863878906eba5c9d86100a3e4bad781633a1a0372cc5
+size 39874
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png
index 52e6f29adb..8abe7a325a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4230969f15739f418eebe1d4a14e895c84bbe5bdbf832ccc60ae4bfafea0839
-size 19751
+oid sha256:5c9bf91f57bb68ae3341acecd62d418d1654a8d4cf271eeda9e87bc5e4998891
+size 20225
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png
index 6f9172af47..3989ce8d6e 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4eb56b2db5b843d94f89c60baea02809d43733b718c59f0d06c1cee7ad4db9a7
-size 47036
+oid sha256:495fff852c9549125b3d3a681a880147f680d4604eee3cb13a8fc3dc47e7c729
+size 40476
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png
index d5640cc559..fbef6afae3 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64d0aecdae4cd8c7581ded462d8534620cd006a78a089a4333c1608e8023ead1
-size 46768
+oid sha256:39222fd299a2dec3cc60863878906eba5c9d86100a3e4bad781633a1a0372cc5
+size 39874
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png
index f367faca6b..8bb18a4153 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3f5880e027ca7f380d24144efe8de3a222e359f5bf2e700f5af701dbe5d9bec
-size 47145
+oid sha256:cdd805d857d590437bde9be2a7df252ff42571d3b08be8085aae81dc75e896c3
+size 40235
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png
index ef258a39e6..e8b0f4f2a3 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6895ffbb2c5b10705135ca748d7bfb243c19c250d5f9a5fa3cedf3f83baba0c
-size 33097
+oid sha256:b03d25813c75712a0b9e23622132bd63e07ca9ec593a1842dacf751347c06ea1
+size 32023
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png
index c883064bb0..16b13d8a4f 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2701337aad7fcdd419770718dc57c3ff6a1567cf23420624471a23120a3b9f8d
-size 31593
+oid sha256:3aaf6da43b5f2882da986ae766d0057421b1f39f7f0bb467bd32f2a957608045
+size 31478
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png
index d24af812f5..e8e5a2019d 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ced07a8e45e02c9fef27fa7bdbe969a26c73c850672d7b7167c58ff09cd9ed78
-size 32927
+oid sha256:4b1ce86ad21d9ccd5b170a1628985eadbc5ac92be521ab55e9a1b22eb48c1476
+size 32552
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png
index a1c720f7c3..82cba49c78 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f91b888b3948956f57a3d4a94ebea36e5da6c39d606170e3bb748e9caca70127
-size 41892
+oid sha256:5343bc348bc1be7430243ce6fceeb7c81bbf2d5692486733221cb6c615d9aeea
+size 41544
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png
index 5b752d5035..53e3694e7b 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4bda58361cf1c8dd39d634203038ab7c8ac130df1aa465fb9dfb37a439b1c72
-size 59877
+oid sha256:9cf6cd1f914a4f31608edceefde79632ebed0c8983d83d8a63c4408bcc2d4ff3
+size 56743
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png
index 22f6338462..aa9712b151 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3b390cabae48e7f5487737b89d2d9e7a18f538a4601a0b262fc205954ef70a3
-size 59439
+oid sha256:00a667f59cd097021a6d363d0e4f578cba6acc405aaaa74bddfa9a3286cfd26e
+size 56408
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png
index a28746d476..680b550efa 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ec795cb5ffcb06e29be3a59dd95d88232f518bae66f96c05f1b75197cefdbf3
-size 59992
+oid sha256:5bdcf84378968b8e37cc50a300ff19b1917354de764a9f81448e6ca3d4050386
+size 54711
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png
index 2781d8a337..d2603fba50 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d213f421daa486febb24033e0d3928b47e6380e21889636d6b51550ee66b99b8
-size 36843
+oid sha256:577eac69d32648070d896788474104fdf143c040e058f182d6b832e5ea83fad8
+size 37242
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png
index 1a79cae3e1..cad3e46f71 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c604f0a5f6003f51da4dadff3a01080b54ff2f2e34a4a4a9d2fbf0e5fac20221
-size 60117
+oid sha256:745a270883c79932fdde14d11785d9e27d1ec0eee03999af5e494b5c6e30c309
+size 57329
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png
index 2393e0a15b..f918b5ff28 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67e064c056d4559c3ab183015f47aed82360c0a9846170ec95f83089c22c22a2
-size 59864
+oid sha256:451eee79c5ca4b61902044c58f99069065fcd11a9fa7d469d2568cd20ea134a3
+size 56743
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png
index 2dd0307a7a..7f77181ea9 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea71f66e3a2e1b3e513c806875d59088a33a4dedcd198b409ef3ec1c6bab59ed
-size 60223
+oid sha256:023b2870f5a4291ad8b521dc177db22972a47e5e965458c81cb8688da0cbe6b8
+size 57097
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png
index 1e97e4c8f2..46ad8a30d5 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db47cd993b12896c3439c7f4c9bddde833c5048a33f84b41aa15c48277cd53e9
-size 21577
+oid sha256:67bd76421dcb3e8a6c2c0a6aeda024dacb392b2f6d8bea278d6ffae7de5b4e8f
+size 20023
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png
index 169f1ad8f9..6b5c72706b 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83a1ff18c075d93b625ab55d2c54a767612b2af278ec6e5d1ebd9a509647c809
-size 46782
+oid sha256:48f50c8053f0f15228899e8bce1656a90cfaf936e6bc8ca725c676aff5578575
+size 39874
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png
index 41d20622ba..80b8aeb70e 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49bf2a919952035933e6d658076a845845f51fd33c2a3c21cc1f1e332ee95825
-size 40258
+oid sha256:1463d9c6b2d968c0a5f375e5135b31e31b32f2d35525e0be1c264d90ff4e723c
+size 38652
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png
index ecced7e27f..da192161cb 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:808934308408e850551bc3103cee5a37d85d106adf567105003b0144651ca408
-size 47683
+oid sha256:342cc313605f43325a0720fe9c9fa969ed7edd41258ce0768dc624fc4e74d66d
+size 40636
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png
index e2a98e5f81..4ddc1b913d 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbf2bff6460019434e1af725763ef775240b832b947d7faea760ae08b31a1815
-size 48101
+oid sha256:adfd4213ac36d904a8a31b1c3bf5463ba72ad4760d084a4c412370d6d51cf250
+size 40996
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png
index 59c10f26e9..32138581f7 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7064846fe9af8d99fc1bf40ce410149a9b52cffab7b7d54b4383aace6689933e
-size 20358
+oid sha256:4ef8e92812f6b65fc09ea4e77d44f9c32a74daebe8e2ef2a9e499588e46a43db
+size 20823
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png
index ae17ccb1aa..d274eddbe1 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:805fdb8f857bdffe88caccd4f62bc1c2251a8119a51e865e3b7da9b9f6ff22b0
-size 48377
+oid sha256:5547eb8b7f7ca596edf65bfd7703d1cb91fbf2e254374b9ea41d5c8754030e34
+size 41628
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png
index e2a98e5f81..4ddc1b913d 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbf2bff6460019434e1af725763ef775240b832b947d7faea760ae08b31a1815
-size 48101
+oid sha256:adfd4213ac36d904a8a31b1c3bf5463ba72ad4760d084a4c412370d6d51cf250
+size 40996
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png
index a17602cc6d..e939df2248 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c121a184f66582bedf67ed73ec4740b3ce6984a264cfe04c241138bfa5d022a7
-size 48562
+oid sha256:40c6334e01cc858f343f9046cfbb5079b79369002f5194965b6c2e75dd37b134
+size 41437
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png
index c7b5337e1b..7458fc24fa 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11edb6109de15b857f90da338a0be8b5f1e202129fc3357ed3669ffc1edbf51a
-size 34662
+oid sha256:09a88867a2f10ce346df8d683d614970f9aad8e8ec7bf06bddf27352dc0e5476
+size 33520
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png
index a32249c2ad..eeac763a63 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f55c84fb18a3a60b1621125edc305c6245f1bd042724198bf505ca1b7c39231c
-size 33593
+oid sha256:81162b1f086e45797db0678eff6bc41ad35eb09a7ac436d540fd3b7e1feffbc6
+size 33534
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png
index 1129971ac4..6625789361 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d11da663b4512e76a74774da0b191dc4a72daa0edfcf68ab011469c73302ff0
-size 35017
+oid sha256:da39e0496083394c522d40ed4cc62edc614ddca54ccfb05d5b7c68cfb030960a
+size 34559
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png
index d68df083c4..af2072ede6 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:398a2bb2ea12547edcc0af04fe85c83c4ea19aeb4e385d6e5b81b6a2eef96006
-size 44007
+oid sha256:b0ce43031e71ffadc53388a66a9ceb66b1c9bb33014a912161ec6006a303050b
+size 43544
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png
index 9af2e30e19..c9a99e421a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:618d2b08a9eaf0a7e56403125c785937e7078bff435bcc76ecafd068921d8f2a
-size 61912
+oid sha256:a906ec0c412892a241eab241836d4238c1883ec1d27f27b8a012de75894fdaf7
+size 58785
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png
index 11df3bd052..4a47f17a41 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3d9c431a14e527cad513fc92a5081b0b4dc6ae5153d381456684eb06b88e1fe
-size 61491
+oid sha256:8e4ccb39f3024e3a98be3bc0f94ce769e412b891ed988dad4cf1457aab3cea72
+size 58442
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png
index 6e23df8b30..5176122680 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84aff9af3ac8512db3790f8c41cde10b0fcfdf29b7390ea48f460e4e21a3cbe4
-size 62146
+oid sha256:e8b10af4e5006f45e2fe738a3a8a589551378ee9106c09f10b9de81fdbf12e61
+size 56716
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png
index 8c60403815..db1c3dd777 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67467daa13b1a5d404686ddf94ea9a133f3546b43770b6d1e264782ae054f198
-size 38350
+oid sha256:bc82d2ab3bc9d73726bcc0cdc5dc27b628d00db330cfcc7a78f177af029a7803
+size 38810
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png
index 40ccd4d4fe..766e81c18a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0312b48791d6c0af66d25b01bc9f9f8f78dbf1808aafbf5251df3c6490e62e3a
-size 62171
+oid sha256:aef64f63cb176feea3ee1e48de98f7bf6ed104370f84e377c963a2f26ba0fa49
+size 59387
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png
index b9a696d0d2..55d3916eb4 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9b1fa55fd171af2eef1bd6cb874b0e542dd32332f56e21c430f3f7767d56d35
-size 61905
+oid sha256:e6f46d940ee39961ea128fc7fc607dd6156d827121def3516ef62ff5f617e249
+size 58785
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png
index 69b7b4374b..2c37ae11f9 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:958b45102cb3fcefd7461f86e1870ac44daf6c9f9b13583ba4f60106c20b6bab
-size 62349
+oid sha256:6ea58c892886c9de971fd22a5a72340775cb0f973cdfb697d7f517100ce8b65d
+size 59205
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png
index 7a45fa88bb..83f51a3be7 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e37f1f6e15cee552219e997aa8dd491e672d73e55900f3e2cbdeea08f1355373
-size 22125
+oid sha256:8303e863849a00c16f00850854e8d4d7ceaf3fb097c7b20fe349127d8ed3b082
+size 20651
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png
index 63616838a9..eea66871f9 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aeff0b99f3ca35b84735ad464c78f4b69ca6ba22bdc67eb4ef56268d04bbb859
-size 48109
+oid sha256:1626bffb649c204b0dcb1c92e7344d1b7f119b61ecac3c49840385f3a9a39515
+size 40998

From 213e7ed850dae67588893ac4516533b97c67e48e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 16:12:55 +0000
Subject: [PATCH 108/113] fix(deps): update dependency
 io.element.android:element-call-embedded to v0.16.3

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1a8ebd36a2..9e63c39535 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -229,7 +229,7 @@ sigpwned_emoji4j = "com.sigpwned:emoji4j-core:16.0.0"
 metro_runtime = { module = "dev.zacsweers.metro:runtime", version.ref = "metro" }
 
 # Element Call
-element_call_embedded = "io.element.android:element-call-embedded:0.16.1"
+element_call_embedded = "io.element.android:element-call-embedded:0.16.3"
 
 # Auto services
 google_autoservice = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }

From 9756d0a5cbeab409316c70054999ffd93dace6ed Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Tue, 2 Dec 2025 18:12:56 +0100
Subject: [PATCH 109/113] Upgrade the Rust SDK to `v25.12.2` (#5838)

* Upgrade the Rust SDK to `v25.12.2`
---
 gradle/libs.versions.toml                                      | 2 +-
 .../android/libraries/matrix/impl/room/JoinedRustRoom.kt       | 3 ++-
 .../android/libraries/matrix/impl/room/RustRoomFactory.kt      | 3 ++-
 .../matrix/impl/fixtures/factories/NotificationItem.kt         | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9e63c39535..b910cb9b96 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -177,7 +177,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
 # https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
 # All new features should not be implemented in the pull request that upgrades the version, developers should
 # only fix API breaks and may add some TODOs.
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.11.26"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.12.2"
 
 # Others
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
index 0af29e75b2..943b5ee1d5 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
@@ -77,6 +77,7 @@ import org.matrix.rustcomponents.sdk.getElementCallRequiredPermissions
 import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
 import uniffi.matrix_sdk.RoomPowerLevelChanges
+import uniffi.matrix_sdk_ui.TimelineReadReceiptTracking
 import kotlin.coroutines.cancellation.CancellationException
 import org.matrix.rustcomponents.sdk.IdentityStatusChange as RustIdentityStateChange
 import org.matrix.rustcomponents.sdk.KnockRequest as InnerKnockRequest
@@ -237,7 +238,7 @@ class JoinedRustRoom(
                     filter = filter,
                     internalIdPrefix = internalIdPrefix,
                     dateDividerMode = dateDividerMode,
-                    trackReadReceipts = trackReadReceipts,
+                    trackReadReceipts = if (trackReadReceipts) TimelineReadReceiptTracking.ALL_EVENTS else TimelineReadReceiptTracking.DISABLED,
                     reportUtds = true,
                 )
             ).let { innerTimeline ->
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
index 55498c150d..f184356f15 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
@@ -41,6 +41,7 @@ import org.matrix.rustcomponents.sdk.TimelineConfiguration
 import org.matrix.rustcomponents.sdk.TimelineFilter
 import org.matrix.rustcomponents.sdk.TimelineFocus
 import timber.log.Timber
+import uniffi.matrix_sdk_ui.TimelineReadReceiptTracking
 import java.util.concurrent.atomic.AtomicBoolean
 import org.matrix.rustcomponents.sdk.RoomListService as InnerRoomListService
 
@@ -133,7 +134,7 @@ class RustRoomFactory(
                                 filter = eventFilters?.let(TimelineFilter::EventTypeFilter) ?: TimelineFilter.All,
                                 internalIdPrefix = "live",
                                 dateDividerMode = DateDividerMode.DAILY,
-                                trackReadReceipts = true,
+                                trackReadReceipts = TimelineReadReceiptTracking.ALL_EVENTS,
                                 reportUtds = true,
                             )
                         )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt
index 639dd7b6ec..e5b77b249c 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt
@@ -64,6 +64,7 @@ fun aRustNotificationRoomInfo(
     isEncrypted: Boolean? = true,
     isDirect: Boolean = false,
     joinRule: JoinRule? = null,
+    isSpace: Boolean = false,
 ) = NotificationRoomInfo(
     displayName = displayName,
     avatarUrl = avatarUrl,
@@ -73,6 +74,7 @@ fun aRustNotificationRoomInfo(
     isEncrypted = isEncrypted,
     isDirect = isDirect,
     joinRule = joinRule,
+    isSpace = isSpace,
 )
 
 fun aRustNotificationEventTimeline(

From aaed75a3caa61b4ae5ccc722ed6ea680af11ef9e Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 2 Dec 2025 20:26:42 +0100
Subject: [PATCH 110/113] quality: fix ktlint

---
 .../securityandprivacy/impl/root/SecurityAndPrivacyView.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
index 30e93ecb58..ad75580031 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
@@ -52,6 +52,7 @@ import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableSet
+
 @Composable
 fun SecurityAndPrivacyView(
     state: SecurityAndPrivacyState,
@@ -214,7 +215,9 @@ private fun RoomAccessSection(
         if (saved == SecurityAndPrivacyRoomAccess.SpaceMember) {
             ListItem(
                 headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_title)) },
-                supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_unavailable_description)) },
+                supportingContent = {
+                    Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_unavailable_description))
+                },
                 trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.SpaceMember, enabled = false),
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Workspace())),
                 enabled = false,

From fc27accb94a320f8db2463bd9103d82ec4d8c20a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Dec 2025 09:52:10 +0100
Subject: [PATCH 111/113] Remove useless `derivedStateOf`

---
 .../components/LiveWaveformView.kt            | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt
index 5e4ad02bd6..d18b85c987 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt
@@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -51,27 +50,23 @@ fun LiveWaveformView(
     linePadding: Dp = 2.dp,
 ) {
     var canvasSize by remember { mutableStateOf(DpSize(0.dp, 0.dp)) }
-
     var parentWidth by remember { mutableIntStateOf(0) }
-
-    val waveformWidth by remember(levels.size, lineWidth, linePadding) {
-        derivedStateOf {
-            levels.size * (lineWidth.value + linePadding.value)
-        }
+    val waveformWidth = remember(levels.size, lineWidth, linePadding) {
+        levels.size * (lineWidth.value + linePadding.value)
     }
 
     Box(
         contentAlignment = Alignment.CenterEnd,
         modifier = modifier
-                .fillMaxWidth()
-                .height(waveFormHeight)
-                .onSizeChanged { parentWidth = it.width }
+            .fillMaxWidth()
+            .height(waveFormHeight)
+            .onSizeChanged { parentWidth = it.width }
     ) {
         Canvas(
             modifier = Modifier
-                    .width(Dp(waveformWidth))
-                    .graphicsLayer(alpha = DEFAULT_GRAPHICS_LAYER_ALPHA)
-                    .then(modifier)
+                .width(Dp(waveformWidth))
+                .graphicsLayer(alpha = DEFAULT_GRAPHICS_LAYER_ALPHA)
+                .then(modifier)
         ) {
             val width = min(waveformWidth, parentWidth.toFloat())
             canvasSize = DpSize(width.dp, size.height.toDp())

From dc442778f8f0de3145eda585343cc4e0c9214df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Wed, 3 Dec 2025 10:31:20 +0100
Subject: [PATCH 112/113] Setting version for the release 25.12.0

---
 plugins/src/main/kotlin/Versions.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt
index 863b3ec79f..f00099753c 100644
--- a/plugins/src/main/kotlin/Versions.kt
+++ b/plugins/src/main/kotlin/Versions.kt
@@ -39,13 +39,13 @@ private const val versionYear = 25
  * Month of the version on 2 digits. Value must be in [1,12].
  * Do not update this value. it is updated by the release script.
  */
-private const val versionMonth = 11
+private const val versionMonth = 12
 
 /**
  * Release number in the month. Value must be in [0,99].
  * Do not update this value. it is updated by the release script.
  */
-private const val versionReleaseNumber = 3
+private const val versionReleaseNumber = 0
 
 object Versions {
     /**

From 8578f83caa870633103b5502e1327558e70e0e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Wed, 3 Dec 2025 10:35:48 +0100
Subject: [PATCH 113/113] Adding fastlane file for version 25.12.0

---
 fastlane/metadata/android/en-US/changelogs/202512000.txt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/202512000.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/202512000.txt b/fastlane/metadata/android/en-US/changelogs/202512000.txt
new file mode 100644
index 0000000000..e287435043
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202512000.txt
@@ -0,0 +1,6 @@
+Main changes in this version: 
+- Improve the room security and privacy screens. 
+- Better room list sorting.
+- Fixed crashes when recording long voice messages.
+- Improved the UX when opening a room from the room list.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file