From 3458799a3b9a0bc35390a11eb96f6ee0a53b30a8 Mon Sep 17 00:00:00 2001 From: marlon-erler Date: Tue, 22 Sep 2026 23:36:03 +0200 Subject: [PATCH] improve handling of previous connections --- src/View/.chatPage.css.swp | Bin 20480 -> 0 bytes .../.connectionModal.tsx.swp} | Bin 16384 -> 12288 bytes src/View/chatPage.tsx | 77 +++++++++--------- .../Global/.connectionViewModel.ts.swp | Bin 0 -> 12288 bytes src/ViewModel/Global/connectionViewModel.ts | 5 ++ 5 files changed, 45 insertions(+), 37 deletions(-) delete mode 100644 src/View/.chatPage.css.swp rename src/View/{.chatPage.tsx.swp => Modals/.connectionModal.tsx.swp} (56%) create mode 100644 src/ViewModel/Global/.connectionViewModel.ts.swp diff --git a/src/View/.chatPage.css.swp b/src/View/.chatPage.css.swp deleted file mode 100644 index 7a6166dc2a87d6e8d804e02805e596798e454497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 zcmeI2dyE}b9mmI(zN8dFg~W(3bk%Oxox2aVwC+N!X*E(MApzgdmp=9 zH=3Aplh59r*Li%;@0|1d{pOYjci(ig{+`mH#^*9kd-m+N?+jMGUE6zurd6FtoSpaM z`W4fi@Wc7;zMBFE!pINIsy(oK=gm8B8rb32YT-Z_R0eiC_S8US!i;X=YN-;2^H!^F zPzopo7OFra8aK9HqFpyU6i@Y@4cF@HFTZ`EPpkWs0!jg;fKosypcGIFC!nLpp&Rn8t-vk#nz^iL%Bm5Lj z!gt|O_#%7(J`XY2sR&)A9M5;~7(q6-|ulLxY2p6Up5Z zwo{#mD8dYS4Wr_FQQ*5qa(2_07C-6Q}%NKvN+U9za5Ax%v%!Jt{FL#Es9Mz zmSua*${^M|FQnG2x;q#4YYXdC4QgD7;{Ub8L7)O+i`<3-}}if;y?y-7Dc zOYg0j)2Ts?Y-PANWj(K(mgRWW)T*jx-6-49lx=%P9;WznDx3X&SMb#?WviLCy#P_ncsB!GgC==V5Ih(*nMb@+lCp~raYe+ zy%5*Hh{a4As!!|Kxns#WRgR^Xx5^1vm`h3bjL^9YUEeL9?r!6m$foO5J;RCYTFAg) zV0O@caD^6nI#pubQoT4EAB%4(Eu)?bmOUjWSid&VrzZ{W*V70322#;FnRTJScwqFB zSZ8Q)b7k?h{$ll6wdn+Iwkuf*Ye8&oQsQ(1rPGI1Nnb$AQh|~drbiv+%6lN&c0gNG zm=Hr-1G_fHsluWwPo-;cawu9?&?l|8ODjsDW7%TLi$_JRc@+&WwB-VNVPzKPdZDTZubug3#h?H7( zp|EUjqgi`|F)pUPh zre@tPuJWR{x*?}Y(_(LQS?uGEXY;PTWn{Z->}s`iJ$u@6!n$kXPKeQ1v<)nQ&SI?6 zT_f4to0MFD^2Je?B`vmy`JU^1z5NyGrgZC<+&POoT-@i(ZVY?~;mF3`Ku&PN z3nRT>Y{-nQ--z^lAHK_QJWEWxVYynA&C1?t;5R%AXVmp^W(=_G+CoMV|9_15txVh~;(rQ@KWB*H{{X*)6L16$!V(K6nRQ1y{mKcw?=m z{SAH#55O)sPu%_noPk+53irY%;U2ghc7cfVZ-DFJU2rvsn13xSgFg}1{}En;AH$RI z1bhoz_%M73Hp2*P03EJ@SBUq22#>*WI0m;tAN0aTxC*X>b+8)#NzDH`{2oriQ}8uN za|MU^zX2Zyku&%xY=;ghthTe$urbC&JpIGAzhlbl8*@g(IIGEFjAC?pM9qQStQ zB6QFCp194Tqy@Dh4*(0H+w~*3M+IREse;YJajKwg+38^8p$NOsQ@bcQdtE{-F#?WP zZy zaw0cQf5?iK^LcLjKdqve49I6kA);G& zOP8RiMC+0?LaF>xtOoOrZ*!g5D7U<_NK@Hjc-rQ;lL0CWTw7I}U*dGRrLYutxl2ml z;f}aT%?m<1JrK7bEV|M>?!S*?Lj(%t@yjr*-Aa zp)g-QvefV5lfqd=?Oxw)V-{y?Twx<`ozqFT+uDpUra3!8JZ4i9yg)IiwqlR!o-f`b zjm7c*FNmir#MvVLPk-Nkp1A&Ln1%f?1JfYh_iuv@uo_mv3OG%C{~SC4Uxp*_5L7_C z*YAama4DRlu2b+5JPt?TAvg$eJC@!FRV69~lmbctrGQdEDWDWk3Md7X0!o4Zh5{lU rQ$J!=KVr>)wVTKIEg7LWJWqc?ngsc+_e5sEPv6?5N-iwxLaO24fHKP1 diff --git a/src/View/.chatPage.tsx.swp b/src/View/Modals/.connectionModal.tsx.swp similarity index 56% rename from src/View/.chatPage.tsx.swp rename to src/View/Modals/.connectionModal.tsx.swp index 6727117ddb89fd2f6d5885c2c76fd795b559a44c..388ae278ae8fa70ef64d43f372484c94df4a993b 100644 GIT binary patch literal 12288 zcmeI2O^X~w7{@D;L=%mQBA$fG2w^v7r(?Y6q-P}A#ke60>gs~V9BR62XF6NmHFVX? zZdgV^5WGbZ!IyjkL17iaiz15P#Sf6H5c~ihJ@~JFneLwH**SPps@dOmPu0^;J@tQ{ zs!7=Dp5I#Epf5Df6I_oHGW_e{=2!G7a_2H3y+E7Rg_n>X6Md-`S-%5^j?yw_J??C+ zZLF<3t1=9gqhin53iz(GA$=y46|f3e1^#ym=)n>4E@pLKHnXeQ{m9fk z`)F@g0jq#jz$#!BunJfOtO8a6tAJI&Dqt0`3j7BZU_K!$#|R0JBY6D%KmY&#-A4%d z1Z;w1;3)XxVM2ZaAA{TAC9nb-;3)X*6d^x?AHWCTO>hMq2j4$L$Q|$z_z*;36Li2? za1z{mkdW`dXW%Wc44wohz}=IC{0zPZJK$~bD!2;PfeRe)1o-^~A-{kF@CA4e^ucNH z=L6^m--2(z=inxI5&V5WA-{qz!ELY$o&oou%>nonybne|0;8D#_Oc3C1*`&AfdvYT z3B|R1F}ayX*YSf8iQqy#gE&Q!Cx3+r6KJPKrE(lMW3^tgQL0 z4p+!nHH!%+IeM8hUjz}a9V~ZyNCi!~o9kx3w#TiTj5}K*Mvr3F#ghq8%U)0LmW2NG zl^LkbzT6F>9!jEo+_EZGmY&d@%q)_UB*Kgmb3KeBx|C*RTrBOtx%+>~J-E1QNVcw?$NiOu{GTcioj2PP$868v22} z#=2aPI^%y)Ff0z(iZGtr)hU~CvRwOtVqL+p+&mUVQfG;+Ce+whw=9$VS(_~JgE$CT ze5**kc|Y6wh4;wLs~0&BLsWjLWHHA3BQZtgEKV=y{^j zQ^nZvvw&&4O>*z~z0O%+woW4z_nRXoh8!82NRrm;BW-mOiIr;=LL^wkZQwY@I0?}3^{wLOfIL)VFxW~P`)T5D4)EmN*V zm5#B0q|v95Pkl$M=HE80Yz|4_Ce@Q3H+9m%G?z#|U=}TMHQ5_l6t86a)TA*Vy7WzM z>`EWc5xzH&v8I#R6>gH99x4W5Vo`KV{L}4NhP2UaI{2BiI#-13GEq9GKIv*)EWDMX vSmdW#7VlF5pPs8dTUH0g6 literal 16384 zcmeI2UyKt)9LLB1oCqqQ!3WG*g1IBy7Q{p>Z556LF`Pj_5@X0Y-JNUK+wPt_)8j79 ziLd%#B0flbF}xUK1c~thUgW{(lQBMFB;tdKCTe`s#25{Jf7{*e?%lRM@JNW6O+MXr zc7DJ4&39&}{Y|&F^~k<)<8gBuCkF0$KsBfL1^&pcT*xXa%$a{{sco^v&!z`f+pA7ZIIr zT5!H4`n;(}y{K59v;tZIt$ z0&E8Bz#n%o_C7cPUIj}-E`d+MX>bxq zupL~vm9Zbe8E_K32zG;q!4+(zTmr8FAM6LK!ME6exd7e<<6t}30KUPvoCo3fr00*3 zbCip112Z%<kJxG%$5~-0JGarEEJh2Kfw} zT8(b}OdxbMDM{W@$D%f6tEOBrTI1GKJ@8weoo!zVRkD274=U~KAYf&gcKMvJ$LMNS z^RSN)W^@|LB>u`gP>$txv2q=mExH^kl_~8GN!o)mX$*&I8kLHH=^-W^PuL?yRJo&f zq;WEcpCP{w4-v*YPK_qu+KyTwf0i8tWS{~D8 z@eCn%xpwKvoHmT_v|OY3-cB3DQXdWzmEB=FmNxb=A|Ad{WLMjC&BRl|EH?aRxXzoF zl*xs*k)3cU=QEj^n3!xfxa@p^C1ZszGE1Qf<^M;KFApKNru=_Xlw+PnzW))J15bm$ zknev9P6EpR4}y*0B69pQU>+OmKr5gX&Ntmxa^ixxtQ50 zjQ0VmJ<932)o@%p5MBwtvMcTE&)0?dQvQAdZ4)-R<0U(Ual5o{$>I<3xlb(p_V~zr zBtL-Ib0$~I-%yFGQYJw8MrVs5&OrLx6yiLj(7#?Lu`)A%2vCI7tT~MrB%x6<-P>O~ zFJ)PrcgNkjUIIm#o$MVbMNpXZgI06d)QQr?K8@ZW>V%s(1EisJbb`BT+0-G2H@-CS zUcvx%;vI#FCiZF?%cfE6ws-4SF@rMy&U$>tsfRoH(f>aZf7!73HcX#0X3@@dVZo}K N-O!%La^3lh_g{i$j_Uvb diff --git a/src/View/chatPage.tsx b/src/View/chatPage.tsx index ca1cd558..e612759e 100644 --- a/src/View/chatPage.tsx +++ b/src/View/chatPage.tsx @@ -95,44 +95,47 @@ export function ChatPage( toggle:hidden={ chatViewModel.connectionViewModel.isConnected } - > - signal_disconnected - + toggle:disabled={ + chatViewModel.connectionViewModel.hasNoPreviousConnections + } + > + signal_disconnected + - + - - {ChatViewToggleButton( - coreViewModel.translations.chatPage.pages.calendar, - "calendar_month", - ChatPageTypes.Calendar, - chatViewModel, - )} - {ChatViewToggleButton( - coreViewModel.translations.chatPage.pages.tasks, - "task_alt", - ChatPageTypes.Tasks, - chatViewModel, - )} - {ChatViewToggleButton( - coreViewModel.translations.chatPage.pages.messages, - "forum", - ChatPageTypes.Messages, - chatViewModel, - )} - {ChatViewToggleButton( - coreViewModel.translations.chatPage.pages.settings, - "settings", - ChatPageTypes.Settings, - chatViewModel, - )} - - -
- - + + {ChatViewToggleButton( + coreViewModel.translations.chatPage.pages.calendar, + "calendar_month", + ChatPageTypes.Calendar, + chatViewModel, + )} + {ChatViewToggleButton( + coreViewModel.translations.chatPage.pages.tasks, + "task_alt", + ChatPageTypes.Tasks, + chatViewModel, + )} + {ChatViewToggleButton( + coreViewModel.translations.chatPage.pages.messages, + "forum", + ChatPageTypes.Messages, + chatViewModel, + )} + {ChatViewToggleButton( + coreViewModel.translations.chatPage.pages.settings, + "settings", + ChatPageTypes.Settings, + chatViewModel, + )} + + +
+ + ); } diff --git a/src/ViewModel/Global/.connectionViewModel.ts.swp b/src/ViewModel/Global/.connectionViewModel.ts.swp new file mode 100644 index 0000000000000000000000000000000000000000..6335601759593a591d81fcf18ecdfa080fff4e7c GIT binary patch literal 12288 zcmeI2O>7%Q6vwAPp#j=L%LS^!)RiI|HR}{41PP7=jzl8}AWDNMaMKi7o$`Xmmgc$3{PH6{U$p(Q!-If1k;jAdCo2*|gE0n10i!^# z0_~_aasPI5?>z_ARNr6NM|bZ!(rag)7zK<1MggOMQNSo*6fg=H1&jj!TLq%l7IGZf zU86H(`g6;=PyN+=7zK<1MggOMQNSo*6fg=H1&jhl0i%FXz$kDPDqy>W?7|=a=dMNY z`2YXp@Bg)(gnR-%1}8xT4uZ=&2>A`X58eYu!L#5|Fb2NcPRM!iHmHI9;P;yexdc80 zr@`~!2-pTL+(gLd;3IGroB=-A1MUFd+(^g?a2z}X?gDp$Tft9bgnR(bfH#2)ir{vz z6YKz&w-NFSxCqw3IdB53fMqZX#=*rK;1B!=z6NiAQ{W^x1h#@7t|#Psa2A{fuY=dX z5_kga0k?tO;L=t?z676vPr)g06x;{?x{i=v!O!3VSOf2X5WEB^_#5N#EjSOp0&0A& z!um2H4^?25P+al9@~$+!y4w4UZ16}o$~Ps_Lvlq8PgvPGnrg!i>g1sH04p8LT2RfkY(p^GHZ2Yr(YlQc7UTkp(R+Pdo7~6^`(Mqw_H17Pll}H z@wRx#bwefu6UEZBvO_;23fm6O3>91LMc;F1$ZVGf{tE4iXo^pMnB>_<23n!T(iH7* z&!v?aw#Wu+z~QvSQ@Dp%QY zrH8D^J4_d9QI~`+r}(#Z#VqC3W>XZ!jBy%1q=RE{J%NcK5630-lRX)2Gza@noOfp@ z1;Q_a`^@rrJxNOEuG>7#wKSVdTV<6xi3eP;u){*_cP?nPqqwrWd+teG#)}ebvZ%pb zoEwziF?9x3nKDv_>7D$hdy==wHA1Oq`LfkQw(V2Gu+3JCWc5n=Dv{(a`P^*p`}%Yr z&!C1avLNJq%Vv=5c=S%Qg;urcH-NN~b&yW)!KJA+rIiY82QI650dunnpU5+!Gf!0G zX~eL+>SZ!>MiOr-hn#J?u8tr`u30RKo+mif+O-?^t6uEba~$*cmO+ql6Cu?5Eeah@z+S{ei@rsz}5b|UL=guVK~MUEA~4rUN?{Mf;kEcbA} zyrL}P8rnG4oF0jcTKM%r<}7u1jvWL%n)O6HX#X}UIlM}a{^ePrh1@GpQV(gvkxI2h zj~yfVrfKs5{dP5oSHYYfnR0T|rQ_qNxvGlvTRhsm-5iMX&Ux%oSdaXs^u>Z(Z`)zA z-u9Gc;`A|3L~%LATcWI{fGz2YN`IC6n@XqOJ5J)Sr!+HXaZRdspv+r3@vqnc#nmfm zx0{V}io+-r^t^yjLQW^bmRmfGDAqE&?MKw{Z6WY7+jI6^zWsSkWn0a^>e5=so3voz dynOEEwJ@C+-%V{1%bHkPWy>mK&N>mS{sE)HMy>z= literal 0 HcmV?d00001 diff --git a/src/ViewModel/Global/connectionViewModel.ts b/src/ViewModel/Global/connectionViewModel.ts index b3814e26..fdc104cd 100644 --- a/src/ViewModel/Global/connectionViewModel.ts +++ b/src/ViewModel/Global/connectionViewModel.ts @@ -47,6 +47,8 @@ export default class ConnectionViewModel { this.coreViewModel.connectionModel.address, ); } + + this.hideConnectionModal(); }; // methods @@ -66,6 +68,9 @@ export default class ConnectionViewModel { removePreviousAddress = (address: string): void => { this.coreViewModel.connectionModel.removeAddress(address); this.updatePreviousAddresses(); + + if (this.previousAddresses.value.size > 0) return; + this.hideConnectionModal(); }; // view