Optimisation and lint fixes

js/models/conversations.js

@@ -205,10 +205,14 @@
       return this.id === window.storage.get('primaryDevicePubKey');
     },
     async isOurDevice() {
+      if (this.isMe()) {
+        return true;
+      }
+
       const ourDevices = await window.libloki.storage.getPairedDevicesFor(
         this.ourNumber
       );
-      return this.isOurLocalDevice() || ourDevices.includes(this.id);
+      return ourDevices.includes(this.id);
     },
     isOurLocalDevice() {
       return this.id === this.ourNumber;

ts/components/EditProfileDialog.tsx

@@ -71,9 +71,12 @@ export class EditProfileDialog extends React.Component<Props, State> {
     const viewDefault = this.state.mode === 'default';
     const viewEdit = this.state.mode === 'edit';
     const viewQR = this.state.mode === 'qr';
+
+    /* tslint:disable:no-backbone-get-set-outside-model */
     const sessionID =
-      window.storage.get('primaryDevicePubKey') ||
+      window.textsecure.storage.get('primaryDevicePubKey') ||
       window.textsecure.storage.user.getNumber();
+    /* tslint:enable:no-backbone-get-set-outside-model */
 
     const backButton =
       viewEdit || viewQR