From 0ac4f0d91d67cf47ab51080f57ce116fedeefca5 Mon Sep 17 00:00:00 2001 From: ignaciosantise Date: Tue, 30 Jan 2024 18:47:53 -0300 Subject: [PATCH] fix: compare lower case addresses (#123) --- .../project.pbxproj | 140 +++++++++--------- .../rn_cli_wallet/android/app/build.gradle | 6 +- .../RNWeb3Wallet.xcodeproj/project.pbxproj | 4 +- wallets/rn_cli_wallet/package.json | 4 +- .../rn_cli_wallet/src/modals/RequestModal.tsx | 1 - .../src/modals/SessionProposalModal.tsx | 2 - .../modals/SessionSendTransactionModal.tsx | 2 - .../src/modals/SessionSignModal.tsx | 1 - .../src/modals/SessionSignTypedDataModal.tsx | 2 - wallets/rn_cli_wallet/src/utils/HelperUtil.ts | 2 +- wallets/rn_cli_wallet/yarn.lock | 4 +- 11 files changed, 86 insertions(+), 82 deletions(-) diff --git a/dapps/W3MEthers5/ios/Web3ModalEthers5.xcodeproj/project.pbxproj b/dapps/W3MEthers5/ios/Web3ModalEthers5.xcodeproj/project.pbxproj index 2f853918..0ff20a8e 100644 --- a/dapps/W3MEthers5/ios/Web3ModalEthers5.xcodeproj/project.pbxproj +++ b/dapps/W3MEthers5/ios/Web3ModalEthers5.xcodeproj/project.pbxproj @@ -8,12 +8,12 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* Web3ModalEthers5Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* Web3ModalEthers5Tests.m */; }; - 12BD7C445622D31809C31ED6 /* libPods-Web3ModalEthers5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C30AB0D3C5D2BA51CBD86C1E /* libPods-Web3ModalEthers5.a */; }; + 06D41806D86BFB7523E51572 /* libPods-Web3ModalEthers5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BE6C8C099C5EA8770DF3AF1 /* libPods-Web3ModalEthers5.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; - CA18D52DD7EBA60A9EC6D316 /* libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD48B77D1A29049CFC7208DD /* libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a */; }; + B8C1EE14CE47BF75575B351B /* libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04C0F3FCF7E266E1BBB6B818 /* libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -30,20 +30,20 @@ 00E356EE1AD99517003FC87E /* Web3ModalEthers5Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Web3ModalEthers5Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* Web3ModalEthers5Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Web3ModalEthers5Tests.m; sourceTree = ""; }; + 04C0F3FCF7E266E1BBB6B818 /* libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07F961A680F5B00A75B9A /* Web3ModalEthers5.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Web3ModalEthers5.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Web3ModalEthers5/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = Web3ModalEthers5/AppDelegate.mm; sourceTree = ""; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Web3ModalEthers5/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Web3ModalEthers5/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Web3ModalEthers5/main.m; sourceTree = ""; }; - 31B93B90637DE3693BE20BDA /* Pods-Web3ModalEthers5.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Web3ModalEthers5.debug.xcconfig"; path = "Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5.debug.xcconfig"; sourceTree = ""; }; - 6190C6550383A227FC7B8C57 /* Pods-Web3ModalEthers5.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Web3ModalEthers5.release.xcconfig"; path = "Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5.release.xcconfig"; sourceTree = ""; }; + 27B1F6FE0F80C6620EC75377 /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Web3ModalEthers5-Web3ModalEthers5Tests.debug.xcconfig"; path = "Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests.debug.xcconfig"; sourceTree = ""; }; + 2BE6C8C099C5EA8770DF3AF1 /* libPods-Web3ModalEthers5.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Web3ModalEthers5.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 57ECF5FC0F0DFCAE8E588E3B /* Pods-Web3ModalEthers5.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Web3ModalEthers5.release.xcconfig"; path = "Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5.release.xcconfig"; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = Web3ModalEthers5/LaunchScreen.storyboard; sourceTree = ""; }; - 915B08F60F3B3C53C6D1672F /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Web3ModalEthers5-Web3ModalEthers5Tests.release.xcconfig"; path = "Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests.release.xcconfig"; sourceTree = ""; }; - B22193ED1D9A4DB146571D50 /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Web3ModalEthers5-Web3ModalEthers5Tests.debug.xcconfig"; path = "Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests.debug.xcconfig"; sourceTree = ""; }; - C30AB0D3C5D2BA51CBD86C1E /* libPods-Web3ModalEthers5.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Web3ModalEthers5.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 92FAEBEFC18B22FD0292C65C /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Web3ModalEthers5-Web3ModalEthers5Tests.release.xcconfig"; path = "Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests.release.xcconfig"; sourceTree = ""; }; + D62501879598074256398030 /* Pods-Web3ModalEthers5.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Web3ModalEthers5.debug.xcconfig"; path = "Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5.debug.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - FD48B77D1A29049CFC7208DD /* libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -51,7 +51,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CA18D52DD7EBA60A9EC6D316 /* libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a in Frameworks */, + B8C1EE14CE47BF75575B351B /* libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -59,7 +59,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 12BD7C445622D31809C31ED6 /* libPods-Web3ModalEthers5.a in Frameworks */, + 06D41806D86BFB7523E51572 /* libPods-Web3ModalEthers5.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -100,8 +100,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - C30AB0D3C5D2BA51CBD86C1E /* libPods-Web3ModalEthers5.a */, - FD48B77D1A29049CFC7208DD /* libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a */, + 2BE6C8C099C5EA8770DF3AF1 /* libPods-Web3ModalEthers5.a */, + 04C0F3FCF7E266E1BBB6B818 /* libPods-Web3ModalEthers5-Web3ModalEthers5Tests.a */, ); name = Frameworks; sourceTree = ""; @@ -140,10 +140,10 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 31B93B90637DE3693BE20BDA /* Pods-Web3ModalEthers5.debug.xcconfig */, - 6190C6550383A227FC7B8C57 /* Pods-Web3ModalEthers5.release.xcconfig */, - B22193ED1D9A4DB146571D50 /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.debug.xcconfig */, - 915B08F60F3B3C53C6D1672F /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.release.xcconfig */, + D62501879598074256398030 /* Pods-Web3ModalEthers5.debug.xcconfig */, + 57ECF5FC0F0DFCAE8E588E3B /* Pods-Web3ModalEthers5.release.xcconfig */, + 27B1F6FE0F80C6620EC75377 /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.debug.xcconfig */, + 92FAEBEFC18B22FD0292C65C /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -155,12 +155,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "Web3ModalEthers5Tests" */; buildPhases = ( - 0F1D22AC2A170524EE2056D8 /* [CP] Check Pods Manifest.lock */, + D00A385E01509BEE779CBF96 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 32BE8859C57903A1D25CA096 /* [CP] Embed Pods Frameworks */, - BE51EA084784C38EDA6A543E /* [CP] Copy Pods Resources */, + 2ABE81D038AF2F7F4272D386 /* [CP] Embed Pods Frameworks */, + 7E484709A5637ABB9C82691C /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -176,13 +176,13 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Web3ModalEthers5" */; buildPhases = ( - 890ACEC7C9C976FD397DF5AA /* [CP] Check Pods Manifest.lock */, + E6CC376DA35A63254E685722 /* [CP] Check Pods Manifest.lock */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - 72AC00DD617666964F1FB087 /* [CP] Embed Pods Frameworks */, - A862D9DDD5393CF063916535 /* [CP] Copy Pods Resources */, + 9E22D650AD53BEAA41BD845A /* [CP] Embed Pods Frameworks */, + 39D3EA2D9AA66C0E3D45CE08 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -265,46 +265,58 @@ shellPath = /bin/sh; shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n"; }; - 0F1D22AC2A170524EE2056D8 /* [CP] Check Pods Manifest.lock */ = { + 2ABE81D038AF2F7F4272D386 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-checkManifestLockResult.txt", + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 39D3EA2D9AA66C0E3D45CE08 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 32BE8859C57903A1D25CA096 /* [CP] Embed Pods Frameworks */ = { + 7E484709A5637ABB9C82691C /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 72AC00DD617666964F1FB087 /* [CP] Embed Pods Frameworks */ = { + 9E22D650AD53BEAA41BD845A /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -321,7 +333,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 890ACEC7C9C976FD397DF5AA /* [CP] Check Pods Manifest.lock */ = { + D00A385E01509BEE779CBF96 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -336,45 +348,33 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Web3ModalEthers5-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - A862D9DDD5393CF063916535 /* [CP] Copy Pods Resources */ = { + E6CC376DA35A63254E685722 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5/Pods-Web3ModalEthers5-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - BE51EA084784C38EDA6A543E /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-resources-${CONFIGURATION}-input-files.xcfilelist", + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Web3ModalEthers5-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Web3ModalEthers5-Web3ModalEthers5Tests/Pods-Web3ModalEthers5-Web3ModalEthers5Tests-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -410,7 +410,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B22193ED1D9A4DB146571D50 /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.debug.xcconfig */; + baseConfigurationReference = 27B1F6FE0F80C6620EC75377 /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -437,7 +437,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 915B08F60F3B3C53C6D1672F /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.release.xcconfig */; + baseConfigurationReference = 92FAEBEFC18B22FD0292C65C /* Pods-Web3ModalEthers5-Web3ModalEthers5Tests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; @@ -461,11 +461,12 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 31B93B90637DE3693BE20BDA /* Pods-Web3ModalEthers5.debug.xcconfig */; + baseConfigurationReference = D62501879598074256398030 /* Pods-Web3ModalEthers5.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = W5R8AG9K22; ENABLE_BITCODE = NO; INFOPLIST_FILE = Web3ModalEthers5/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -488,11 +489,12 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6190C6550383A227FC7B8C57 /* Pods-Web3ModalEthers5.release.xcconfig */; + baseConfigurationReference = 57ECF5FC0F0DFCAE8E588E3B /* Pods-Web3ModalEthers5.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = W5R8AG9K22; INFOPLIST_FILE = Web3ModalEthers5/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -580,7 +582,10 @@ "-DFOLLY_USE_LIBCPP=1", "-DFOLLY_CFG_NO_COROUTINES=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -648,7 +653,10 @@ "-DFOLLY_USE_LIBCPP=1", "-DFOLLY_CFG_NO_COROUTINES=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/wallets/rn_cli_wallet/android/app/build.gradle b/wallets/rn_cli_wallet/android/app/build.gradle index f782cf93..21d3246c 100644 --- a/wallets/rn_cli_wallet/android/app/build.gradle +++ b/wallets/rn_cli_wallet/android/app/build.gradle @@ -78,7 +78,7 @@ android { applicationId "com.walletconnect.web3wallet.rnsample" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 5 + versionCode 6 versionName "1.0" } signingConfigs { @@ -101,6 +101,10 @@ android { proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } } + packagingOptions { + // Should prevent clashes with other libraries that use OpenSSL + pickFirst '**/libcrypto.so' + } } dependencies { diff --git a/wallets/rn_cli_wallet/ios/RNWeb3Wallet.xcodeproj/project.pbxproj b/wallets/rn_cli_wallet/ios/RNWeb3Wallet.xcodeproj/project.pbxproj index 7ba0036e..8e334217 100644 --- a/wallets/rn_cli_wallet/ios/RNWeb3Wallet.xcodeproj/project.pbxproj +++ b/wallets/rn_cli_wallet/ios/RNWeb3Wallet.xcodeproj/project.pbxproj @@ -518,7 +518,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 6; DEVELOPMENT_TEAM = W5R8AG9K22; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -596,7 +596,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 6; DEVELOPMENT_TEAM = W5R8AG9K22; HEADER_SEARCH_PATHS = ( "$(inherited)", diff --git a/wallets/rn_cli_wallet/package.json b/wallets/rn_cli_wallet/package.json index c6a87dfb..68a092f9 100644 --- a/wallets/rn_cli_wallet/package.json +++ b/wallets/rn_cli_wallet/package.json @@ -33,8 +33,8 @@ "react-native-gesture-handler": "2.14.1", "react-native-get-random-values": "1.9.0", "react-native-modal": "13.0.1", - "react-native-quick-base64": "^2.0.8", - "react-native-quick-crypto": "^0.6.1", + "react-native-quick-base64": "2.0.8", + "react-native-quick-crypto": "0.6.1", "react-native-safe-area-context": "4.8.2", "react-native-screens": "3.29.0", "react-native-svg": "13.11.0", diff --git a/wallets/rn_cli_wallet/src/modals/RequestModal.tsx b/wallets/rn_cli_wallet/src/modals/RequestModal.tsx index 613246af..0aac1a29 100644 --- a/wallets/rn_cli_wallet/src/modals/RequestModal.tsx +++ b/wallets/rn_cli_wallet/src/modals/RequestModal.tsx @@ -44,7 +44,6 @@ const styles = StyleSheet.create({ alignItems: 'center', borderRadius: 34, width: '100%', - minHeight: '70%', padding: 16, }, }); diff --git a/wallets/rn_cli_wallet/src/modals/SessionProposalModal.tsx b/wallets/rn_cli_wallet/src/modals/SessionProposalModal.tsx index 23736c04..8d144e76 100644 --- a/wallets/rn_cli_wallet/src/modals/SessionProposalModal.tsx +++ b/wallets/rn_cli_wallet/src/modals/SessionProposalModal.tsx @@ -140,7 +140,6 @@ export default function SessionProposalModal() { const sessionMetadata = session?.peer?.metadata; handleDeepLinkRedirect(sessionMetadata?.redirect); } catch (e) { - setIsLoadingApprove(false); console.log((e as Error).message, 'error'); return; } @@ -160,7 +159,6 @@ export default function SessionProposalModal() { reason: getSdkError('USER_REJECTED_METHODS'), }); } catch (e) { - setIsLoadingReject(false); console.log((e as Error).message, 'error'); return; } diff --git a/wallets/rn_cli_wallet/src/modals/SessionSendTransactionModal.tsx b/wallets/rn_cli_wallet/src/modals/SessionSendTransactionModal.tsx index 5e8a1f6c..906c6055 100644 --- a/wallets/rn_cli_wallet/src/modals/SessionSendTransactionModal.tsx +++ b/wallets/rn_cli_wallet/src/modals/SessionSendTransactionModal.tsx @@ -47,7 +47,6 @@ export default function SessionSendTransactionModal() { }); handleDeepLinkRedirect(requestMetadata?.redirect); } catch (e) { - setIsLoadingApprove(false); console.log((e as Error).message, 'error'); return; } @@ -67,7 +66,6 @@ export default function SessionSendTransactionModal() { response, }); } catch (e) { - setIsLoadingReject(false); console.log((e as Error).message, 'error'); return; } diff --git a/wallets/rn_cli_wallet/src/modals/SessionSignModal.tsx b/wallets/rn_cli_wallet/src/modals/SessionSignModal.tsx index a01256bc..485804c8 100644 --- a/wallets/rn_cli_wallet/src/modals/SessionSignModal.tsx +++ b/wallets/rn_cli_wallet/src/modals/SessionSignModal.tsx @@ -47,7 +47,6 @@ export default function SessionSignModal() { }); handleDeepLinkRedirect(requestMetadata?.redirect); } catch (e) { - setIsLoadingApprove(false); console.log((e as Error).message, 'error'); return; } diff --git a/wallets/rn_cli_wallet/src/modals/SessionSignTypedDataModal.tsx b/wallets/rn_cli_wallet/src/modals/SessionSignTypedDataModal.tsx index 438ed32b..e540e79e 100644 --- a/wallets/rn_cli_wallet/src/modals/SessionSignTypedDataModal.tsx +++ b/wallets/rn_cli_wallet/src/modals/SessionSignTypedDataModal.tsx @@ -49,7 +49,6 @@ export default function SessionSignTypedDataModal() { }); handleDeepLinkRedirect(requestMetadata?.redirect); } catch (e) { - setIsLoadingApprove(false); console.log((e as Error).message, 'error'); return; } @@ -69,7 +68,6 @@ export default function SessionSignTypedDataModal() { response, }); } catch (e) { - setIsLoadingReject(false); console.log((e as Error).message, 'error'); return; } diff --git a/wallets/rn_cli_wallet/src/utils/HelperUtil.ts b/wallets/rn_cli_wallet/src/utils/HelperUtil.ts index 118c317c..3268f1a9 100644 --- a/wallets/rn_cli_wallet/src/utils/HelperUtil.ts +++ b/wallets/rn_cli_wallet/src/utils/HelperUtil.ts @@ -67,7 +67,7 @@ export function getWalletAddressFromParams(addresses: string[], params: any) { let address = ''; addresses.forEach(addr => { - if (paramsString.includes(addr)) { + if (paramsString.includes(addr.toLowerCase())) { address = addr; } }); diff --git a/wallets/rn_cli_wallet/yarn.lock b/wallets/rn_cli_wallet/yarn.lock index 0300dee7..8acb068f 100644 --- a/wallets/rn_cli_wallet/yarn.lock +++ b/wallets/rn_cli_wallet/yarn.lock @@ -8210,14 +8210,14 @@ react-native-modal@13.0.1: prop-types "^15.6.2" react-native-animatable "1.3.3" -react-native-quick-base64@^2.0.5, react-native-quick-base64@^2.0.8: +react-native-quick-base64@2.0.8, react-native-quick-base64@^2.0.5: version "2.0.8" resolved "https://registry.yarnpkg.com/react-native-quick-base64/-/react-native-quick-base64-2.0.8.tgz#7a75ea8bd85ca3c5bb38a814c1d63e0688e19531" integrity sha512-2kMlnLSy0qz4NA0KXMGugd3qNB5EAizxZ6ghEVNGIxAOlc9CGvC8miv35wgpFbSKeiaBRfcPfkdTM/5Erb/6SQ== dependencies: base64-js "^1.5.1" -react-native-quick-crypto@^0.6.1: +react-native-quick-crypto@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/react-native-quick-crypto/-/react-native-quick-crypto-0.6.1.tgz#7b89c67c4a5d3669c4491fe7884621c1c74d01bc" integrity sha512-s6uFo7tcI3syo8/y5j+t6Rf+KVSuRKDp6tH04A0vjaHptJC6Iu7DVgkNYO7aqtfrYn8ZUgQ/Kqaq+m4i9TxgIQ==