Improvements

README.md

@@ -31,6 +31,7 @@ You can edit the config file as suited:
 | `termsUrl`         | Terms and conditions URL |
 | `userGuideUrl`     | User's manual URL        |
 | `apuuUrl`          | Apuu-chat URL            |
+| `sekasinUrl`       | Sekasin-chat URL         |
 | `messageFetchDelay`| Delay between polling    |
 
 

appcenter-post-clone.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+CUR_COCOAPODS_VER=`sed -n -e 's/^COCOAPODS: \([0-9.]*\)/\1/p' ios/Podfile.lock`
+ENV_COCOAPODS_VER=`pod --version`
+
+# check if not the same version, reinstall cocoapods version to current project's
+if [ $CUR_COCOAPODS_VER != $ENV_COCOAPODS_VER ];
+then
+    echo "Uninstalling all CocoaPods versions"
+    sudo gem uninstall cocoapods --all --executables
+    echo "Installing CocoaPods version $CUR_COCOAPODS_VER"
+    sudo gem install cocoapods -v $CUR_COCOAPODS_VER
+else 
+    echo "CocoaPods version is suitable for the project"
+fi;

appcenter-pre-build.sh

@@ -11,6 +11,7 @@ tee config.json > /dev/null <<EOF
     "termsUrl": "$YLITSE_TERMSURL",
     "userGuideUrl": "$YLITSE_USERGUIDEURL",
     "apuuUrl": "$YLITSE_APUUURL",
+    "sekasinUrl": "$YLITSE_SEKASINURL",
     "messageFetchDelay": $YLITSE_MESSAGEFETCHDELAY
 }
 EOF

config.template.android.json

@@ -5,5 +5,6 @@
   "termsUrl": "http://10.0.2.2:3000",
   "userGuideUrl": "http://10.0.2.2:3000",
   "apuuUrl": "http://10.0.2.2:3000",
+  "sekasinUrl": "http://10.0.2.2:3000",
   "messageFetchDelay": 2000
 }

config.template.ios.json

@@ -5,5 +5,6 @@
   "termsUrl": "http://localhost:3000",
   "userGuideUrl": "http://localhost:3000",
   "apuuUrl": "http://localhost:3000",
+  "sekasinUrl": "http://localhost:3000",
   "messageFetchDelay": 2000
 }

e2e/browseMentorsTest.spec.ts

