Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tagavari committed Oct 23, 2020
2 parents 197986f + 42e5807 commit b5c13c0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "airmessage-react",
"version": "1.0.0",
"version": "1.0.1",
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.0",
Expand Down
5 changes: 4 additions & 1 deletion src/components/messaging/master/Messaging.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import DetailWelcome from "../detail/DetailWelcome";
import * as ConnectionManager from "../../../connection/connectionManager";
import {ConnectionListener, messageUpdateEmitter, modifierUpdateEmitter} from "../../../connection/connectionManager";
import {initializePeople} from "../../../util/peopleUtils";
import {ConnectionErrorCode, ParticipantActionType} from "../../../data/stateCodes";
import {ConnectionErrorCode, MessageError, ParticipantActionType} from "../../../data/stateCodes";
import {Conversation, ConversationItem, MessageItem, MessageModifier} from "../../../data/blocks";
import SoftDivider from "../../SoftDivider";
import {
Expand Down Expand Up @@ -103,6 +103,9 @@ class Messaging extends React.Component<Props, State> {
detailPane: {type: DetailType.Welcome}
});
}
}).catch((reason: MessageError) => {
console.error("Failed to fetch conversations", reason);
ConnectionManager.disconnect();
});
} else {
//Clearing the error from the sidebar
Expand Down
3 changes: 2 additions & 1 deletion src/data/changelog.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export const changelog = `
Initial release
- Dropped support for older browsers
- The app will now disconnect if conversations couldn't be loaded
`;
3 changes: 1 addition & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": "src",
"target": "ES5",
"target": "ES2020",
"lib": [
"dom",
"dom.iterable",
Expand All @@ -21,7 +21,6 @@
"noImplicitThis": true,
"noImplicitAny": true,
"strictNullChecks": true,
"downlevelIteration": true,
"jsx": "react"
},
"include": [
Expand Down

0 comments on commit b5c13c0

Please sign in to comment.