fix: compare lower case addresses (#123)

reown-com · Jan 30, 2024 · 0ac4f0d · 0ac4f0d
1 parent 1fe02c9
commit 0ac4f0d
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 82 deletions.
diff --git a/dapps/W3MEthers5/ios/Web3ModalEthers5.xcodeproj/project.pbxproj b/dapps/W3MEthers5/ios/Web3ModalEthers5.xcodeproj/project.pbxproj
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -8210,14 +8210,14 @@ [email protected]:
     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:
+[email protected].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:
+[email protected]:
   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==