From eab1ab7c0c90cdb2e431f2bc3aa21e70b140e1ac Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 27 Sep 2018 10:16:19 -0300
Subject: [PATCH] Add support for new iPhone models in missing places (#2180)

---
 app/components/autocomplete/autocomplete.js                     | 2 +-
 .../client_upgrade_listener/client_upgrade_listener.js          | 2 +-
 app/components/emoji_picker/emoji_picker.js                     | 2 +-
 app/components/offline_indicator/offline_indicator.js           | 2 +-
 app/components/start/empty_toolbar.js                           | 2 +-
 app/screens/channel/channel.js                                  | 2 +-
 app/screens/channel/channel_nav_bar/channel_nav_bar.js          | 2 +-
 app/screens/search/search.js                                    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/components/autocomplete/autocomplete.js b/app/components/autocomplete/autocomplete.js
index 24776a66e..587a2652c 100644
--- a/app/components/autocomplete/autocomplete.js
+++ b/app/components/autocomplete/autocomplete.js
@@ -86,7 +86,7 @@ export default class Autocomplete extends PureComponent {
 
     listHeight() {
         let offset = Platform.select({ios: 65, android: 75});
-        if (DeviceInfo.getModel() === 'iPhone X') {
+        if (DeviceInfo.getModel().includes('iPhone X')) {
             offset = 90;
         }
         return this.props.deviceHeight - offset - this.state.keyboardOffset;
diff --git a/app/components/client_upgrade_listener/client_upgrade_listener.js b/app/components/client_upgrade_listener/client_upgrade_listener.js
index b8c739313..fe05b18b1 100644
--- a/app/components/client_upgrade_listener/client_upgrade_listener.js
+++ b/app/components/client_upgrade_listener/client_upgrade_listener.js
@@ -47,7 +47,7 @@ export default class ClientUpgradeListener extends PureComponent {
     constructor(props) {
         super(props);
 
-        this.isX = DeviceInfo.getModel() === 'iPhone X';
+        this.isX = DeviceInfo.getModel().includes('iPhone X');
 
         MaterialIcon.getImageSource('close', 20, this.props.theme.sidebarHeaderTextColor).then((source) => {
             this.closeButton = source;
diff --git a/app/components/emoji_picker/emoji_picker.js b/app/components/emoji_picker/emoji_picker.js
index 509cf781d..079bb1305 100644
--- a/app/components/emoji_picker/emoji_picker.js
+++ b/app/components/emoji_picker/emoji_picker.js
@@ -75,7 +75,7 @@ export default class EmojiPicker extends PureComponent {
         const emojis = this.renderableEmojis(props.emojisBySection, props.deviceWidth);
         const emojiSectionIndexByOffset = this.measureEmojiSections(emojis);
 
-        this.isX = DeviceInfo.getModel() === 'iPhone X';
+        this.isX = DeviceInfo.getModel().includes('iPhone X');
         this.scrollToSectionTries = 0;
         this.state = {
             emojis,
diff --git a/app/components/offline_indicator/offline_indicator.js b/app/components/offline_indicator/offline_indicator.js
index 360d8cae0..a7f42f137 100644
--- a/app/components/offline_indicator/offline_indicator.js
+++ b/app/components/offline_indicator/offline_indicator.js
@@ -55,7 +55,7 @@ export default class OfflineIndicator extends Component {
     constructor(props) {
         super(props);
 
-        this.isX = DeviceInfo.getModel() === 'iPhone X';
+        this.isX = DeviceInfo.getModel().includes('iPhone X');
         const navBar = this.getNavBarHeight(props.isLandscape);
 
         this.state = {
diff --git a/app/components/start/empty_toolbar.js b/app/components/start/empty_toolbar.js
index a5d99c3a1..a825ba980 100644
--- a/app/components/start/empty_toolbar.js
+++ b/app/components/start/empty_toolbar.js
@@ -28,7 +28,7 @@ export default class EmptyToolbar extends PureComponent {
     constructor(props) {
         super(props);
 
-        this.isX = DeviceInfo.getModel() === 'iPhone X';
+        this.isX = DeviceInfo.getModel().includes('iPhone X');
     }
 
     render() {
diff --git a/app/screens/channel/channel.js b/app/screens/channel/channel.js
index a3cd26cbe..6e1d40291 100644
--- a/app/screens/channel/channel.js
+++ b/app/screens/channel/channel.js
@@ -75,7 +75,7 @@ export default class Channel extends PureComponent {
     constructor(props) {
         super(props);
 
-        this.isX = DeviceInfo.getModel() === 'iPhone X';
+        this.isX = DeviceInfo.getModel().includes('iPhone X');
 
         if (LocalConfig.EnableMobileClientUpgrade && !ClientUpgradeListener) {
             ClientUpgradeListener = require('app/components/client_upgrade_listener').default;
diff --git a/app/screens/channel/channel_nav_bar/channel_nav_bar.js b/app/screens/channel/channel_nav_bar/channel_nav_bar.js
index c7694c792..5202e5ce1 100644
--- a/app/screens/channel/channel_nav_bar/channel_nav_bar.js
+++ b/app/screens/channel/channel_nav_bar/channel_nav_bar.js
@@ -35,7 +35,7 @@ export default class ChannelNavBar extends PureComponent {
     constructor(props) {
         super(props);
 
-        this.isX = DeviceInfo.getModel() === 'iPhone X';
+        this.isX = DeviceInfo.getModel().includes('iPhone X');
     }
 
     render() {
diff --git a/app/screens/search/search.js b/app/screens/search/search.js
index fea9fb945..f78a1b297 100644
--- a/app/screens/search/search.js
+++ b/app/screens/search/search.js
@@ -88,7 +88,7 @@ export default class Search extends PureComponent {
         super(props);
 
         props.navigator.setOnNavigatorEvent(this.onNavigatorEvent);
-        this.isX = DeviceInfo.getModel() === 'iPhone X';
+        this.isX = DeviceInfo.getModel().includes('iPhone X');
         this.state = {
             channelName: '',
             cursorPosition: 0,