From 9519c51b36dd488674f215f97b35f9e9eeaf0ce1 Mon Sep 17 00:00:00 2001 From: ignaciosantise Date: Fri, 2 Feb 2024 15:25:17 -0300 Subject: [PATCH] Fix/wallet address (#126) * fix: compare lower case addresses * fix: removed unused code * chore: changed app version --- wallets/rn_cli_wallet/android/app/build.gradle | 2 +- .../ios/RNWeb3Wallet.xcodeproj/project.pbxproj | 12 ++++++++++-- wallets/rn_cli_wallet/src/utils/HelperUtil.ts | 11 ++--------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/wallets/rn_cli_wallet/android/app/build.gradle b/wallets/rn_cli_wallet/android/app/build.gradle index 21d3246c..c3310182 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 6 + versionCode 7 versionName "1.0" } signingConfigs { diff --git a/wallets/rn_cli_wallet/ios/RNWeb3Wallet.xcodeproj/project.pbxproj b/wallets/rn_cli_wallet/ios/RNWeb3Wallet.xcodeproj/project.pbxproj index 8e334217..144a2469 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 = 6; + CURRENT_PROJECT_VERSION = 8; DEVELOPMENT_TEAM = W5R8AG9K22; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -584,8 +584,12 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.web3wallet.rnsample; PRODUCT_NAME = RNWeb3Wallet; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -596,7 +600,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 8; DEVELOPMENT_TEAM = W5R8AG9K22; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -661,7 +665,11 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.web3wallet.rnsample; PRODUCT_NAME = RNWeb3Wallet; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/wallets/rn_cli_wallet/src/utils/HelperUtil.ts b/wallets/rn_cli_wallet/src/utils/HelperUtil.ts index 3268f1a9..fd68f532 100644 --- a/wallets/rn_cli_wallet/src/utils/HelperUtil.ts +++ b/wallets/rn_cli_wallet/src/utils/HelperUtil.ts @@ -65,13 +65,11 @@ export function getSignTypedDataParamsData(params: string[]) { export function getWalletAddressFromParams(addresses: string[], params: any) { const paramsString = JSON.stringify(params); let address = ''; - addresses.forEach(addr => { - if (paramsString.includes(addr.toLowerCase())) { + if (paramsString.toLowerCase().includes(addr.toLowerCase())) { address = addr; } }); - return address; } @@ -100,10 +98,5 @@ export function isSolanaChain(chain: string) { * Formats chainId to its name */ export function formatChainName(chainId: string) { - return ( - EIP155_CHAINS[chainId as TEIP155Chain]?.name ?? - COSMOS_MAINNET_CHAINS[chainId as TCosmosChain]?.name ?? - SOLANA_CHAINS[chainId as TSolanaChain]?.name ?? - chainId - ); + return EIP155_CHAINS[chainId as TEIP155Chain]?.name ?? chainId; }