@reown/appkit-react-native 2.0.0-alpha.4 → 2.0.0-alpha.5

package/src/views/w3m-connecting-siwe-view/index.tsx

@@ -5,12 +5,13 @@ import {
   Button,
   DoubleImageLoader,
   FlexView,
-  IconLink,
-  Text
+  Text,
+  useCustomDimensions
 } from '@reown/appkit-ui-react-native';
 import {
   ConnectionsController,
   EventsController,
+  ModalController,
   OptionsController,
   RouterController,
   SnackController
@@ -19,9 +20,11 @@ import { SIWEController } from '@reown/appkit-siwe-react-native';
 
 import { useInternalAppKit } from '../../AppKitContext';
 import styles from './styles';
+import { ScrollView } from 'react-native';
 
 export function ConnectingSiweView() {
   const { disconnect } = useInternalAppKit();
+  const { padding } = useCustomDimensions();
   const { metadata } = useSnapshot(OptionsController.state);
   const { activeAddress, identity, walletInfo } = useSnapshot(ConnectionsController.state);
   const [isSigning, setIsSigning] = useState(false);
@@ -49,6 +52,8 @@ export function ConnectingSiweView() {
         properties: { network, isSmartAccount }
       });
 
+      ModalController.close();
+
       return session;
     } catch (error) {
       SnackController.showError('Signature declined');
@@ -81,46 +86,43 @@ export function ConnectingSiweView() {
   };
 
   return (
-    <FlexView padding={['2xl', 's', '3xl', 's']}>
-      <IconLink
-        icon="close"
-        size="md"
-        onPress={onCancel}
-        testID="header-close"
-        style={styles.closeButton}
-      />
-      <Text variant="paragraph-600" numberOfLines={1} center>
-        Sign in
-      </Text>
-      <DoubleImageLoader
-        style={styles.logoContainer}
-        leftImage={dappIcon}
-        rightImage={walletIcon}
-        renderRightPlaceholder={() => (
-          <Avatar imageSrc={identity?.avatar} address={activeAddress} size={60} borderWidth={0} />
-        )}
-        rightItemStyle={!walletIcon && styles.walletAvatar}
-      />
-      <Text center variant="medium-600" color="fg-100" style={styles.title}>
-        {dappName} needs to connect to your wallet
-      </Text>
-      <Text center variant="small-400" color="fg-200" style={styles.subtitle}>
-        Sign this message to prove you own this wallet and proceed. Cancelling will disconnect you
-      </Text>
-      <FlexView flexDirection="row" justifyContent="space-between" margin={['s', '0', '0', '0']}>
-        <Button variant="shade" onPress={onCancel} style={styles.button} loading={isDisconnecting}>
-          Cancel
-        </Button>
-        <Button
-          variant="fill"
-          loading={isSigning}
-          disabled={isDisconnecting}
-          onPress={onSign}
-          style={styles.button}
-        >
-          Sign
-        </Button>
+    <ScrollView bounces={false} fadingEdgeLength={20} style={{ paddingHorizontal: padding }}>
+      <FlexView padding={['0', 's', 's', 's']}>
+        <DoubleImageLoader
+          style={styles.logoContainer}
+          leftImage={dappIcon}
+          rightImage={walletIcon}
+          renderRightPlaceholder={() => (
+            <Avatar imageSrc={identity?.avatar} address={activeAddress} size={60} borderWidth={0} />
+          )}
+          rightItemStyle={!walletIcon && styles.walletAvatar}
+        />
+        <Text center variant="medium-600" color="fg-100" style={styles.title}>
+          {dappName} needs to connect to your wallet
+        </Text>
+        <Text center variant="small-400" color="fg-200" style={styles.subtitle}>
+          Sign this message to prove you own this wallet and proceed. Cancelling will disconnect you
+        </Text>
+        <FlexView flexDirection="row" justifyContent="space-between" margin={['s', '0', '0', '0']}>
+          <Button
+            variant="shade"
+            onPress={onCancel}
+            style={styles.button}
+            loading={isDisconnecting}
+          >
+            Cancel
+          </Button>
+          <Button
+            variant="fill"
+            loading={isSigning}
+            disabled={isDisconnecting}
+            onPress={onSign}
+            style={styles.button}
+          >
+            Sign
+          </Button>
+        </FlexView>
       </FlexView>
-    </FlexView>
+    </ScrollView>
   );
 }

package/src/views/w3m-connecting-siwe-view/styles.ts

