Merge branch 'fix/chat-navbar-bug' of https://github.com/Bit-Nation/B…

…ITNATION-Pangea-mobile into fix/chat-navbar-bug
Bit-Nation · Aug 17, 2018 · a6a3e2a · a6a3e2a
2 parents d66890f + a32655c
commit a6a3e2a
Show file tree

Hide file tree

Showing 36 changed files with 1,290 additions and 868 deletions.
diff --git a/.env.dev.example b/.env.dev.example
@@ -2,5 +2,6 @@ ETH_HTTP_ENDPOINT=https://rinkeby.infura.io/bitnation
 PRODUCTION=false
 CHAT_URL=https://btn-chat-development.herokuapp.com
 AUTH_TOKEN=i_am_the_auth_test_token
-CHAT_ENDPOINT=https://bitnatin-chat-developmen.herokuapp.com
-CHAT_TOKEN=fjhagsdfjhgez
+CHAT_ENDPOINT=https://new-chat-backend-test.herokuapp.com
+CHAT_WSS_ENDPOINT=wss://new-chat-backend-test.herokuapp.com/chat
+CHAT_TOKEN=super_secure_over_9000
diff --git a/__tests__/src/sagas/accounts/sagas.js b/__tests__/src/sagas/accounts/sagas.js
@@ -26,7 +26,7 @@ import AccountsService from '../../../../src/services/accounts';
 import ChatService from '../../../../src/services/chat';
 import { InvalidPasswordError, LoginFailedError } from '../../../../src/global/errors/accounts';
 import { cancelAccountEditing, saveEditingAccount, setPublicKey } from '../../../../src/actions/profile';
-import { startFetchMessages, stopFetchMessages } from '../../../../src/actions/chat';
+import { fetchAllChats } from '../../../../src/actions/chat';
 
 const partialAccountMock: PartialAccount = {
   ...buildEmptyAccount(),
@@ -243,7 +243,7 @@ describe('login', () => {
     expect(gen.next('pubkey').value).toEqual(put(setPublicKey('pubkey')));
     expect(gen.next().value).toEqual(put(currentAccountIdChanged('ID')));
     expect(gen.next().value).toEqual(put(loginTaskUpdated(TaskBuilder.success())));
-    expect(gen.next().value).toEqual(put(startFetchMessages()));
+    expect(gen.next().value).toEqual(put(fetchAllChats()));
   });
 
   test('login to new account using account store', () => {
@@ -285,7 +285,7 @@ describe('login', () => {
     expect(gen.next('pubkey').value).toEqual(put(setPublicKey('pubkey')));
     expect(gen.next().value).toEqual(put(currentAccountIdChanged('ID')));
     expect(gen.next().value).toEqual(put(loginTaskUpdated(TaskBuilder.success())));
-    expect(gen.next().value).toEqual(put(startFetchMessages()));
+    expect(gen.next().value).toEqual(put(fetchAllChats()));
 
     last = gen.next();
     expect(last.value).toBeUndefined();
@@ -295,7 +295,6 @@ describe('login', () => {
 
 test('logout', () => {
   const gen = logout();
-  expect(gen.next().value).toEqual(put(stopFetchMessages()));
   expect(gen.next().value).toEqual(call(AccountsService.logout));
   expect(gen.next().value).toEqual(put(currentAccountIdChanged(null)));
 

diff --git a/__tests__/src/screens/Settings/ProfileScreen/Profile/__snapshots__/index.js.snap b/__tests__/src/screens/Settings/ProfileScreen/Profile/__snapshots__/index.js.snap
@@ -139,7 +139,13 @@ ShallowWrapper {
             accessible={true}
             allowFontScaling={true}
             ellipsizeMode="tail"
-            style={undefined}
+            style={
+              Object {
+                "color": undefined,
+                "fontSize": 13,
+                "textAlign": "center",
+              }
+            }
           />
           <Button
             enabled={true}
@@ -149,7 +155,7 @@ ShallowWrapper {
                 "marginTop": 13,
               }
             }
-            title="Copy Identity Key"
+            title="Share Identity Key"
           />
         </View>,
       ],
@@ -311,7 +317,13 @@ ShallowWrapper {
               accessible={true}
               allowFontScaling={true}
               ellipsizeMode="tail"
-              style={undefined}
+              style={
+                Object {
+                  "color": undefined,
+                  "fontSize": 13,
+                  "textAlign": "center",
+                }
+              }
             />,
             <Button
               enabled={true}
@@ -321,7 +333,7 @@ ShallowWrapper {
                   "marginTop": 13,
                 }
               }
-              title="Copy Identity Key"
+              title="Share Identity Key"
             />,
           ],
           "style": Object {
@@ -341,7 +353,11 @@ ShallowWrapper {
               "allowFontScaling": true,
               "children": undefined,
               "ellipsizeMode": "tail",
-              "style": undefined,
+              "style": Object {
+                "color": undefined,
+                "fontSize": 13,
+                "textAlign": "center",
+              },
             },
             "ref": null,
             "rendered": null,
@@ -358,7 +374,7 @@ ShallowWrapper {
               "style": Object {
                 "marginTop": 13,
               },
-              "title": "Copy Identity Key",
+              "title": "Share Identity Key",
             },
             "ref": null,
             "rendered": null,
@@ -450,7 +466,13 @@ ShallowWrapper {
               accessible={true}
               allowFontScaling={true}
               ellipsizeMode="tail"
-              style={undefined}
+              style={
+                Object {
+                  "color": undefined,
+                  "fontSize": 13,
+                  "textAlign": "center",
+                }
+              }
             />
             <Button
               enabled={true}
@@ -460,7 +482,7 @@ ShallowWrapper {
                   "marginTop": 13,
                 }
               }
-              title="Copy Identity Key"
+              title="Share Identity Key"
             />
           </View>,
         ],
@@ -622,7 +644,13 @@ ShallowWrapper {
                 accessible={true}
                 allowFontScaling={true}
                 ellipsizeMode="tail"
-                style={undefined}
+                style={
+                  Object {
+                    "color": undefined,
+                    "fontSize": 13,
+                    "textAlign": "center",
+                  }
+                }
               />,
               <Button
                 enabled={true}
@@ -632,7 +660,7 @@ ShallowWrapper {
                     "marginTop": 13,
                   }
                 }
-                title="Copy Identity Key"
+                title="Share Identity Key"
               />,
             ],
             "style": Object {
@@ -652,7 +680,11 @@ ShallowWrapper {
                 "allowFontScaling": true,
                 "children": undefined,
                 "ellipsizeMode": "tail",
-                "style": undefined,
+                "style": Object {
+                  "color": undefined,
+                  "fontSize": 13,
+                  "textAlign": "center",
+                },
               },
               "ref": null,
               "rendered": null,
@@ -669,7 +701,7 @@ ShallowWrapper {
                 "style": Object {
                   "marginTop": 13,
                 },
-                "title": "Copy Identity Key",
+                "title": "Share Identity Key",
               },
               "ref": null,
               "rendered": null,