Release-11.0.0

env.tmp → .env.tmp

@@ -6,7 +6,12 @@ VITE_REFRESH_EXPIRE=30
 VITE_JP_STRIPE_PUBLIC_KEY=''
 VITE_STRIPE_PUBLIC_KEY=''
 VITE_APP_URL=https://app.socious.io/
+VITE_ACCOUNT_CENTER_URL=https://dev-id.socious.io/
+VITE_FUND_URL=https://devfund.socious.org/
+VITE_VERIFY_URL=https://wallet.socious.io/
 VITE_CLIENT_SECRET_TOKEN_CLIENT_ID=''
 VITE_CLIENT_SECRET_TOKEN_REDIRECT_URL=https://app.socious.io/jobIndexing
 STORYBOOK_FIGMA_ACCESS_TOKEN=''
-VITE_GOOGLE_RECAPTCHA_SITE_KEY=''
+VITE_GOOGLE_RECAPTCHA_SITE_KEY=''
+VITE_BLOCKFROST_PROJECT_ID=''
+VITE_CARDANO_PAYOUT_ADERESS=''

.github/workflows/docker.yml

@@ -29,7 +29,7 @@ jobs:
           PORT: 3000
           VITE_ENV: development
           VITE_BASE_URL: https://dev.socious.io/api/v2
-          VITE_APP_URL: https://webapp2.dev.socious.io/
+          VITE_APP_URL: https://webapp2.socious.io/
           VITE_JP_STRIPE_PUBLIC_KEY: pk_test
           VITE_DAPP_ENV: testnet
           VITE_GOOGLE_OAUTH_CLIENT_ID: id

.github/workflows/release-android.yml

@@ -62,6 +62,9 @@ jobs:
           VITE_STRIPE_PUBLIC_KEY: ${{ vars.STRIPE_PUBLIC_KEY }}
           VITE_APPLE_OAUTH_CLIENT_ID: ${{ vars.APPLE_OAUTH_CLIENT_ID }}
           VITE_GOOGLE_OAUTH_CLIENT_ID_IOS: ${{ vars.GOOGLE_OAUTH_CLIENT_ID_IOS }}
+          VITE_ACCOUNT_CENTER_URL: ${{ vars.ACCOUNT_CENTER_URL }}
+          VITE_FUND_URL: ${{ vars.FUND_URL }}
+          VITE_VERIFY_URL: ${{ vars.VERIFY_URL }}
 
       - name: Get the latest version code using
         uses: Vacxe/google-play-cli-kt@0.4.8

.github/workflows/release-ios.yml

@@ -1,22 +1,12 @@
 name: CD - Release - iOS
 
 on:
-  # push:
-  #   # tags:
-  #   #   - v*
-  #   branches:
-  #     - ci
   release:
     types: [prereleased, released]
 
-# echo ${{ github.event.release.tag_name }} -> tagname
-# echo ${{ github.event.release.prerelease }} -> true,false (${{ github.event.release.prerelease == true }})
-# echo '${{ github.event.release.name }}' -> title
-# echo '${{ github.event.release.body }}' -> body
-
 env:
   CI: false
-  #Github ENVs
+  # GitHub ENVs
   IOS_BUNDLE_ID: ${{ vars.IOS_BUNDLE_ID }}
   IOS_DEVELOPMENT_TEAM_ID: ${{ vars.IOS_DEVELOPMENT_TEAM_ID }}
   IOS_DISTRIBUTION_CERT_BASE64: ${{ secrets.IOS_DISTRIBUTION_CERT_BASE64 }}
@@ -27,7 +17,7 @@ env:
   IOS_APPSTORECONNECT_API_ISSUER: ${{ vars.IOS_APPSTORECONNECT_API_ISSUER }}
   IOS_APPSTORECONNECT_API_KEY: ${{ secrets.IOS_APPSTORECONNECT_API_KEY }}
   IOS_APP_APPLE_ID: ${{ vars.IOS_APP_APPLE_ID }}