@@ -16,13 +16,6 @@ export default StyleSheet.create({
     marginHorizontal: '10%',
     marginVertical: Spacing.l
   },
-  closeButton: {
-    alignSelf: 'flex-end',
-    right: Spacing.xl,
-    top: Spacing.l,
-    position: 'absolute',
-    zIndex: 2
-  },
   walletAvatar: {
     borderRadius: BorderRadius.full
   }

package/src/views/w3m-connecting-social-view/index.tsx

@@ -19,9 +19,10 @@ import { ConstantsUtil, StringUtil } from '@reown/appkit-common-react-native';
 
 import { useInternalAppKit } from '../../AppKitContext';
 import styles from './styles';
+import { ScrollView } from 'react-native';
 
 export function ConnectingSocialView() {
-  const { maxWidth: width } = useCustomDimensions();
+  const { padding } = useCustomDimensions();
   const { connect } = useInternalAppKit();
   const { data } = useSnapshot(RouterController.state);
   const { wcUri } = useSnapshot(WcController.state);
@@ -74,32 +75,29 @@ export function ConnectingSocialView() {
   }, [wcUri, onConnect]);
 
   return (
-    <FlexView
-      alignItems="center"
-      alignSelf="center"
-      padding={['2xl', 'l', '3xl', 'l']}
-      style={{ width }}
-    >
-      <LoadingThumbnail paused={!!error}>
-        <Logo logo={data?.socialProvider ?? 'more'} height={72} width={72} />
-        {error ? (
-          <IconBox
-            icon={'close'}
-            border
-            background
-            backgroundColor="icon-box-bg-error-100"
-            size="sm"
-            iconColor="error-100"
-            style={styles.errorIcon}
-          />
-        ) : null}
-      </LoadingThumbnail>
-      <Text style={styles.continueText} variant="paragraph-500">
-        Continue with {StringUtil.capitalize(data?.socialProvider ?? 'Login')}
-      </Text>
-      <Text variant="small-400" color="fg-200">
-        Continue in your browser
-      </Text>
-    </FlexView>
+    <ScrollView bounces={false} fadingEdgeLength={20} style={{ paddingHorizontal: padding }}>
+      <FlexView alignItems="center" alignSelf="center" padding={['2xl', 'l', 'xl', 'l']}>
+        <LoadingThumbnail paused={!!error}>
+          <Logo logo={data?.socialProvider ?? 'more'} height={72} width={72} />
+          {error ? (
+            <IconBox
+              icon={'close'}
+              border
+              background
+              backgroundColor="icon-box-bg-error-100"
+              size="sm"
+              iconColor="error-100"
+              style={styles.errorIcon}
+            />
+          ) : null}
+        </LoadingThumbnail>
+        <Text style={styles.continueText} variant="paragraph-500">
+          Continue with {StringUtil.capitalize(data?.socialProvider ?? 'Login')}
+        </Text>
+        <Text variant="small-400" color="fg-200">
+          Continue in your browser
+        </Text>
+      </FlexView>
+    </ScrollView>
   );
 }

package/src/views/w3m-get-wallet-view/index.tsx

