fix: expo bug

OneKeyHQ · Dec 27, 2024 · 17bc157 · 17bc157
1 parent 03c5059
commit 17bc157
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 137 deletions.
diff --git a/apps/mobile/app.json b/apps/mobile/app.json
@@ -42,7 +42,8 @@
           "organization": "onekey-bb"
         }
       ],
-      "expo-font"
+      "expo-font",
+      "expo-secure-store"
     ]
   }
 }
diff --git a/apps/mobile/ios/OneKeyWallet.xcodeproj/project.pbxproj b/apps/mobile/ios/OneKeyWallet.xcodeproj/project.pbxproj
@@ -416,7 +416,9 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-OneKeyWallet/Pods-OneKeyWallet-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/EXApplication/ExpoApplication_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/ExpoConstants_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView/JXCategoryView.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/JXPagingView/JXPagerView.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
@@ -427,7 +429,9 @@
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoApplication_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoConstants_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JXCategoryView.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JXPagerView.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",

diff --git a/apps/mobile/ios/Podfile.lock b/apps/mobile/ios/Podfile.lock
@@ -9,14 +9,14 @@ PODS:
     - CocoaLumberjack/Core (= 3.8.1)
   - CocoaLumberjack/Core (3.8.1)
   - DoubleConversion (1.1.6)
-  - EXApplication (5.8.3):
+  - EXApplication (5.8.4):
     - ExpoModulesCore
   - EXBarCodeScanner (12.9.3):
     - EXImageLoader
     - ExpoModulesCore
     - ZXingObjC/OneD
     - ZXingObjC/PDF417
-  - EXConstants (15.4.5):
+  - EXConstants (15.4.6):
     - ExpoModulesCore
   - EXFont (11.10.3):
     - ExpoModulesCore
@@ -63,7 +63,7 @@ PODS:
     - ReactCommon/turbomodule/core
   - ExpoNativeExtensions (0.0.3):
     - ExpoModulesCore
-  - ExpoSecureStore (12.5.0):
+  - ExpoSecureStore (12.8.1):
     - ExpoModulesCore
   - ExpoSharing (11.10.0):
     - ExpoModulesCore
@@ -1707,9 +1707,9 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   CocoaLumberjack: 5c7e64cdb877770859bddec4d3d5a0d7c9299df9
   DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
-  EXApplication: 137189a3f149b4e8e546884629392c3efc94cbd3
+  EXApplication: 16bcea16789221bd566e64b5ea2608cf7756b005
   EXBarCodeScanner: d59fd943cebee3f913ebf4ffde0d05d344da8b78
-  EXConstants: 988aa430ca0f76b43cd46b66e7fae3287f9cc2fc
+  EXConstants: a5f6276e565d98f9eb4280f81241fc342d641590
   EXFont: f20669cb266ef48b004f1eb1f2b20db96cd1df9f
   EXImageLoader: 03063370bc06ea1825713d3f55fe0455f7c88d04
   EXNotifications: e11f0e9a5b657c064a481a5d522f3bc5a07bf7cd
@@ -1729,7 +1729,7 @@ SPEC CHECKSUMS:
   ExpoLocalization: 2d5f47577d67ce991ebdd951edf14fe1db85fa06
   ExpoModulesCore: 370096473359f5f6aade0871400d063333747719
   ExpoNativeExtensions: 6c442ddce49ea2d1780e56224b222e5b103193f1
-  ExpoSecureStore: 5372610a4bbcf5e50fafbe6f38f8d9c22edf8253
+  ExpoSecureStore: c84ae37d1c36f38524d289c67c3a2e3fc56f1108
   ExpoSharing: 752ad6ae2b693de9cd4e7fddb78297bdc658b815
   ExpoWebBrowser: e31c97230ea93b51a2a74c6c2381b0d4fca5698c
   EXScreenCapture: d23d01882ce614ba2a341f9fe4bf4a9559830d92

