Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expo 52 #1042

Closed
wants to merge 4 commits into from
+3,335 −2,943
Closed

Expo 52 #1042

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
892c32b
Upgrade packages with expo install expo@^52.0.0 --fix
nop33 Dec 12, 2024
f7b8dac
Prebuild & pod install
nop33 Dec 12, 2024
0919a73
Upgrade QR code package
nop33 Dec 12, 2024
7edc8c0
Remove deprecated packages
nop33 Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions apps/desktop-wallet/package.json
View file
Original file line number Diff line number Diff line change
@@ -67,7 +67,6 @@
"@alephium/web3": "1.5.1",
"@alephium/web3-wallet": "1.5.1",
"@electron/notarize": "^1.2.3",
"@json-rpc-tools/utils": "^1.7.6",
"@ledgerhq/devices": "^8.4.4",
"@ledgerhq/hw-transport-webhid": "^6.29.4",
"@ledgerhq/hw-transport-webusb": "^6.29.4",
@@ -78,7 +77,7 @@
"@types/events": "^3.0.0",
"@types/lodash": "^4.14.182",
"@types/node": "^20.14.0",
"@types/react": "~18.2.79",
"@types/react": "~18.3.16",
"@types/react-color": "^3.0.6",
"@types/react-dom": "^18.2.4",
"@types/semver-compare": "^1.0.1",
@@ -126,18 +125,18 @@
"nanoid": "^3.3.8",
"posthog-js": "^1.52.0",
"qrloop": "^1.4.1",
"react": "^18.2.0",
"react": "^18.3.1",
"react-apexcharts": "^1.4.0",
"react-color": "^2.19.3",
"react-confetti": "^6.0.1",
"react-detect-click-outside": "^1.1.2",
"react-dom": "^18.2.0",
"react-dom": "^18.3.1",
"react-hook-form": "^7.42.1",
"react-i18next": "^13.2.1",
"react-idle-timer": "^5.7.2",
"react-is": "^18.2.0",
"react-is": "^18.3.1",
"react-player": "^2.16.0",
"react-qr-code": "^2.0.7",
"react-qr-code": "^2.0.15",
"react-redux": "^8.0.5",
"react-router-dom": "^6.3.0",
"react-scrollbars-custom": "^4.1.1",
8 changes: 4 additions & 4 deletions apps/explorer/package.json
View file
Original file line number Diff line number Diff line change
@@ -53,13 +53,13 @@
"i18next-browser-languagedetector": "^8.0.0",
"lodash": "^4.17.21",
"qrcode.react": "^3.1.0",
"react": "^18.2.0",
"react": "^18.3.1",
"react-apexcharts": "^1.4.0",
"react-dom": "^18.2.0",
"react-dom": "^18.3.1",
"react-i18next": "^13.2.1",
"react-icons": "^4.10.1",
"react-intersection-observer": "^9.10.3",
"react-is": "^18.2.0",
"react-is": "^18.3.1",
"react-middle-ellipsis": "^1.2.1",
"react-page-visibility": "^7.0.0",
"react-router-dom": "^6.3.0",
@@ -74,7 +74,7 @@
"@testing-library/jest-dom": "^5.14.1",
"@types/lodash": "^4.14.182",
"@types/node": "^20.14.0",
"@types/react": "~18.2.79",
"@types/react": "~18.3.16",
"@types/react-dom": "^18.2.4",
"@types/react-page-visibility": "^6.4.1",
"@types/react-router-dom": "^5.3.0",
2 changes: 1 addition & 1 deletion apps/mobile-wallet/android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<data android:scheme="https"/>
</intent>
</queries>
<application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme">
<application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme" android:fullBackupContent="@xml/secure_store_backup_rules" android:dataExtractionRules="@xml/secure_store_data_extraction_rules">
<meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
<meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
<meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
6 changes: 5 additions & 1 deletion apps/mobile-wallet/android/app/src/main/java/org/alephium/wallet/MainActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package org.alephium.wallet
import expo.modules.splashscreen.SplashScreenManager

import android.os.Build
import android.os.Bundle
@@ -15,7 +16,10 @@ class MainActivity : ReactActivity() {
// Set the theme to AppTheme BEFORE onCreate to support
// coloring the background, status bar, and navigation bar.
// This is required for expo-splash-screen.
setTheme(R.style.AppTheme);
// setTheme(R.style.AppTheme);
// @generated begin expo-splashscreen - expo prebuild (DO NOT MODIFY) sync-f3ff59a738c56c9a6119210cb55f0b613eb8b6af
SplashScreenManager.registerOnActivity(this)
// @generated end expo-splashscreen
super.onCreate(null)
}

