Merge pull request #310 from owallet-io/feat/update-sdk

Feat/update sdk
owallet-io · Oct 14, 2024 · 764d356 · 764d356
2 parents 47a1935 + 3ee6d85
commit 764d356
Show file tree

Hide file tree

Showing 16 changed files with 412 additions and 264 deletions.
diff --git a/.github/workflows/release-code-push.yaml b/.github/workflows/release-code-push.yaml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Install Dependencies
         if: steps.yarn-cache.outputs.cache-hit != 'true'
-        run: yarn --ignore-platform --ignore-scripts
+        run: yarn
 
       - name: Install mobile packages
         working-directory: apps/mobile

diff --git a/.github/workflows/release-mobile-app.yaml b/.github/workflows/release-mobile-app.yaml
@@ -6,9 +6,97 @@ on:
   workflow_dispatch:
 
 jobs:
-  release-android-mobile:
-    name: release-android-mobile
-    runs-on: macos-13 #orai-self-hosted
+  # release-android-mobile:
+  #   name: release-android-mobile
+  #   runs-on: macos-13 #orai-self-hosted
+  #   timeout-minutes: 120 # Set the timeout to 120 minutes
+  #   strategy:
+  #     matrix:
+  #       node-version: [20.17.0]
+  #   steps:
+  #     - name: Check tag name
+  #       if: contains(github.ref, 'cp')
+  #       run: |
+  #         exit 1
+  #     - name: Cancel Previous Runs
+  #       uses: styfle/[email protected]
+  #       with:
+  #         access_token: ${{ github.token }}
+  #     - name: Use Node.js ${{ matrix.node-version }}
+  #       uses: actions/setup-node@v3
+  #       with:
+  #         node-version: ${{ matrix.node-version }}
+  #     - name: Get yarn cache directory path
+  #       id: yarn-cache-dir-path
+  #       run: echo "::set-output name=dir::$(yarn cache dir)"
+  #     - name: Restore node_modules from cache
+  #       uses: actions/cache@v2
+  #       id: yarn-cache
+  #       with:
+  #         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+  #         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-yarn-
+  #     - name: Checkout submodule repo
+  #       uses: actions/checkout@v3
+  #     - name: Install dependencies # install project deps with --frozen-lockfile to make sure we will have the same packages version ( very recommended  on running yarn install on ci)
+  #       run: yarn install --frozen-lockfile
+  #     - name: Install mobile packages
+  #       working-directory: apps/mobile
+  #       run: yarn --silent
+  #     - name: restore lerna
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: "**/node_modules"
+  #         key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+  #     - name: Build Libs
+  #       run: yarn build:libs
+  #     - name: Build provider
+  #       working-directory: apps/mobile
+  #       run: yarn build:provider
+  #       env:
+  #         SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
+  #         API_KEY_ETH_SCAN: ${{ secrets.API_KEY_ETH_SCAN }}
+  #         API_KEY_BSC_SCAN: ${{ secrets.API_KEY_BSC_SCAN }}
+  #         API_KEY: ${{ secrets.API_KEY_FIREBASE }}
+  #         SENDER_ID: ${{ secrets.SENDER_ID_FIREBASE }}
+  #         APP_ID: ${{ secrets.APP_ID_FIREBASE }}
+  #     - name: Setup Ruby
+  #       uses: ruby/setup-ruby@v1
+  #       with:
+  #         ruby-version: 2.6.10
+  #         bundler-cache: true
+  #     - name: Setup JDK 11
+  #       uses: actions/setup-java@v3
+  #       with:
+  #         java-version: "11"
+  #         distribution: "temurin"
+  #         cache: gradle
+  #     - name: Grant execute permission for gradlew
+  #       working-directory: apps/mobile/android
+  #       run: chmod +x gradlew
+  #     - name: Decode Keystore File
+  #       uses: timheuer/base64-to-file@v1
+  #       id: android_keystore
+  #       with:
+  #         fileName: "OWalletKeystore"
+  #         encodedString: ${{ secrets.KEYSTORE_FILE }}
+  #         fileDir: "apps/mobile/android/fastlane"
+  #     - name: Setup Fastlane android
+  #       working-directory: apps/mobile/android/fastlane
+  #       run: cd .. && bundle update && fastlane release
+  #       env:
+  #         JSON_KEY_DATA: ${{ secrets.GOOGLE_ACCOUNT_SERVICE }}
+  #         DISCORD_HOOK_ID: ${{ secrets.DISCORD_MOBILE_WEBHOOK_ID }}
+  #         DISCORD_HOOK_TOKEN: ${{ secrets.DISCORD_MOBILE_WEBHOOK_TOKEN }}
+  #         ALIAS: ${{ secrets.ALIAS }}
+  #         PASS_KEY_STORE: ${{ secrets.PASS_KEY_STORE }}
+  #         PASS_ALIAS_KEY_STORE: ${{ secrets.PASS_KEY_STORE }}
+  #         SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
+  #         FILE_PATH: "/OWalletKeystore"
+  release-ios-mobile:
+    name: release-ios-mobile
+    runs-on: macos-14 #orai-self-hosted
     timeout-minutes: 120 # Set the timeout to 120 minutes
     strategy:
       matrix:
@@ -26,6 +114,9 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
+      - name: Increase Node.js memory limit to 7GB
+        run: |
+          export NODE_OPTIONS="--max-old-space-size=7168"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -44,152 +135,61 @@ jobs:
       - name: Install mobile packages
         working-directory: apps/mobile
         run: yarn --silent
+      - name: Build mobile images
+        working-directory: apps/mobile
+        run: yarn images
       - name: restore lerna
         uses: actions/cache@v3
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Build Libs
         run: yarn build:libs
-      - name: Build provider
+      #      - name: Build provider
+      #        working-directory: apps/mobile
+      #        run: yarn build:provider
+
+      - name: Bundle mobile
         working-directory: apps/mobile
-        run: yarn build:provider
+        run: yarn build:ios
         env:
           SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
           API_KEY_ETH_SCAN: ${{ secrets.API_KEY_ETH_SCAN }}
           API_KEY_BSC_SCAN: ${{ secrets.API_KEY_BSC_SCAN }}
           API_KEY: ${{ secrets.API_KEY_FIREBASE }}
           SENDER_ID: ${{ secrets.SENDER_ID_FIREBASE }}
           APP_ID: ${{ secrets.APP_ID_FIREBASE }}
+          API_KEY_KADO: ${{ secrets.API_KEY_KADO }}
+          MIX_PANEL_TOKEN: ${{ secrets.MIX_PANEL_TOKEN }}
+          BYTE_BREW_SDK_KEY_IOS: ${{ secrets.BYTE_BREW_SDK_KEY_IOS }}
+          BYTE_BREW_ID_IOS: ${{ secrets.BYTE_BREW_ID_IOS }}
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6.10
+          ruby-version: 3.2
           bundler-cache: true
-      - name: Setup JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: "11"
-          distribution: "temurin"
-          cache: gradle
-      - name: Grant execute permission for gradlew
-        working-directory: apps/mobile/android
-        run: chmod +x gradlew
-      - name: Decode Keystore File
-        uses: timheuer/base64-to-file@v1
-        id: android_keystore
-        with:
-          fileName: "OWalletKeystore"
-          encodedString: ${{ secrets.KEYSTORE_FILE }}
-          fileDir: "apps/mobile/android/fastlane"
-      - name: Setup Fastlane android
-        working-directory: apps/mobile/android/fastlane
+      - name: Pod install
+        working-directory: apps/mobile
+        run: yarn pod:install
+      - name: Setup Fastlane ios
+        working-directory: apps/mobile/ios/fastlane
         run: cd .. && bundle update && fastlane release
         env:
-          JSON_KEY_DATA: ${{ secrets.GOOGLE_ACCOUNT_SERVICE }}
           DISCORD_HOOK_ID: ${{ secrets.DISCORD_MOBILE_WEBHOOK_ID }}
           DISCORD_HOOK_TOKEN: ${{ secrets.DISCORD_MOBILE_WEBHOOK_TOKEN }}
