@reown/appkit-react-native 0.0.0-develop-20251008155354 → 0.0.0-develop-20251114152149

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

@@ -1,6 +1,6 @@
 import { useSnapshot } from 'valtio';
 import { useEffect, useLayoutEffect, useState } from 'react';
-import { type Platform } from '@reown/appkit-common-react-native';
+import { ErrorUtil, type Platform } from '@reown/appkit-common-react-native';
 import {
   WcController,
   ConstantsUtil,
@@ -39,30 +39,46 @@ export function ConnectingView() {
     }
   };
 
-  const initializeConnection = async (retry = false) => {
+  const initializeConnection = async (retry = false, retryTimestamp?: number) => {
     try {
       const { wcPairingExpiry } = WcController.state;
       const { data: routeData } = RouterController.state;
-      if (retry || CoreHelperUtil.isPairingExpired(wcPairingExpiry)) {
+      const isPairingExpired = CoreHelperUtil.isPairingExpired(wcPairingExpiry);
+      if (retry || isPairingExpired) {
         WcController.setWcError(false);
 
         const connectPromise = connect({
           wallet: routeData?.wallet
         });
         WcController.setWcPromise(connectPromise);
+        await connectPromise;
       }
     } catch (error) {
       LogController.sendError(error, 'ConnectingView.tsx', 'initializeConnection');
       WcController.setWcError(true);
       WcController.clearUri();
-      SnackController.showError('Declined');
-      if (isQr && CoreHelperUtil.isAllowedRetry(lastRetry)) {
-        setLastRetry(Date.now());
-        initializeConnection(true);
+
+      const currentRetryTime = retryTimestamp ?? lastRetry;
+
+      if (isQr && CoreHelperUtil.isAllowedRetry(currentRetryTime)) {
+        const newRetryTime = Date.now();
+        setLastRetry(newRetryTime);
+        initializeConnection(true, newRetryTime);
+
+        return;
       }
+
+      const isUserRejected = ErrorUtil.isUserRejectedRequestError(error);
+      const isProposalExpired = ErrorUtil.isProposalExpiredError(error);
+      if (!isProposalExpired) {
+        SnackController.showError(
+          isUserRejected ? 'User rejected the request' : 'Something went wrong'
+        );
+      }
+
       EventsController.sendEvent({
         type: 'track',
-        event: 'CONNECT_ERROR',
+        event: isUserRejected ? 'USER_REJECTED' : 'CONNECT_ERROR',
         properties: {
           message: (error as Error)?.message ?? 'Unknown'
         }

package/src/views/w3m-onramp-settings-view/index.tsx

@@ -90,6 +90,7 @@ export function OnRampSettingsView() {
           chevron
           style={styles.firstItem}
           contentStyle={styles.listItem}
+          testID="button-select-country"
         >
           <FlexView
             alignItems="center"
@@ -111,7 +112,12 @@ export function OnRampSettingsView() {
             ) : null}
           </FlexView>
         </ListItem>
-        <ListItem onPress={onPaymentCurrencyPress} chevron contentStyle={styles.listItem}>
+        <ListItem
+          onPress={onPaymentCurrencyPress}
+          chevron
+          contentStyle={styles.listItem}
+          testID="button-select-currency"
+        >
           <FlexView
             alignItems="center"
             justifyContent="center"

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

@@ -61,6 +61,7 @@ export function OnRampView() {
   const purchaseCurrencyCode =
     purchaseCurrency?.currencyCode?.split('_')[0] ?? purchaseCurrency?.currencyCode;
   const networkImage = AssetUtil.getNetworkImage(activeNetwork, networkImages);
+  const isContinueDisabled = quotesLoading || loading || !selectedQuote;
 
   const getQuotes = useCallback(() => {
     if (OnRampController.canGenerateQuote()) {
@@ -240,8 +241,8 @@ export function OnRampView() {
             <Button
               style={styles.continueButton}
               onPress={handleContinue}
-              disabled={quotesLoading || loading || !selectedQuote}
-              testID="button-continue"
+              disabled={isContinueDisabled}
+              testID={`button-continue${isContinueDisabled ? '-disabled' : '-enabled'}`}
             >
               Continue
             </Button>

package/src/views/w3m-swap-view/components/select-token-modal/index.tsx

@@ -98,7 +98,7 @@ export function SwapSelectTokenModal({ onClose, type, style, visible }: Props) {
           alignItems="center"
           padding={['0', 'm', 'm', 'm']}
         >
-          <IconLink icon="chevronLeft" size="md" onPress={onClose} />
+          <IconLink icon="chevronLeft" size="md" onPress={onClose} testID="button-back" />
           <Text variant="paragraph-600">Select token</Text>
           <View style={styles.iconPlaceholder} />
         </FlexView>

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

@@ -174,6 +174,7 @@ export function SwapView() {
             onChange={onSourceTokenChange}
             onTokenPress={() => setShowModal('sourceToken')}
             onMaxPress={onSourceMaxPress}
+            testID="swap-input-source"
           />
           <FlexView alignItems="center" justifyContent="center" style={styles.bottomInputContainer}>
             <SwapInput
@@ -186,6 +187,7 @@ export function SwapView() {
               onChange={onToTokenChange}
               onTokenPress={() => setShowModal('toToken')}
               editable={false}
+              testID="swap-input-to"
             />
             {showSwitch ? (
               <IconLink

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

@@ -92,6 +92,7 @@ export function WalletSendView() {
           style={styles.tokenInput}
           onTokenPress={() => RouterController.push('WalletSendSelectToken')}
           loading={isBalanceLoading}
+          testID="send-input-token"
         />
         <FlexView alignItems="center" justifyContent="center" style={styles.addressContainer}>
           <SendInputAddress value={receiverProfileName || receiverAddress} />