diff --git a/packages/common/src/services/remote-config/feature-flags.ts b/packages/common/src/services/remote-config/feature-flags.ts index facb8111c7..7ee46a04f4 100644 --- a/packages/common/src/services/remote-config/feature-flags.ts +++ b/packages/common/src/services/remote-config/feature-flags.ts @@ -31,7 +31,6 @@ export enum FeatureFlags { MOBILE_WALLET_CONNECT = 'mobile_wallet_connect_final', COMPLETE_PROFILE_WITH_TIKTOK = 'complete_profile_with_tiktok', VERIFY_HANDLE_WITH_TIKTOK = 'verify_handle_with_tiktok', - SOLANA_PHONE_WALLET_CONNECT = 'solana_phone_wallet_connect', AUDIO_TRANSACTIONS_HISTORY = 'audio_transactions_history', RATE_CTA_ENABLED = 'rate_cta_enabled_v2', SHARE_TO_SNAPCHAT = 'share_to_snapchat', @@ -88,7 +87,6 @@ export const flagDefaults: FlagDefaults = { [FeatureFlags.MOBILE_WALLET_CONNECT]: false, [FeatureFlags.COMPLETE_PROFILE_WITH_TIKTOK]: false, [FeatureFlags.VERIFY_HANDLE_WITH_TIKTOK]: false, - [FeatureFlags.SOLANA_PHONE_WALLET_CONNECT]: false, [FeatureFlags.AUDIO_TRANSACTIONS_HISTORY]: false, [FeatureFlags.RATE_CTA_ENABLED]: false, [FeatureFlags.SHARE_TO_SNAPCHAT]: false, diff --git a/packages/mobile/src/components/core/ChainLogo.tsx b/packages/mobile/src/components/core/ChainLogo.tsx index 565f8e24ad..7de79215e8 100644 --- a/packages/mobile/src/components/core/ChainLogo.tsx +++ b/packages/mobile/src/components/core/ChainLogo.tsx @@ -6,11 +6,8 @@ import LogoEth from 'app/assets/images/logoEth.svg' import LogoSol from 'app/assets/images/logoSol.svg' import { makeStyles, shadow } from 'app/styles' -const useStyles = makeStyles(({ spacing, palette }) => ({ +const useStyles = makeStyles(({ palette }) => ({ root: { - height: spacing(6), - width: spacing(6), - borderRadius: spacing(6) / 2, borderWidth: 1, borderColor: palette.neutralLight7, backgroundColor: palette.staticWhite, @@ -23,15 +20,28 @@ const useStyles = makeStyles(({ spacing, palette }) => ({ export type ChainLogoProps = { chain: Chain style?: StyleProp + size?: number } export const ChainLogo = (props: ChainLogoProps) => { - const { chain, style } = props + const { chain, style, size = 24 } = props const styles = useStyles() + const rootStyle = [ + styles.root, + style, + { height: size, width: size, borderRadius: size / 2 } + ] + + const solIconSize = size * (2 / 3) + const ethIconSize = solIconSize * (9 / 8) return ( - - {chain === 'eth' ? : } + + {chain === 'eth' ? ( + + ) : ( + + )} ) } diff --git a/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx b/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx index fd1f96c007..f7e9b932df 100644 --- a/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx +++ b/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' import { tokenDashboardPageSelectors } from '@audius/common' +import { View } from 'react-native' import { useSelector } from 'react-redux' import { Button } from 'app/components/core' @@ -20,8 +21,8 @@ const messages = { } const useStyles = makeStyles(({ spacing }) => ({ - connectButton: { - marginTop: spacing(6) + root: { + margin: spacing(6) } })) @@ -48,13 +49,15 @@ export const ConnectNewWalletButton = () => { : messages.connect return ( -