-  #Workflow ENVs
+  # Workflow ENVs
   APPSTORECONNECT_AUTH_KEY_PATH: /Users/runner/private_keys
   MOBILE_PROVISIONING_PATH: ~/Library/MobileDevice/Provisioning\ Profiles
   SIGNING_CERTIFICATE_PATH: ${{ github.workspace }}/ios/App/signing-certificate.p12
@@ -40,11 +30,33 @@ jobs:
     name: Building iOS
     outputs:
       LATEST_APPSTORE_BUILD_NUMBER: ${{ steps.build-number.outputs.LATEST_APPSTORE_BUILD_NUMBER }}
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: List Available Xcode Versions
+        run: |
+          ls -l /Applications | grep Xcode
+          echo "Available Xcode versions:"
+          find /Applications -maxdepth 1 -name 'Xcode*.app' -exec {} -version \;
+
+      - name: Select Xcode Version
+        run: |
+          XCODE_PATH=$(find /Applications -maxdepth 1 -name 'Xcode*.app' | grep 'Xcode' | sort -V | tail -n 1)
+          if [ -z "$XCODE_PATH" ]; then
+            echo "No Xcode installation found!"
+            exit 1
+          fi
+          echo "Selected Xcode path: $XCODE_PATH"
+          sudo xcode-select -s "$XCODE_PATH/Contents/Developer"
+
+      - name: Check Xcode Version
+        run: xcodebuild -version
+
+      - name: Verify SDK Version
+        run: xcodebuild -showsdks
+
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
@@ -55,20 +67,6 @@ jobs:
         with:
           version: latest
 
-      # - name: Cache node modules
-      #   id: cache-npm
-      #   uses: actions/cache@v4
-      #   env:
-      #     cache-name: cache-node-modules
-      #   with:
-      #     # npm cache files are stored in `~/.npm` on Linux/macOS
-      #     path: ~/.npm
-      #     save-always: 'true'
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-
       - name: Install Node.js dependencies
         run: |
           npm cache clean --force
@@ -96,6 +94,9 @@ jobs:
           VITE_STRIPE_PUBLIC_KEY: ${{ vars.STRIPE_PUBLIC_KEY }}
           VITE_APPLE_OAUTH_CLIENT_ID: ${{ vars.APPLE_OAUTH_CLIENT_ID }}
           VITE_GOOGLE_OAUTH_CLIENT_ID_IOS: ${{ vars.GOOGLE_OAUTH_CLIENT_ID_IOS }}
+          VITE_ACCOUNT_CENTER_URL: ${{ vars.ACCOUNT_CENTER_URL }}
+          VITE_FUND_URL: ${{ vars.FUND_URL }}
+          VITE_VERIFY_URL: ${{ vars.VERIFY_URL }}
 
       - name: Extracting Google Service plist
         run: |
@@ -151,12 +152,9 @@ jobs:
           APPLICATION_ID_RESOURCE_ID: ${{ env.IOS_APP_APPLE_ID }}
         run: |
           python -m pip install codemagic-cli-tools
-
           LATEST_APPSTORE_BUILD_NUMBER=$(app-store-connect get-latest-build-number "$APPLICATION_ID_RESOURCE_ID" | awk '{print $1 + 1}')
-
           echo "LATEST_APPSTORE_BUILD_NUMBER=$LATEST_APPSTORE_BUILD_NUMBER" >> $GITHUB_OUTPUT
           echo "LATEST_APPSTORE_BUILD_NUMBER=$LATEST_APPSTORE_BUILD_NUMBER" >> $GITHUB_ENV
-
           app-store-connect get-latest-app-store-build-number "$APPLICATION_ID_RESOURCE_ID"
           app-store-connect get-latest-testflight-build-number "$APPLICATION_ID_RESOURCE_ID"
 
@@ -180,13 +178,10 @@ jobs:
         run: |
           npm run build:icons
 