@@ -57,7 +57,7 @@ describe('Browse mentors', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
@@ -70,7 +70,7 @@ describe('Browse mentors', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
@@ -83,7 +83,7 @@ describe('Browse mentors', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
@@ -186,7 +186,7 @@ describe('Browse mentors', () => {
 
     await signIn(mentor);
 
-    await expect(element(by.text(mentor.displayName))).toBeVisible();
+    await expect(element(by.text(mentor.displayName))).toBeVisible(50);
     await element(by.text('Show mentor')).atIndex(0).tap();
 
     await element(by.text('Chat')).tap();

e2e/chatTest.spec.ts

@@ -14,6 +14,7 @@ import {
 describe('Chat', () => {
   beforeAll(async () => {
     await device.launchApp();
+    jest.setTimeout(200000);
   });
   beforeEach(async () => {
     await APIDeleteAccounts();

e2e/filterSkillTest.spec.ts

@@ -51,7 +51,7 @@ describe('Skill filter', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
@@ -64,7 +64,7 @@ describe('Skill filter', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
@@ -77,7 +77,7 @@ describe('Skill filter', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;

e2e/helpers.ts

@@ -6,6 +6,14 @@ const API_USER = process.env.YLITSE_API_USER || 'admin';
 const API_PASS = process.env.YLITSE_API_PASS || '';
 const MFA_SECRET = process.env.YLITSE_MFA_SECRET || '';
 
+export const getAdminCredentials = () => {
+  return {
+    user: API_USER,
+    pass: API_PASS,
+    token: generateToken(MFA_SECRET)?.token,
+  };
+};
+
 /**
  * Scrolls view down if needed and taps the given element
  */

e2e/hideInactiveMentorsTest.spec.ts

@@ -22,7 +22,7 @@ const findMentor = async (mentorIndexes: any, mentorsFound: any) => {
     try {
       await expect(
         element(by.text(accountFixtures.mentors[Number(i)].displayName)),
-      ).toBeVisible();
+      ).toBeVisible(50);
       found[accountFixtures.mentors[Number(i)].displayName] = true;
     } catch (error) {
       continue;

e2e/signInTest.spec.ts

@@ -2,7 +2,12 @@ import { by, element, expect, device } from 'detox';
 import { describe, it, beforeEach, beforeAll } from '@jest/globals';
 import accountFixtures from './fixtures/accounts.json';
 
-import { APISignUpMentee, APIDeleteAccounts, signIn } from './helpers';
+import {
+  APISignUpMentee,
+  APIDeleteAccounts,
+  signIn,
+  forceLogout,
+} from './helpers';
 
 describe('SignIn', () => {
   beforeAll(async () => {
@@ -12,6 +17,9 @@ describe('SignIn', () => {
     await APIDeleteAccounts();
     await device.reloadReactNative();
   });
+  afterEach(async () => {
+    await forceLogout();
+  });
 
   it('mentee succesfully', async () => {
     const mentee = accountFixtures.mentees[0];

e2e/statusMessageTest.spec.ts

@@ -63,7 +63,7 @@ describe('Show status message', () => {
 
     for (const mentorName of Object.keys(statusMessages)) {
       try {
-        await expect(element(by.text(mentorName))).toBeVisible();
+        await expect(element(by.text(mentorName))).toBeVisible(50);
         await expect(
           element(by.text(statusMessages[mentorName])),
         ).toBeVisible();

e2e/userReportTest.spec.ts

@@ -11,6 +11,7 @@ import {
   signIn,
   forceLogout,
   waitAndTypeText,
+  scrollDownAndTap,
 } from './helpers';
 
 describe('reportUser', () => {
@@ -68,7 +69,8 @@ describe('reportUser', () => {
     const reportReason = 'Harrasment';
     const contactInfo = '[email protected]';
 
-    await waitAndTypeText(descriptionTestId, reportReason);
+    await waitAndTypeText(descriptionTestId, reportReason, true);
+    await scrollDownAndTap('main.userreport.index.view', contactTestId);
     await waitAndTypeText(contactTestId, contactInfo);
 
     await element(by.id('main.userreport.send.button')).tap();
@@ -162,8 +164,11 @@ describe('reportUser', () => {
 
     const descriptionTestId = 'main.userreport.description.input';
     const contactTestId = 'main.userreport.contact.input';
+    const reportReason = 'Harrasment';
+
+    await waitAndTypeText(descriptionTestId, reportReason, true);
     await element(by.id(descriptionTestId)).clearText();
-    await element(by.id(contactTestId)).tap();
+    await scrollDownAndTap('main.userreport.index.view', contactTestId);
 
     // Now we see error
     await expect(

ios/Podfile

@@ -60,6 +60,13 @@ target 'ylitse' do
       :mac_catalyst_enabled => false
     )
     __apply_Xcode_12_5_M1_post_install_workaround(installer)
+
+    # https://stackoverflow.com/a/77136535
+    installer.pods_project.targets.each do |target|
+      target.build_configurations.each do |config|
+        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']
+      end
+    end
   end
 end
 

ios/Podfile.lock

@@ -495,7 +495,7 @@ PODS:
     - React-perflogger (= 0.71.6)
   - RNCAsyncStorage (1.18.1):
     - React-Core
-  - RNDeviceInfo (10.11.0):
+  - RNDeviceInfo (10.12.0):
     - React-Core
   - RNFBApp (18.3.2):
     - Firebase/CoreOnly (= 10.14.0)
@@ -794,7 +794,7 @@ SPEC CHECKSUMS:
   React-runtimeexecutor: 8692ac548bec648fa121980ccb4304afd136d584
   ReactCommon: 0c43eaeaaee231d7d8dc24fc5a6e4cf2b75bf196
   RNCAsyncStorage: b90b71f45b8b97be43bc4284e71a6af48ac9f547
-  RNDeviceInfo: bf8a32acbcb875f568217285d1793b0e8588c974
+  RNDeviceInfo: db5c64a060e66e5db3102d041ebe3ef307a85120
   RNFBApp: 0b534885354024f4d171ede8da04521d81bc1767
   RNFBMessaging: a2ebefff4dd99eba6b16105bbc0b931bfdb0ce74
   RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
@@ -804,6 +804,6 @@ SPEC CHECKSUMS:
   Yoga: ba09b6b11e6139e3df8229238aa794205ca6a02a
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 5420f96dab79d181a3c1ad392459902ee8895352
+PODFILE CHECKSUM: 48004b0a41f3fdabc3a4ce2250b385f6ded12ae0
 
 COCOAPODS: 1.12.0

ios/ylitse/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -103,7 +103,7 @@
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "ylitse_vahemman_paddingia.png",
+      "filename" : "1024.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"