@@ -38,7 +38,7 @@ export function GetWalletView() {
       fadingEdgeLength={20}
       testID="get-a-wallet-view"
     >
-      <FlexView padding={['s', 's', '3xl', 's']}>
+      <FlexView padding="s">
         {listTemplate()}
         <ListWallet
           name="Explore all"

package/src/views/w3m-network-switch-view/index.tsx

@@ -1,13 +1,10 @@
 import { useSnapshot } from 'valtio';
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import {
   ApiController,
   AssetController,
-  WcController,
-  ConnectionsController,
-  RouterController,
-  RouterUtil,
-  AssetUtil
+  AssetUtil,
+  RouterController
 } from '@reown/appkit-core-react-native';
 import {
   Button,
@@ -15,118 +12,93 @@ import {
   IconBox,
   LoadingHexagon,
   NetworkImage,
-  Text
+  Text,
+  useCustomDimensions
 } from '@reown/appkit-ui-react-native';
 import { useInternalAppKit } from '../../AppKitContext';
 import styles from './styles';
+import { ScrollView } from 'react-native';
 
-//TODO: is this used?
 export function NetworkSwitchView() {
-  const { switchNetwork } = useInternalAppKit();
+  const { switchNetwork, back } = useInternalAppKit();
+  const { padding } = useCustomDimensions();
   const { data } = useSnapshot(RouterController.state);
-  const { recentWallets } = useSnapshot(WcController.state);
-  const { activeNetwork } = useSnapshot(ConnectionsController.state);
   const { networkImages } = useSnapshot(AssetController.state);
-  const [error, setError] = useState<boolean>(false);
   const [showRetry, setShowRetry] = useState<boolean>(false);
-  const network = data?.network;
-  const wallet = recentWallets?.[0];
-  const networkImage = AssetUtil.getNetworkImage(network, networkImages);
+  const [isError, setIsError] = useState<boolean>(false);
+  const networkImage = AssetUtil.getNetworkImage(data?.network, networkImages);
 
-  const onSwitchNetwork = async () => {
+  const onSwitchNetwork = useCallback(async () => {
     try {
-      if (network) {
-        setError(false);
-        const _network = ConnectionsController.state.networks.find(n => n.id === network.id);
-        if (!_network) return;
-        await switchNetwork(_network);
-      }
-    } catch {
-      setError(true);
+      if (!RouterController.state.data?.network) return;
+      setIsError(false);
+      await switchNetwork(RouterController.state.data.network);
+      back();
+    } catch (error) {
+      setIsError(true);
       setShowRetry(true);
     }
-  };
+  }, [switchNetwork, back]);
 
   useEffect(() => {
     onSwitchNetwork();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  useEffect(() => {
-    // Go back if network is already switched
-    // eslint-disable-next-line valtio/state-snapshot-rule
-    if (activeNetwork?.id === network?.id) {
-      RouterUtil.navigateAfterNetworkSwitch();
-    }
-
-    // eslint-disable-next-line valtio/state-snapshot-rule
-  }, [activeNetwork?.id, network?.id]);
-
-  const retryTemplate = () => {
-    if (!showRetry) return null;
-
-    return (
-      <Button
-        size="sm"
-        variant="accent"
-        iconLeft="refresh"
-        style={styles.retryButton}
-        iconStyle={styles.retryIcon}
-        onPress={onSwitchNetwork}
-      >
-        Try again
-      </Button>
-    );
-  };
-
-  const textTemplate = () => {
-    const walletName = wallet?.name ?? 'wallet';
-    if (error) {
-      return (
-        <>
-          <Text variant="paragraph-500" style={styles.text}>
-            Switch declined
-          </Text>
-          <Text center variant="small-400" color="fg-200" style={styles.descriptionText}>
-            Switch can be declined if chain is not supported by a wallet or previous request is
-            still active
-          </Text>
-        </>
-      );
-    }
-
-    return (
-      <>
-        <Text variant="paragraph-500" style={styles.text}>{`Approve in ${walletName}`}</Text>
-        <Text center variant="small-400" color="fg-200" style={styles.descriptionText}>
-          Accept switch request in your wallet
-        </Text>
-      </>
-    );
-  };
-
   return (
-    <FlexView alignItems="center" padding={['2xl', 's', '4xl', 's']}>
-      <LoadingHexagon paused={error}>
-        <NetworkImage
-          imageSrc={networkImage}
-          imageHeaders={ApiController._getApiHeaders()}
-          size="lg"
-        />
-        {error ? (
-          <IconBox
-            icon="close"
-            border
-            background
-            backgroundColor="icon-box-bg-error-100"
-            size="sm"
-            iconColor="error-100"
-            style={styles.errorIcon}
+    <ScrollView bounces={false} fadingEdgeLength={20} style={{ paddingHorizontal: padding }}>
+      <FlexView alignItems="center" padding={['xl', 's', 's', 's']}>
+        <LoadingHexagon paused={isError}>
+          <NetworkImage
+            imageSrc={networkImage}
+            imageHeaders={ApiController._getApiHeaders()}
+            size="lg"
           />
+          {isError ? (
+            <IconBox
+              icon="close"
+              border
+              background
+              backgroundColor="icon-box-bg-error-100"
+              size="sm"
+              iconColor="error-100"
+              style={styles.errorIcon}
+            />
+          ) : null}
+        </LoadingHexagon>
+        {isError ? (
+          <>
+            <Text variant="paragraph-500" style={styles.text}>
+              Switch declined
+            </Text>
+            <Text center variant="small-400" color="fg-200" style={styles.descriptionText}>
+              Switch can be declined if chain is not supported by a wallet or previous request is
+              still active
+            </Text>
+          </>
+        ) : (
+          <>
+            <Text variant="paragraph-500" style={styles.text}>
+              Approve in your wallet
+            </Text>
+            <Text center variant="small-400" color="fg-200" style={styles.descriptionText}>
+              Accept the switch request in your wallet
+            </Text>
+          </>
+        )}
+        {showRetry ? (
+          <Button
+            size="sm"
+            variant="accent"
+            iconLeft="refresh"
+            style={styles.retryButton}
+            iconStyle={styles.retryIcon}
+            onPress={onSwitchNetwork}
+          >
+            Try again
+          </Button>
         ) : null}
-      </LoadingHexagon>
-      {textTemplate()}
-      {retryTemplate()}
-    </FlexView>
+      </FlexView>
+    </ScrollView>
   );
 }

package/src/views/w3m-networks-view/index.tsx

@@ -1,4 +1,5 @@
-import { ScrollView, View } from 'react-native';
+/* eslint-disable valtio/state-snapshot-rule */
+import { ScrollView, useWindowDimensions, View } from 'react-native';
 import {
   CardSelect,
   CardSelectWidth,
@@ -24,19 +25,22 @@ import { useInternalAppKit } from '../../AppKitContext';
 import { useSnapshot } from 'valtio';
 
 export function NetworksView() {
-  const { networks, isConnected } = useSnapshot(ConnectionsController.state);
+  const { height, width } = useWindowDimensions();
+  const windowSize = Math.min(height, width);
   const { networkImages } = useSnapshot(AssetController.state);
+  const { activeNetwork, isConnected } = useSnapshot(ConnectionsController.state);
   const imageHeaders = ApiController._getApiHeaders();
-  const { maxWidth: width, padding } = useCustomDimensions();
+  const { padding } = useCustomDimensions();
   const numColumns = 4;
-  const usableWidth = width - Spacing.xs * 2 - Spacing['4xs'];
+  const usableWidth = windowSize - Spacing.xs * 2 - Spacing['4xs'];
   const itemWidth = Math.abs(Math.trunc(usableWidth / numColumns));
   const itemGap = Math.abs(
     Math.trunc((usableWidth - numColumns * CardSelectWidth) / numColumns) / 2
   );
   const { switchNetwork, back } = useInternalAppKit();
 
-  const networkList = isConnected ? ConnectionsController.getConnectedNetworks() : networks;
+  const networkList = ConnectionsController.getAvailableNetworks();
+  const connectedNetworks = ConnectionsController.getConnectedNetworks();
 
   const onHelpPress = () => {
     RouterController.push('WhatIsANetwork');
@@ -45,15 +49,24 @@ export function NetworksView() {
 
   const networksTemplate = () => {
     const onNetworkPress = async (network: AppKitNetwork) => {
-      await switchNetwork(network);
-      back();
+      if (
+        !isConnected ||
+        connectedNetworks.some(
+          connectedNetwork => connectedNetwork.caipNetworkId === network.caipNetworkId
+        )
+      ) {
+        await switchNetwork(network);
+        back();
+      } else {
+        RouterController.push('SwitchNetwork', { network });
+      }
     };
 
     return networkList.map(network => {
-      const isSelected = ConnectionsController.state.isConnected
-        ? ConnectionsController.state.activeCaipNetworkId === network.caipNetworkId
+      const isSelected = isConnected
+        ? activeNetwork?.caipNetworkId === network.caipNetworkId
         : OptionsController.state.defaultNetwork?.caipNetworkId === network.caipNetworkId;
-      // eslint-disable-next-line valtio/state-snapshot-rule
+
       const networkImage = AssetUtil.getNetworkImage(network, networkImages);
 
       return (
@@ -83,22 +96,13 @@ export function NetworksView() {
 
   return (
     <>
-      <ScrollView
-        bounces={false}
-        fadingEdgeLength={20}
-        style={{ paddingHorizontal: padding, marginBottom: Spacing.xl }}
-      >
-        <FlexView flexDirection="row" flexWrap="wrap" padding={['xs', 'xs', '4xl', 'xs']}>
+      <ScrollView bounces={false} fadingEdgeLength={20} style={{ paddingHorizontal: padding }}>
+        <FlexView flexDirection="row" flexWrap="wrap" padding="xs">
           {networksTemplate()}
         </FlexView>
       </ScrollView>
       <Separator />
-      <FlexView
-        padding={['s', 's', '3xl', 's']}
-        alignItems="center"
-        alignSelf="center"
-        style={{ width }}
-      >
+      <FlexView padding="s" alignItems="center" alignSelf="center" style={{ width }}>
         <Text variant="small-400" color="fg-300" center>
           Your connected wallet may not support some of the networks available for this dApp
         </Text>