-      # On Pre-Relase
-
-      # On Relase
       - name: Build and archiving the app
         run: |
           cd ios/App
-          xcodebuild -scheme App -archivePath ./Actions.xcarchive -configuration Release archive -workspace ./App.xcworkspace PROVISIONING_PROFILE="${{env.MOBILE_PROVISIONING_UUID}}"
+          xcodebuild -scheme App -archivePath ./Actions.xcarchive -configuration Release -workspace ./App.xcworkspace PROVISIONING_PROFILE="${{env.MOBILE_PROVISIONING_UUID}}" clean archive
 
       - name: Exporting archive for releasing to Appstore (.IPA)
         run: |
@@ -218,7 +213,7 @@ jobs:
 
   deploy-appstore:
     name: Deploy to Apple Appstore
-    runs-on: macos-latest
+    runs-on: macos-14
     if: github.event.release.prerelease != true
     needs: [build-ios]
     env:

.husky/pre-push

@@ -0,0 +1 @@
+npm run typecheck && npm run build

.storybook/preview.tsx

@@ -1,6 +1,7 @@
-import React from 'react';
-import type { Preview } from '@storybook/react';
 import { CssBaseline, ThemeProvider } from '@mui/material';
+import type { Preview } from '@storybook/react';
+import React from 'react';
+
 import { theme } from '../material.theme';
 import '../src/styles/icons.scss';
 import '../src/styles/tailwind.scss';
@@ -25,4 +26,4 @@ const preview: Preview = {
   },
 };
 
-export default preview;
+export default preview;

.storybook/withRouter.tsx

@@ -3,4 +3,4 @@ import { MemoryRouter } from 'react-router-dom';
 
 export const withRouter = (story) => (
   <MemoryRouter>{story()}</MemoryRouter>
-);
+);

android/app/capacitor.build.gradle

@@ -10,7 +10,6 @@ android {
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-community-apple-sign-in')
-    implementation project(':capacitor-firebase-crashlytics')
     implementation project(':capacitor-firebase-messaging')
     implementation project(':capacitor-action-sheet')
     implementation project(':capacitor-app')

android/capacitor.settings.gradle

@@ -5,9 +5,6 @@ project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/
 include ':capacitor-community-apple-sign-in'
 project(':capacitor-community-apple-sign-in').projectDir = new File('../node_modules/@capacitor-community/apple-sign-in/android')
 
-include ':capacitor-firebase-crashlytics'
-project(':capacitor-firebase-crashlytics').projectDir = new File('../node_modules/@capacitor-firebase/crashlytics/android')
-
 include ':capacitor-firebase-messaging'
 project(':capacitor-firebase-messaging').projectDir = new File('../node_modules/@capacitor-firebase/messaging/android')
 

capacitor.config.ts

@@ -4,7 +4,6 @@ const config: CapacitorConfig = {
   appId: 'jp.socious.network',
   appName: 'Socious',
   webDir: 'dist',
-  bundledWebRuntime: false,
   server: {
     hostname: 'app.socious.io',
     androidScheme: 'https',

cypress.config.ts

@@ -1,9 +1,15 @@
 import { defineConfig } from 'cypress';
+import dotenv from 'dotenv';
+
+dotenv.config();
 
 export default defineConfig({
   e2e: {
     setupNodeEvents(on, config) {
-      // implement node event listeners here
+      config.env.api_server = process.env.VITE_BASE_URL;
+      config.env.app_url = process.env.VITE_APP_URL;
+
+      return config;
     },
   },
 });

cypress/e2e/authentication/constants.ts

@@ -1,6 +1,6 @@
 //Server
-export const API_SERVER = Cypress.env('api_server') || 'https://dev.socious.io/api/v2';
-export const APP_URL = Cypress.env('app_url') || 'http://localhost:3000';
+export const API_SERVER = Cypress.env('api_server');
+export const APP_URL = Cypress.env('app_url');
 
 //Credentials
 export const VALID_EMAIL = 'valid_email@gmail.com';