Binary file added apps/mobile-wallet/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/mobile-wallet/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/mobile-wallet/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/mobile-wallet/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/mobile-wallet/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions apps/mobile-wallet/android/app/src/main/res/drawable/ic_launcher_background.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/splashscreen_background"/>
<item>
<bitmap android:gravity="center" android:src="@drawable/splashscreen_logo"/>
</item>
</layer-list>
6 changes: 4 additions & 2 deletions apps/mobile-wallet/android/app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,9 @@
<item name="android:textColorHint">#c8c8c8</item>
<item name="android:textColor">@android:color/black</item>
</style>
<style name="Theme.App.SplashScreen" parent="AppTheme">
<item name="android:windowBackground">@drawable/splashscreen</item>
<style name="Theme.App.SplashScreen" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">@color/splashscreen_background</item>
<item name="windowSplashScreenAnimatedIcon">@drawable/splashscreen_logo</item>
<item name="postSplashScreenTheme">@style/AppTheme</item>
</style>
</resources>
17 changes: 7 additions & 10 deletions apps/mobile-wallet/app.config.js
View file
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ export default {
'expo-build-properties',
{
ios: {
deploymentTarget: '13.4',
deploymentTarget: '15.1',
newArchEnabled: false,
flipper: false // https://docs.expo.dev/guides/using-flipper/
},
@@ -115,16 +115,13 @@ export default {
}
],
[
'expo-barcode-scanner',
'expo-font',
{
cameraPermission:
'The app requires access to your camera to scan QR codes for sending transactions, connecting to WalletConnect and importing a wallet.'
}
],
[
"expo-font",
{
"fonts": ["./assets/fonts/Inter-Medium.ttf", "./assets/fonts/Inter-SemiBold.ttf", "./assets/fonts/Inter-Bold.ttf"]
fonts: [
'./assets/fonts/Inter-Medium.ttf',
'./assets/fonts/Inter-SemiBold.ttf',
'./assets/fonts/Inter-Bold.ttf'
]
}
],
'expo-localization',
19 changes: 13 additions & 6 deletions apps/mobile-wallet/ios/Alephium.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
@@ -298,13 +298,16 @@
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoDevice/ExpoDevice_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoLocalization/ExpoLocalization_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Sentry/Sentry.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-launcher/EXDevLauncher.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-menu/EXDevMenu.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios/LottiePrivacyInfo.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native/Lottie_React_Native_Privacy.bundle",
);
@@ -316,13 +319,16 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoDevice_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoLocalization_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Sentry.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevLauncher.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevMenu.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/LottiePrivacyInfo.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Lottie_React_Native_Privacy.bundle",
);
@@ -402,7 +408,7 @@
"FB_SONARKIT_ENABLED=1",
);
INFOPLIST_FILE = Alephium/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = (
@@ -433,7 +439,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = Z3J8P4JW24;
INFOPLIST_FILE = Alephium/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = (
@@ -513,6 +519,7 @@
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
USE_HERMES = true;
};
name = Debug;
20 changes: 20 additions & 0 deletions .../mobile-wallet/ios/Alephium/Images.xcassets/SplashScreenBackground.colorset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors": [
{
"color": {
"components": {
"alpha": "1.000",
"blue": "0.00000000000000",
"green": "0.00000000000000",
"red": "0.00000000000000"
},
"color-space": "srgb"
},
"idiom": "universal"
}
],
"info": {
"version": 1,
"author": "expo"
}
}
41 changes: 41 additions & 0 deletions apps/mobile-wallet/ios/Alephium/Images.xcassets/SplashScreenLogo.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"images": [
{
"idiom": "universal",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"filename": "image.png",
"scale": "1x"
},
{
"idiom": "universal",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"filename": "image@2x.png",
"scale": "2x"
},
{
"idiom": "universal",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"filename": "image@3x.png",
"scale": "3x"
}
],
"info": {
"version": 1,
"author": "expo"
}
}
Binary file added .../mobile-wallet/ios/Alephium/Images.xcassets/SplashScreenLogo.imageset/image.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...bile-wallet/ios/Alephium/Images.xcassets/SplashScreenLogo.imageset/image@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...bile-wallet/ios/Alephium/Images.xcassets/SplashScreenLogo.imageset/image@3x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 10 additions & 9 deletions apps/mobile-wallet/ios/Alephium/SplashScreen.storyboard
View file
Original file line number Diff line number Diff line change
@@ -18,25 +18,19 @@
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" image="SplashScreenBackground" translatesAutoresizingMaskIntoConstraints="NO" id="EXPO-SplashScreenBackground" userLabel="SplashScreenBackground">
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
</imageView>
<imageView id="EXPO-SplashScreen" userLabel="SplashScreen" image="SplashScreen" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" clipsSubviews="true" userInteractionEnabled="false" translatesAutoresizingMaskIntoConstraints="false">
<imageView id="EXPO-SplashScreen" userLabel="SplashScreenLogo" image="SplashScreenLogo" contentMode="scaleAspectFit" clipsSubviews="true" userInteractionEnabled="false" translatesAutoresizingMaskIntoConstraints="false">
<rect key="frame" x="0" y="0" width="414" height="736"/>
</imageView>
</subviews>
<constraints>
<constraint firstItem="EXPO-SplashScreenBackground" firstAttribute="top" secondItem="EXPO-ContainerView" secondAttribute="top" id="1gX-mQ-vu6"/>
<constraint firstItem="EXPO-SplashScreenBackground" firstAttribute="leading" secondItem="EXPO-ContainerView" secondAttribute="leading" id="6tX-OG-Sck"/>
<constraint firstItem="EXPO-SplashScreenBackground" firstAttribute="trailing" secondItem="EXPO-ContainerView" secondAttribute="trailing" id="ABX-8g-7v4"/>
<constraint firstItem="EXPO-SplashScreenBackground" firstAttribute="bottom" secondItem="EXPO-ContainerView" secondAttribute="bottom" id="jkI-2V-eW5"/>
<constraint firstItem="EXPO-SplashScreen" firstAttribute="top" secondItem="EXPO-ContainerView" secondAttribute="top" id="2VS-Uz-0LU"/>
<constraint firstItem="EXPO-SplashScreen" firstAttribute="leading" secondItem="EXPO-ContainerView" secondAttribute="leading" id="LhH-Ei-DKo"/>
<constraint firstItem="EXPO-SplashScreen" firstAttribute="trailing" secondItem="EXPO-ContainerView" secondAttribute="trailing" id="I6l-TP-6fn"/>
<constraint firstItem="EXPO-SplashScreen" firstAttribute="bottom" secondItem="EXPO-ContainerView" secondAttribute="bottom" id="nbp-HC-eaG"/>
<constraint firstItem="EXPO-SplashScreen" firstAttribute="top" secondItem="EXPO-ContainerView" secondAttribute="top" id="83fcb9b545b870ba44c24f0feeb116490c499c52"/>
<constraint firstItem="EXPO-SplashScreen" firstAttribute="leading" secondItem="EXPO-ContainerView" secondAttribute="leading" id="61d16215e44b98e39d0a2c74fdbfaaa22601b12c"/>
<constraint firstItem="EXPO-SplashScreen" firstAttribute="trailing" secondItem="EXPO-ContainerView" secondAttribute="trailing" id="f934da460e9ab5acae3ad9987d5b676a108796c1"/>
<constraint firstItem="EXPO-SplashScreen" firstAttribute="bottom" secondItem="EXPO-ContainerView" secondAttribute="bottom" id="d6a0be88096b36fb132659aa90203d39139deda9"/>
</constraints>
<viewLayoutGuide key="safeArea" id="Rmq-lb-GrQ"/>
<color key="backgroundColor" name="SplashScreenBackground"/>
<color key="backgroundColor" name="SplashScreenBackground"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="EXPO-PLACEHOLDER-1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -47,5 +41,12 @@
<resources>
<image name="SplashScreenBackground" width="1" height="1"/>
<image name="SplashScreen" width="414" height="736"/>
<image name="SplashScreenLogo" width="414" height="736"/>
<namedColor name="SplashScreenBackground">
<color alpha="1.000" blue="0.00000000000000" green="0.00000000000000" red="0.00000000000000" customColorSpace="sRGB" colorSpace="custom"/>
</namedColor>
<namedColor name="SplashScreenBackground">
<color alpha="1.000" blue="0.00000000000000" green="0.00000000000000" red="0.00000000000000" customColorSpace="sRGB" colorSpace="custom"/>
</namedColor>
</resources>
</document>
Loading