diff --git a/ts/components/ToastManager.dom.stories.tsx b/ts/components/ToastManager.dom.stories.tsx
index 528d74affc..73ded7dd20 100644
--- a/ts/components/ToastManager.dom.stories.tsx
+++ b/ts/components/ToastManager.dom.stories.tsx
@@ -159,8 +159,6 @@ function getToast(toastType: ToastType): AnyToast {
return { toastType: ToastType.FailedToFetchPhoneNumber };
case ToastType.FailedToFetchUsername:
return { toastType: ToastType.FailedToFetchUsername };
- case ToastType.FailedToSendWithEndorsements:
- return { toastType: ToastType.FailedToSendWithEndorsements };
case ToastType.FailedToImportBackup:
return { toastType: ToastType.FailedToImportBackup };
case ToastType.FileSaved:
diff --git a/ts/components/ToastManager.dom.tsx b/ts/components/ToastManager.dom.tsx
index 552ba74482..a3665db484 100644
--- a/ts/components/ToastManager.dom.tsx
+++ b/ts/components/ToastManager.dom.tsx
@@ -540,20 +540,6 @@ function renderToast({
);
}
- if (toastType === ToastType.FailedToSendWithEndorsements) {
- return (
-
- {i18n('icu:Toast--FailedToSendWithEndorsements')}
-
- );
- }
-
if (toastType === ToastType.FailedToImportBackup) {
return (
): GroupSendToken | null {
- try {
- return this.#toToken(this.#buildToken(new Set(serviceIds)));
- } catch (error) {
- onFailedToSendWithEndorsements(error);
- }
- return null;
+ buildToken(serviceIds: Set): GroupSendToken {
+ return this.#toToken(this.#buildToken(new Set(serviceIds)));
}
}
-const showFailedToSendWithEndorsementsToast = throttle(
- () => {
- window.reduxActions.toast.showToast({
- toastType: ToastType.FailedToSendWithEndorsements,
- });
- },
- 5 * MINUTE,
- { trailing: false }
-);
-
-export function onFailedToSendWithEndorsements(error: Error): void {
- log.error('onFailedToSendWithEndorsements', Errors.toLogFormat(error));
- if (isTestOrMockEnvironment() || isNightly(window.getVersion())) {
- showFailedToSendWithEndorsementsToast();
- }
- if (window.SignalCI) {
- window.SignalCI.handleEvent('fatalTestError', error);
- }
- devDebugger();
-}
-
type MaybeCreateGroupSendEndorsementStateResult =
| { state: GroupSendEndorsementState; didRefreshGroupState: false }
| { state: null; didRefreshGroupState: boolean };
@@ -437,19 +404,9 @@ export async function maybeCreateGroupSendEndorsementState(
// If we've already refreshed the group state, we should log and move on.
if (alreadyRefreshedGroupState) {
- onFailedToSendWithEndorsements(
- new Error(
- `${logId}: Endorsements invalid after refreshing group: ${result.reason}`
- )
- );
return { state: null, didRefreshGroupState: false };
}
if (conversation.isBlocked()) {
- onFailedToSendWithEndorsements(
- new Error(
- `${logId}: Group is blocked and endorsements are invalid: ${result.reason}`
- )
- );
return { state: null, didRefreshGroupState: false };
}
diff --git a/ts/util/sendToGroup.preload.ts b/ts/util/sendToGroup.preload.ts
index c43ce93729..23bc453873 100644
--- a/ts/util/sendToGroup.preload.ts
+++ b/ts/util/sendToGroup.preload.ts
@@ -84,10 +84,7 @@ import { strictAssert } from './assert.std.ts';
import { createLogger } from '../logging/log.std.ts';
import { waitForAll } from './waitForAll.std.ts';
import type { GroupSendEndorsementState } from './groupSendEndorsements.preload.ts';
-import {
- maybeCreateGroupSendEndorsementState,
- onFailedToSendWithEndorsements,
-} from './groupSendEndorsements.preload.ts';
+import { maybeCreateGroupSendEndorsementState } from './groupSendEndorsements.preload.ts';
import type { GroupSendToken } from '../types/GroupSendEndorsements.std.ts';
import { isAciString } from './isAciString.std.ts';
import { safeParseStrict, safeParseUnknown } from './schemas.std.ts';
@@ -749,11 +746,9 @@ async function sendToGroupViaSenderKey(
}
if (error.code === UNKNOWN_RECIPIENT) {
- onFailedToSendWithEndorsements(error);
throw new UnknownRecipientError();
}
if (error.code === INCORRECT_AUTH_KEY) {
- onFailedToSendWithEndorsements(error);
throw new IncorrectSenderKeyAuthError();
}
@@ -790,13 +785,6 @@ async function sendToGroupViaSenderKey(
}
}
- if (groupSendEndorsementState != null) {
- // Ignore server errors
- if (!(error instanceof HTTPError && error.code === 500)) {
- onFailedToSendWithEndorsements(error);
- }
- }
-
log.error(
`${logId}: Returned unexpected error code: ${
error.code
@@ -1381,11 +1369,6 @@ function isValidSenderKeyRecipient(
if (groupSendEndorsementState != null) {
if (!groupSendEndorsementState.hasMember(serviceId)) {
- onFailedToSendWithEndorsements(
- new Error(
- `isValidSenderKeyRecipient: Sending to ${serviceId}, missing endorsement`
- )
- );
return false;
}
} else if (!getAccessKey(memberConversation.attributes, { story })) {
@@ -1588,12 +1571,6 @@ async function fetchKeysForServiceId(
await markServiceIdUnregistered(serviceId);
return;
}
- if (useGroupSendEndorsement) {
- // Ignore untrusted identity key errors
- if (!(error instanceof OutgoingIdentityKeyError)) {
- onFailedToSendWithEndorsements(error as Error);
- }
- }
log.error(
`${logId}: Error fetching ${devices?.join(', ') || 'all'} devices`,
Errors.toLogFormat(error)