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

fix: compare lower case addresses #123

Merged
merged 1 commit into from
Jan 30, 2024
Merged

fix: compare lower case addresses #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
140 changes: 74 additions & 66 deletions dapps/W3MEthers5/ios/Web3ModalEthers5.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion wallets/rn_cli_wallet/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions wallets/rn_cli_wallet/ios/RNWeb3Wallet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand Down Expand Up @@ -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)",
Expand Down
4 changes: 2 additions & 2 deletions wallets/rn_cli_wallet/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion wallets/rn_cli_wallet/src/modals/RequestModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ const styles = StyleSheet.create({
alignItems: 'center',
borderRadius: 34,
width: '100%',
minHeight: '70%',
padding: 16,
},
});
2 changes: 0 additions & 2 deletions wallets/rn_cli_wallet/src/modals/SessionProposalModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions wallets/rn_cli_wallet/src/modals/SessionSendTransactionModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ export default function SessionSendTransactionModal() {
});
handleDeepLinkRedirect(requestMetadata?.redirect);
} catch (e) {
setIsLoadingApprove(false);
console.log((e as Error).message, 'error');
return;
}
Expand All @@ -67,7 +66,6 @@ export default function SessionSendTransactionModal() {
response,
});
} catch (e) {
setIsLoadingReject(false);
console.log((e as Error).message, 'error');
return;
}
Expand Down
1 change: 0 additions & 1 deletion wallets/rn_cli_wallet/src/modals/SessionSignModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ export default function SessionSignModal() {
});
handleDeepLinkRedirect(requestMetadata?.redirect);
} catch (e) {
setIsLoadingApprove(false);
console.log((e as Error).message, 'error');
return;
}
Expand Down
2 changes: 0 additions & 2 deletions wallets/rn_cli_wallet/src/modals/SessionSignTypedDataModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ export default function SessionSignTypedDataModal() {
});
handleDeepLinkRedirect(requestMetadata?.redirect);
} catch (e) {
setIsLoadingApprove(false);
console.log((e as Error).message, 'error');
return;
}
Expand All @@ -69,7 +68,6 @@ export default function SessionSignTypedDataModal() {
response,
});
} catch (e) {
setIsLoadingReject(false);
console.log((e as Error).message, 'error');
return;
}
Expand Down
2 changes: 1 addition & 1 deletion wallets/rn_cli_wallet/src/utils/HelperUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
});
Expand Down
4 changes: 2 additions & 2 deletions wallets/rn_cli_wallet/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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==
Expand Down
Loading