Skip to content

Commit 7777d87

Browse files
committed
Merge branch 'dev' of github.com:wireapp/wire-webapp into WPB-20940
2 parents 8271aea + 5e51801 commit 7777d87

File tree

7 files changed

+14
-6
lines changed

7 files changed

+14
-6
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ module.exports = {
4444
'@typescript-eslint/no-floating-promises': 'warn',
4545
'@typescript-eslint/typedef': 'off',
4646
'no-dupe-class-members': 'off',
47+
'no-empty': 'error',
4748
'no-unsanitized/property': 'off',
4849
'prefer-promise-reject-errors': 'off',
4950
'valid-jsdoc': 'off',

src/script/auth/main.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ const core = container.resolve(Core);
5555
let localStorage;
5656
try {
5757
localStorage = window.localStorage;
58-
} catch (error) {}
58+
} catch {
59+
// ignore error
60+
}
5961

6062
const store = configureStore({
6163
actions: actionRoot,

src/script/auth/page/ClientManager.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ const ClientManagerComponent = ({doGetAllClients, doLogout}: Props & ConnectedPr
6868
const logout = async () => {
6969
try {
7070
await doLogout();
71-
} catch (error) {}
71+
} catch (error) {
72+
// ignore errors on logout
73+
}
7274
};
7375

7476
return (

src/script/components/panel/EnrichedFields.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ export const useEnrichedFields = (
6363
const richProfile = await richProfileRepository.getUserRichProfile(user.id);
6464
returnFields.push(...(richProfile?.fields ?? []));
6565
} catch {
66+
// ignore errors
6667
} finally {
6768
if (!cancel) {
6869
onFieldsLoaded?.(returnFields);

src/script/repositories/conversation/ConversationRepository.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2078,7 +2078,9 @@ export class ConversationRepository {
20782078

20792079
try {
20802080
return await this.resolve1To1Conversation(otherUserId, {shouldRefreshUser}, conversation.qualifiedId);
2081-
} catch {}
2081+
} catch {
2082+
// ignore errors
2083+
}
20822084

20832085
return conversation;
20842086
};

src/script/repositories/conversation/MessageRepository.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,6 @@ export class MessageRepository {
367367
},
368368
): T {
369369
const quoteData = quote && {quotedMessageId: quote.messageId, quotedMessageSha256: new Uint8Array(quote.hash)};
370-
if (quote) {
371-
}
372370

373371
return new TextContentBuilder(baseMessage)
374372
.withMentions(

src/script/repositories/team/TeamEntity.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ export class TeamEntity {
4444

4545
try {
4646
hasIcon = !!this.icon && isValidAsset(this.icon);
47-
} catch (error) {}
47+
} catch (error) {
48+
// ignore error
49+
}
4850

4951
if (hasIcon && teamDomain) {
5052
return new AssetRemoteData({assetKey: this.icon, assetDomain: teamDomain});

0 commit comments

Comments
 (0)