-
-
@@ -200,7 +198,7 @@ export const OverlayClosedGroupV2 = () => {
{isDevProd() && (
<>
- Invite as admin?{' '}
+ Invite as admin Plop?{' '}
{
@@ -222,23 +220,21 @@ export const OverlayClosedGroupV2 = () => {
{noContactsForClosedGroup ? (
) : (
-
- {contactsToRender.map((memberPubkey: string) => (
- m === memberPubkey)}
- key={memberPubkey}
- onSelect={addToSelected}
- onUnselect={removeFromSelected}
- disableBg={true}
- />
- ))}
-
+ contactsToRender.map((memberPubkey: string) => (
+ m === memberPubkey)}
+ key={memberPubkey}
+ onSelect={addToSelected}
+ onUnselect={removeFromSelected}
+ disableBg={true}
+ />
+ ))
)}
,
-):LocalizerComponentPropsObject {
+export function getLeftGroupUpdateChangeStr(left: Array): LocalizerComponentPropsObject {
const { others, us } = usAndXOthers(left);
if (left.length !== 1) {
@@ -78,7 +74,7 @@ export function getLeftGroupUpdateChangeStr(
args: {
name: ConvoHub.use().getContactProfileNameOrShortenedPubKey(others[0]),
},
- } ;
+ };
}
export function getJoinedGroupUpdateChangeStr(
@@ -88,33 +84,43 @@ export function getJoinedGroupUpdateChangeStr(
_groupName: string
): LocalizerComponentPropsObject {
const { others, us } = usAndXOthers(joined);
- const othersNames = others.map(
- ConvoHub.use().getContactProfileNameOrShortenedPubKey
- );
+ const othersNames = others.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey);
if (groupv2) {
if (us) {
switch (othersNames.length) {
case 0:
- return { token: addedWithHistory ? 'groupMemberNewYou' : 'groupInviteYou' } ;
+ return { token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou' };
case 1:
- return addedWithHistory ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } } : {token: 'legacyGroupMemberNewYouOther', args: {other_name: othersNames[0]}};
+ return addedWithHistory
+ ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } }
+ : { token: 'legacyGroupMemberNewYouOther', args: { other_name: othersNames[0] } };
default:
- return addedWithHistory ? { token: 'groupMemberNewYouHistoryMultiple', args: { count: othersNames.length } } : {token: 'groupInviteYouAndMoreNew', args: {count: othersNames.length}};
+ return addedWithHistory
+ ? { token: 'groupMemberNewYouHistoryMultiple', args: { count: othersNames.length } }
+ : { token: 'groupInviteYouAndMoreNew', args: { count: othersNames.length } };
}
}
switch (othersNames.length) {
case 0:
- return { token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou' } ;
+ return { token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou' };
case 1:
- return addedWithHistory ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } } : {token: 'legacyGroupMemberNewYouOther', args: {other_name: othersNames[0]}};
+ return addedWithHistory
+ ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } }
+ : { token: 'legacyGroupMemberNewYouOther', args: { other_name: othersNames[0] } };
default:
- return addedWithHistory ? { token: 'groupMemberNewHistoryMultiple', args: { name: othersNames[0], count: othersNames.length -1 } } : {token: 'groupMemberNewMultiple', args: { name: othersNames[0], count: othersNames.length -1 }};
+ return addedWithHistory
+ ? {
+ token: 'groupMemberNewHistoryMultiple',
+ args: { name: othersNames[0], count: othersNames.length - 1 },
+ }
+ : {
+ token: 'groupMemberNewMultiple',
+ args: { name: othersNames[0], count: othersNames.length - 1 },
+ };
}
-
}
-
if (us) {
switch (othersNames.length) {
case 0:
@@ -149,14 +155,11 @@ export function getJoinedGroupUpdateChangeStr(
}
}
-
export function getPromotedGroupUpdateChangeStr(
- joined: Array,
+ joined: Array
): LocalizerComponentPropsObject {
const { others, us } = usAndXOthers(joined);
- const othersNames = others.map(
- ConvoHub.use().getContactProfileNameOrShortenedPubKey
- );
+ const othersNames = others.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey);
if (us) {
switch (othersNames.length) {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 1c63f47474..7edc62ad0d 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -144,7 +144,7 @@ async function mergeUserConfigsWithIncomingUpdates(
const needsPush = await GenericWrapperActions.needsPush(variant);
const mergedTimestamps = sameVariant
.filter(m => hashesMerged.includes(m.hash))
- .map(m => m.timestamp);
+ .map(m => m.storedAt);
const latestEnvelopeTimestamp = Math.max(...mergedTimestamps);
window.log.debug(
diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts
index cfd9ac0a7a..8ce6161690 100644
--- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts
+++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts
@@ -20,6 +20,7 @@ import {
} from '../PersistedJob';
import { LibSessionUtil } from '../../libsession/libsession_utils';
import { showUpdateGroupMembersByConvoId } from '../../../../interactions/conversationInteractions';
+import { ConvoHub } from '../../../conversations';
const defaultMsBetweenRetries = 10000;
const defaultMaxAttempts = 1;
@@ -77,29 +78,40 @@ function displayFailedInvitesForGroup(groupPk: GroupPubkeyType) {
void showUpdateGroupMembersByConvoId(groupPk);
};
const count = thisGroupFailures.failedMembers.length;
+ const groupName = ConvoHub.use().get(groupPk)?.getRealSessionUsername() || window.i18n('unknown');
+ const firstUserName =
+ ConvoHub.use().get(thisGroupFailures.failedMembers?.[0])?.getRealSessionUsername() ||
+ window.i18n('unknown');
+ const secondUserName =
+ ConvoHub.use().get(thisGroupFailures.failedMembers?.[1])?.getRealSessionUsername() ||
+ window.i18n('unknown');
switch (count) {
case 1:
ToastUtils.pushToastWarning(
`invite-failed${groupPk}`,
- window.i18n('groupInviteFailedUser', [...thisGroupFailures.failedMembers, groupPk]),
+ window.i18n('groupInviteFailedUser', { group_name: groupName, name: firstUserName }),
onToastClick
);
break;
case 2:
ToastUtils.pushToastWarning(
`invite-failed${groupPk}`,
- window.i18n('groupInviteFailedTwo', [...thisGroupFailures.failedMembers, groupPk]),
+ window.i18n('groupInviteFailedTwo', {
+ group_name: groupName,
+ name: firstUserName,
+ other_name: secondUserName,
+ }),
onToastClick
);
break;
default:
ToastUtils.pushToastWarning(
`invite-failed${groupPk}`,
- window.i18n('groupInviteFailedMultiple', [
- thisGroupFailures.failedMembers[0],
- `${thisGroupFailures.failedMembers.length - 1}`,
- groupPk,
- ]),
+ window.i18n('groupInviteFailedMultiple', {
+ group_name: groupName,
+ name: firstUserName,
+ count: thisGroupFailures.failedMembers.length - 1,
+ }),
onToastClick
);
}