diff --git a/apps/mobile/package.json b/apps/mobile/package.json
@@ -54,10 +54,11 @@
     "burnt": "0.12.2",
     "expo": "50.0.20",
     "expo-apple-authentication": "~6.3.0",
-    "expo-application": "5.8.3",
+    "expo-application": "~5.8.4",
     "expo-barcode-scanner": "12.9.3",
     "expo-blur": "12.9.1",
     "expo-clipboard": "5.0.1",
+    "expo-constants": "~15.4.6",
     "expo-crypto": "~12.8.1",
     "expo-device": "5.9.3",
     "expo-font": "~11.10.3",
@@ -67,12 +68,12 @@
     "expo-intent-launcher": "^10.5.2",
     "expo-keep-awake": "12.8.2",
     "expo-linear-gradient": "12.7.1",
-    "expo-linking": "^5.0.2",
+    "expo-linking": "~6.2.2",
     "expo-local-authentication": "13.6.0",
     "expo-localization": "14.5.0",
     "expo-notifications": "0.27.6",
     "expo-screen-capture": "5.8.0",
-    "expo-secure-store": "12.5.0",
+    "expo-secure-store": "~12.8.1",
     "expo-sharing": "11.10.0",
     "expo-splash-screen": "0.26.4",
     "expo-status-bar": "~1.6.0",

diff --git a/packages/kit/src/views/Prime/pages/PrimeDashboard/PrimeDashboard.tsx b/packages/kit/src/views/Prime/pages/PrimeDashboard/PrimeDashboard.tsx
@@ -13,10 +13,10 @@ import {
   YStack,
 } from '@onekeyhq/components';
 import { ListItem } from '@onekeyhq/kit/src/components/ListItem';
+import useAppNavigation from '@onekeyhq/kit/src/hooks/useAppNavigation';
 import platformEnv from '@onekeyhq/shared/src/platformEnv';
 import timerUtils from '@onekeyhq/shared/src/utils/timerUtils';
 
-import useAppNavigation from '@onekeyhq/kit/src/hooks/useAppNavigation';
 import { useFetchPrimeUserInfo } from '../../hooks/useFetchPrimeUserInfo';
 import { usePrimeAuth } from '../../hooks/usePrimeAuth';
 
@@ -228,7 +228,7 @@ export default function PrimeDashboard() {
           </Stack>
           <Divider />
           <PrimeBenefitsList />
-          <XStack>
+          <XStack flexWrap="wrap">
             <Button
               onPress={() => {
                 void loginLegacy();

diff --git a/packages/kit/src/views/Prime/pages/PrimeDashboard/PrimeUserInfo.tsx b/packages/kit/src/views/Prime/pages/PrimeDashboard/PrimeUserInfo.tsx
@@ -9,19 +9,27 @@ export function PrimeUserInfo() {
   return (
     <XStack
       px="$4"
+      py="$3"
       mb="$5"
-      h="$12"
       alignItems="center"
       borderColor="$borderSubdued"
       borderWidth={1}
       borderRadius="$3"
+      flexWrap="wrap"
     >
       <Icon name="FolderUserOutline" color="$iconSubdued" />
-      <SizableText mx="$2" size="$bodyMdMedium">
-        {user?.email}
-      </SizableText>
-      <Stack flex={1} />
-      <Badge badgeType="warning" badgeSize="sm">
+      <Stack flex={1}>
+        <SizableText
+          mx="$2"
+          size="$bodyMdMedium"
+          ellipse
+          ellipsizeMode="middle"
+        >
+          test_long_email_address_for_testing_ellipsis_mode
+          {user?.email}
+        </SizableText>
+      </Stack>
+      {/* <Badge badgeType="warning" badgeSize="sm">
         Prime
       </Badge>
       <Badge badgeType="critical" badgeSize="sm">
@@ -32,7 +40,7 @@ export function PrimeUserInfo() {
       </Badge>
       <Badge badgeType="success" badgeSize="sm">
         Prime
-      </Badge>
+      </Badge> */}
       <Badge badgeType="default" badgeSize="sm">
         Free
       </Badge>