Merge remote-tracking branch 'origin/main' into error-fixes

glific · Sep 11, 2023 · d2e71e4 · d2e71e4
2 parents 21bd696 + 8c2591f
commit d2e71e4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/__tests__/Login.test.tsx b/__tests__/Login.test.tsx
@@ -18,7 +18,6 @@ describe('Login screen', () => {
     expect(getByTestId('organisationURL')).toBeDefined();
     expect(getByTestId('mobileNumber')).toBeDefined();
     expect(getByTestId('password')).toBeDefined();
-    expect(getByTestId('forgotPassword')).toBeDefined();
     expect(getByText('Log in')).toBeDefined();
   });
 
@@ -85,15 +84,15 @@ describe('Login screen', () => {
     // expect(setTokenMock).toHaveBeenCalledWith(responseMock.access_token);
   });
 
-  test('should navigate to reset password screen', async () => {
-    const navigateMock = jest.fn();
-    const { getByTestId } = customRender(<Login navigation={{ navigate: navigateMock }} />);
+  // test('should navigate to reset password screen', async () => {
+  //   const navigateMock = jest.fn();
+  //   const { getByTestId } = customRender(<Login navigation={{ navigate: navigateMock }} />);
 
-    fireEvent.press(getByTestId('forgotPassword'));
-    await waitFor(() => {
-      expect(navigateMock).toHaveBeenCalledWith('ResetPassword');
-    });
-  });
+  //   fireEvent.press(getByTestId('forgotPassword'));
+  //   await waitFor(() => {
+  //     expect(navigateMock).toHaveBeenCalledWith('ResetPassword');
+  //   });
+  // });
 
   test('should navigate to add organisation url screen', async () => {
     const navigateMock = jest.fn();

diff --git a/app.json b/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "Glific",
     "slug": "glific",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -18,15 +18,15 @@
       "supportsTablet": true,
       "usesIcloudStorage": true,
       "bundleIdentifier": "org.glific.mobile",
-      "buildNumber": "6"
+      "buildNumber": "7"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "org.glific.mobile",
-      "versionCode": 6
+      "versionCode": 7
     },
     "web": {
       "favicon": "./assets/favicon.png"