-          ALIAS: ${{ secrets.ALIAS }}
-          PASS_KEY_STORE: ${{ secrets.PASS_KEY_STORE }}
-          PASS_ALIAS_KEY_STORE: ${{ secrets.PASS_KEY_STORE }}
+          APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
+          APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
+          APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
+          APP_STORE_CONNECT_API_KEY_DURATION: 1200
+          APP_STORE_CONNECT_API_KEY_IN_HOUSE: false
+          APP_IDENTIFIER: io.orai.owallet
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }}
+          TEAM_ID: ${{ secrets.TEAM_ID }}
+          MATCH_GIT_URL: "https://github.com/oraichain/fastlane.git"
+          KEYCHAIN_PASSWORD: ${{ secrets.PASS_KEY_STORE }}
+          MATCH_PASSWORD: ${{ secrets.PASS_KEY_STORE }}
+          KEYCHAIN_NAME: "login"
+          MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
           SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
-          FILE_PATH: "/OWalletKeystore"
-#  release-ios-mobile:
-#    name: release-ios-mobile
-#    runs-on: macos-14 #orai-self-hosted
-#    timeout-minutes: 120 # Set the timeout to 120 minutes
-#    strategy:
-#      matrix:
-#        node-version: [20.17.0]
-#    steps:
-#      - name: Check tag name
-#        if: contains(github.ref, 'cp')
-#        run: |
-#          exit 1
-#      - name: Cancel Previous Runs
-#        uses: styfle/[email protected]
-#        with:
-#          access_token: ${{ github.token }}
-#      - name: Use Node.js ${{ matrix.node-version }}
-#        uses: actions/setup-node@v3
-#        with:
-#          node-version: ${{ matrix.node-version }}
-#      - name: Increase Node.js memory limit to 7GB
-#        run: |
-#          export NODE_OPTIONS="--max-old-space-size=7168"
-#      - name: Get yarn cache directory path
-#        id: yarn-cache-dir-path
-#        run: echo "::set-output name=dir::$(yarn cache dir)"
-#      - name: Restore node_modules from cache
-#        uses: actions/cache@v2
-#        id: yarn-cache
-#        with:
-#          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-#          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-#          restore-keys: |
-#            ${{ runner.os }}-yarn-
-#      - name: Checkout submodule repo
-#        uses: actions/checkout@v3
-#      - name: Install dependencies # install project deps with --frozen-lockfile to make sure we will have the same packages version ( very recommended  on running yarn install on ci)
-#        run: yarn install --frozen-lockfile
-#      - name: Install mobile packages
-#        working-directory: apps/mobile
-#        run: yarn --silent
-#      - name: Build mobile images
-#        working-directory: apps/mobile
-#        run: yarn images
-#      - name: restore lerna
-#        uses: actions/cache@v3
-#        with:
-#          path: "**/node_modules"
-#          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
-#      - name: Build Libs
-#        run: yarn build:libs
-##      - name: Build provider
-##        working-directory: apps/mobile
-##        run: yarn build:provider
-#
-#      - name: Bundle mobile
-#        working-directory: apps/mobile
-#        run: yarn build:ios
-#        env:
-#          SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
-#          API_KEY_ETH_SCAN: ${{ secrets.API_KEY_ETH_SCAN }}
-#          API_KEY_BSC_SCAN: ${{ secrets.API_KEY_BSC_SCAN }}
-#          API_KEY: ${{ secrets.API_KEY_FIREBASE }}
-#          SENDER_ID: ${{ secrets.SENDER_ID_FIREBASE }}
-#          APP_ID: ${{ secrets.APP_ID_FIREBASE }}
-#          API_KEY_KADO: ${{ secrets.API_KEY_KADO }}
-#          MIX_PANEL_TOKEN: ${{ secrets.MIX_PANEL_TOKEN }}
-#          BYTE_BREW_SDK_KEY_IOS: ${{ secrets.BYTE_BREW_SDK_KEY_IOS }}
-#          BYTE_BREW_ID_IOS: ${{ secrets.BYTE_BREW_ID_IOS }}
-#      - name: Setup Ruby
-#        uses: ruby/setup-ruby@v1
-#        with:
-#          ruby-version: 3.2
-#          bundler-cache: true
-#      - name: Pod install
-#        working-directory: apps/mobile
-#        run: yarn pod:install
-#      - name: Setup Fastlane ios
-#        working-directory: apps/mobile/ios/fastlane
-#        run: cd .. && bundle update && fastlane release
-#        env:
-#          DISCORD_HOOK_ID: ${{ secrets.DISCORD_MOBILE_WEBHOOK_ID }}
-#          DISCORD_HOOK_TOKEN: ${{ secrets.DISCORD_MOBILE_WEBHOOK_TOKEN }}
-#          APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
-#          APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
-#          APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
-#          APP_STORE_CONNECT_API_KEY_DURATION: 1200
-#          APP_STORE_CONNECT_API_KEY_IN_HOUSE: false
-#          APP_IDENTIFIER: io.orai.owallet
-#          APPLE_ID: ${{ secrets.APPLE_ID }}
-#          ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }}
-#          TEAM_ID: ${{ secrets.TEAM_ID }}
-#          MATCH_GIT_URL: "https://github.com/oraichain/fastlane.git"
-#          KEYCHAIN_PASSWORD: ${{ secrets.PASS_KEY_STORE }}
-#          MATCH_PASSWORD: ${{ secrets.PASS_KEY_STORE }}
-#          KEYCHAIN_NAME: "login"
-#          MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
-#          SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
-#          MIX_PANEL_TOKEN: ${{ secrets.MIX_PANEL_TOKEN }}
+          MIX_PANEL_TOKEN: ${{ secrets.MIX_PANEL_TOKEN }}
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/apps/extension/src/pages/sign/index.tsx b/apps/extension/src/pages/sign/index.tsx
@@ -110,7 +110,6 @@ export const SignPage: FunctionComponent = observer(() => {
     signInteractionStore,
     accountStore,
     queriesStore,
-    priceStore,
   } = useStore();
 
   const [signer, setSigner] = useState("");
@@ -317,18 +316,6 @@ export const SignPage: FunctionComponent = observer(() => {
     : signDocJson;
 
   return (
-    // <HeaderLayout
-    //   showChainName={alternativeTitle == null}
-    //   alternativeTitle={alternativeTitle != null ? alternativeTitle : undefined}
-    //   canChangeChainInfo={false}
-    //   onBackButton={
-    //     interactionInfo.interactionInternal
-    //       ? () => {
-    //           history.goBack();
-    //         }
-    //       : undefined
-    //   }
-    // >
     <div
       style={{
         height: "100%",
@@ -558,7 +545,6 @@ export const SignPage: FunctionComponent = observer(() => {
           </div>
         )
       }
-      {/* </HeaderLayout> */}
     </div>
   );
 });
diff --git a/apps/mobile/android/app/release/output-metadata.json b/apps/mobile/android/app/release/output-metadata.json
@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 201,
+      "versionCode": 202,
       "versionName": "3.1.15",
       "outputFile": "app-release.apk"
     }

diff --git a/apps/mobile/ios/fastlane/Fastfile b/apps/mobile/ios/fastlane/Fastfile
@@ -82,14 +82,14 @@ end
 platform :ios do
   desc "Push a new beta build to TestFlight"
   lane :release do 
-    create_keychain(
-      name: ENV["KEYCHAIN_NAME"],
-      password: ENV["KEYCHAIN_PASSWORD"],
-      default_keychain: true,
-      unlock: true,
-      timeout: 3600,
-      lock_when_sleeps: false
-    )
+    # create_keychain(
+    #   name: ENV["KEYCHAIN_NAME"],
+    #   password: ENV["KEYCHAIN_PASSWORD"],
+    #   default_keychain: true,
+    #   unlock: true,
+    #   timeout: 3600,
+    #   lock_when_sleeps: false
+    # )
     if ENV["MATCH_GIT_BASIC_AUTHORIZATION"]
       match(
         storage_mode:'git',