From 2fdafb8fba6d5bc06a9bd466a8498f65ccea26cd Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Sep 2021 03:36:36 +0200 Subject: [PATCH] Out of sync message sync (#1923) * do not update sent_at for synced messages * reply to message context menu only visible if msg sent * Allow scrolling in mentioning people in composition box Relates #1849 --- stylesheets/_session_conversation.scss | 5 +++++ ts/session/onions/onionPath.ts | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss index f92a039a6..4f529209a 100644 --- a/stylesheets/_session_conversation.scss +++ b/stylesheets/_session_conversation.scss @@ -197,6 +197,11 @@ min-height: $composition-container-height; padding: $session-margin-md 0; + ul { + max-height: 70vh; + overflow: auto; + } + textarea { font-family: $session-font-default; min-height: $composition-container-height / 3; diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index 63ce1b3fd..9b27809e7 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -318,7 +318,7 @@ export async function TEST_testGuardNode(snode: Data.Snode) { response = await insecureNodeFetch(url, fetchOptions); } catch (e) { if (e.type === 'request-timeout') { - window?.log?.warn('test timeout for node,', snode); + window?.log?.warn('test timeout for node,', ed25519Str(snode.pubkey_ed25519)); } if (e.code === 'ENETUNREACH') { window?.log?.warn('no network on node,', snode); @@ -392,8 +392,7 @@ export async function selectGuardNodes(): Promise> { attempts++; } - guardNodes = selectedGuardNodes; - + guardNodes = selectedGuardNodes.slice(0, desiredGuardCount); if (guardNodes.length < desiredGuardCount) { window?.log?.error(`Cound't get enough guard nodes, only have: ${guardNodes.length}`); throw new Error(`Cound't get enough guard nodes, only have: ${guardNodes.length}`);