fixed crash when no message on bitnation group

Bit-Nation · Feb 26, 2019 · 18027ad · 18027ad
1 parent e357055
commit 18027ad
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/screens/ChatScreen/index.js b/src/screens/ChatScreen/index.js
@@ -84,7 +84,7 @@ class ChatScreen extends Component<Props, State> {
     super(props);
 
     if (props.isBot !== true) {
-      const nationIdX = props.nationId ? props.nationId : "a8dddbe1-525e-4d5f-bc51-35a3dee84ff9"; //hardcode for bitnation chat group
+      const nationIdX = props.nationId ? props.nationId : 'a8dddbe1-525e-4d5f-bc51-35a3dee84ff9'; // hardcode for bitnation chat group
       const selectedNation = resolveNation(props.nations || [], nationIdX);
       if (selectedNation === null) {
         props.navigator.pop();
@@ -234,7 +234,7 @@ class ChatScreen extends Component<Props, State> {
         <GiftedChat
           alwaysShowSend
           showAvatarForEveryMessage
-          messages={this.state.messages}
+          messages={this.state ? this.state.messages : null}
           onSend={messages => this.onSend(messages)}
           user={sendingUser}
           bottomOffset={Platform.OS === 'ios' ? 48.5 : 0}