From 1052341d79bb7e14f5bcc4648e6d4aa34ea5b390 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Thu, 5 Apr 2018 08:37:04 -0700
Subject: [PATCH] Fix tslint errors and add tslint to CI task in package.json

---
 js/react/util/MessageParents.tsx | 2 +-
 js/react/util/index.ts           | 9 +++++----
 package.json                     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/js/react/util/MessageParents.tsx b/js/react/util/MessageParents.tsx
index da934341e..b828ef18b 100644
--- a/js/react/util/MessageParents.tsx
+++ b/js/react/util/MessageParents.tsx
@@ -5,7 +5,7 @@ interface IProps {
   /**
    * Corresponds to the theme setting in the app, and the class added to the root element.
    */
-  theme: "ios" | "android" | "android-dark";
+  theme: 'ios' | 'android' | 'android-dark';
 }
 
 /**
diff --git a/js/react/util/index.ts b/js/react/util/index.ts
index 951813f7a..55754dead 100644
--- a/js/react/util/index.ts
+++ b/js/react/util/index.ts
@@ -1,5 +1,9 @@
-import qs from 'qs';
 import moment from 'moment';
+import qs from 'qs';
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+
 
 // Helper components used in the styleguide, exposed at 'util' in the global scope via the
 //   context option in react-styleguidist.
@@ -9,9 +13,6 @@ export { BackboneWrapper } from './BackboneWrapper';
 
 // Here we can make things inside Webpack available to Backbone views like preload.js.
 
-import React from 'react';
-import ReactDOM from 'react-dom';
-
 import { Message } from '../conversation/Message';
 import { Reply } from '../conversation/Reply';
 
diff --git a/package.json b/package.json
index 1bf57e564..bf443bfc5 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "main": "main.js",
   "scripts": {
     "postinstall": "electron-builder install-app-deps && rimraf node_modules/dtrace-provider",
-    "test": "yarn eslint && yarn test-server && grunt test && yarn test-app && yarn test-modules",
+    "test": "yarn eslint && yarn tslint && yarn test-server && grunt test && yarn test-app && yarn test-modules",
     "lint": "grunt jshint",
     "start": "electron .",
     "asarl": "asar l release/mac/Signal.app/Contents/Resources/app.asar",