Skip to content

Commit ab0b522

Browse files
authored
Merge pull request oxen-io#2561 from Bilb/fix-spinner-sogs-just-joined
ix: remove spinner of first poll of sogs even when not selected + bump release
2 parents 3e9f0f1 + 3c17d5c commit ab0b522

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "session-desktop",
33
"productName": "Session",
44
"description": "Private messaging from your desktop",
5-
"version": "1.10.2",
5+
"version": "1.10.3",
66
"license": "GPL-3.0",
77
"author": {
88
"name": "Oxen Labs",

ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,8 @@ export class OpenGroupServerPoller {
322322
// ==> At this point all those results need to trigger conversation updates, so update what we have to update
323323
await handleBatchPollResults(this.serverUrl, batchPollResults, subrequestOptions);
324324

325+
// this is very hacky but is needed to remove the spinner of an opengroup conversation while it loads the first patch of messages.
326+
// Absolutely not the react way, but well.
325327
for (const room of subrequestOptions) {
326328
if (room.type === 'messages' && !room.messages?.sinceSeqNo && room.messages?.roomId) {
327329
const conversationKey = getOpenGroupV2ConversationId(
@@ -346,6 +348,13 @@ export class OpenGroupServerPoller {
346348
})
347349
);
348350
});
351+
} else {
352+
window.inboxStore?.dispatch(
353+
markConversationInitialLoadingInProgress({
354+
conversationKey,
355+
isInitialFetchingInProgress: false,
356+
})
357+
);
349358
}
350359
}
351360
}, 5000);

0 commit comments

Comments
 (0)