@reown/appkit-react-native 2.0.0-alpha.1 → 2.0.0-alpha.2

package/src/views/w3m-onramp-view/components/SelectPaymentModal.tsx

@@ -1,7 +1,8 @@
+/* eslint-disable valtio/state-snapshot-rule */
 import { useSnapshot } from 'valtio';
-import { useRef, useState, useMemo } from 'react';
+import { useRef, useState, useMemo, useEffect } from 'react';
 import Modal from 'react-native-modal';
-import { Dimensions, FlatList, StyleSheet, View } from 'react-native';
+import { FlatList, StyleSheet, View } from 'react-native';
 import {
   FlexView,
   IconLink,
@@ -9,7 +10,6 @@ import {
   Text,
   useTheme,
   Separator,
-  LoadingSpinner,
   BorderRadius
 } from '@reown/appkit-ui-react-native';
 import {
@@ -17,9 +17,8 @@ import {
   type OnRampPaymentMethod,
   type OnRampQuote
 } from '@reown/appkit-core-react-native';
-import { Placeholder } from '../../../partials/w3m-placeholder';
 import { Quote, ITEM_HEIGHT as QUOTE_ITEM_HEIGHT } from './Quote';
-import { PaymentMethod, ITEM_SIZE } from './PaymentMethod';
+import { PaymentMethod } from './PaymentMethod';
 
 interface SelectPaymentModalProps {
   title?: string;
@@ -31,124 +30,110 @@ const SEPARATOR_HEIGHT = Spacing.s;
 
 export function SelectPaymentModal({ title, visible, onClose }: SelectPaymentModalProps) {
   const Theme = useTheme();
-  const { selectedQuote, quotes } = useSnapshot(OnRampController.state);
+  const { selectedQuote, quotes, selectedPaymentMethod } = useSnapshot(OnRampController.state);
+
   const paymentMethodsRef = useRef<FlatList>(null);
   const [paymentMethods, setPaymentMethods] = useState<OnRampPaymentMethod[]>(
     OnRampController.state.paymentMethods
   );
 
+  const [activePaymentMethod, setActivePaymentMethod] = useState<OnRampPaymentMethod | undefined>(
+    OnRampController.state.selectedPaymentMethod
+  );
+
+  const availablePaymentMethods = useMemo(() => {
+    return paymentMethods.filter(
+      paymentMethod =>
+        quotes?.some(quote => quote.paymentMethodType === paymentMethod.paymentMethod)
+    );
+  }, [paymentMethods, quotes]);
+
+  const availableQuotes = useMemo(() => {
+    return quotes?.filter(quote => activePaymentMethod?.paymentMethod === quote.paymentMethodType);
+  }, [quotes, activePaymentMethod]);
+
   const sortedQuotes = useMemo(() => {
-    if (!selectedQuote) {
-      return quotes;
+    if (!selectedQuote || selectedQuote.paymentMethodType !== activePaymentMethod?.paymentMethod) {
+      return availableQuotes;
     }
 
     return [
       selectedQuote,
-      // eslint-disable-next-line valtio/state-snapshot-rule
-      ...(quotes?.filter(quote => quote.serviceProvider !== selectedQuote.serviceProvider) ?? [])
+
+      ...(availableQuotes?.filter(
+        quote => quote.serviceProvider !== selectedQuote.serviceProvider
+      ) ?? [])
     ];
-  }, [quotes, selectedQuote]);
+  }, [availableQuotes, selectedQuote, activePaymentMethod]);
 
   const renderSeparator = () => {
     return <View style={{ height: SEPARATOR_HEIGHT }} />;
   };
 
   const handleQuotePress = (quote: OnRampQuote) => {
-    if (quote.serviceProvider !== OnRampController.state.selectedQuote?.serviceProvider) {
+    if (activePaymentMethod) {
+      OnRampController.clearError();
       OnRampController.setSelectedQuote(quote);
+      OnRampController.setSelectedPaymentMethod(activePaymentMethod);
     }
     onClose();
   };
 
   const handlePaymentMethodPress = (paymentMethod: OnRampPaymentMethod) => {
-    if (
-      paymentMethod.paymentMethod !== OnRampController.state.selectedPaymentMethod?.paymentMethod
-    ) {
-      OnRampController.setSelectedPaymentMethod(paymentMethod);
-    }
-
-    const visibleItemsCount = Math.round(Dimensions.get('window').width / ITEM_SIZE);
-
-    // Switch payment method to the top if there are more than visibleItemsCount payment methods
-    if (OnRampController.state.paymentMethods.length > visibleItemsCount) {
-      const paymentIndex = paymentMethods.findIndex(
-        method => method.paymentMethod === paymentMethod.paymentMethod
-      );
-
-      // Switch payment if its not visible
-      if (paymentIndex + 1 > visibleItemsCount - 1) {
-        const realIndex = OnRampController.state.paymentMethods.findIndex(
-          method => method.paymentMethod === paymentMethod.paymentMethod
-        );
-
-        const newPaymentMethods = [
-          paymentMethod,
-          ...OnRampController.state.paymentMethods.slice(0, realIndex),
-          ...OnRampController.state.paymentMethods.slice(realIndex + 1)
-        ];
-        setPaymentMethods(newPaymentMethods);
-      }
-    }
-    paymentMethodsRef.current?.scrollToIndex({
-      index: 0,
-      animated: true
-    });
+    setActivePaymentMethod(paymentMethod);
   };
 
-  const renderQuote = ({ item }: { item: OnRampQuote }) => {
+  const renderQuote = ({ item, index }: { item: OnRampQuote; index: number }) => {
     const logoURL = OnRampController.getServiceProviderImage(item.serviceProvider);
-    const selected = item.serviceProvider === OnRampController.state.selectedQuote?.serviceProvider;
-    const isBestDeal =
-      OnRampController.state.quotes?.findIndex(
-        quote => quote.serviceProvider === item.serviceProvider
-      ) === 0;
-    const tagText = isBestDeal ? 'Best Deal' : item.lowKyc ? 'Low KYC' : undefined;
+    const isSelected =
+      item.serviceProvider === OnRampController.state.selectedQuote?.serviceProvider &&
+      item.paymentMethodType === OnRampController.state.selectedQuote?.paymentMethodType;
+
+    const isRecommended =
+      availableQuotes?.findIndex(quote => quote.serviceProvider === item.serviceProvider) === 0 &&
+      availableQuotes?.length > 1;
+    const tagText = isRecommended ? 'Recommended' : item.lowKyc ? 'Low KYC' : undefined;
 
     return (
       <Quote
         item={item}
-        selected={selected}
+        selected={isSelected}
         logoURL={logoURL}
         onQuotePress={() => handleQuotePress(item)}
         tagText={tagText}
-      />
-    );
-  };
-
-  const renderEmpty = () => {
-    return OnRampController.state.quotesLoading ? (
-      <FlexView
-        alignItems="center"
-        justifyContent="center"
-        padding="2xl"
-        style={styles.emptyContainer}
-      >
-        <LoadingSpinner />
-      </FlexView>
-    ) : (
-      <Placeholder
-        title="No providers available"
-        description="Please select a different payment method or increase the amount"
-        icon="warningCircle"
+        testID={`quote-item-${index}`}
       />
     );
   };
 
   const renderPaymentMethod = ({ item }: { item: OnRampPaymentMethod }) => {
     const parsedItem = item as OnRampPaymentMethod;
-    const selected =
-      parsedItem.paymentMethod === OnRampController.state.selectedPaymentMethod?.paymentMethod;
+    const isSelected = parsedItem.paymentMethod === activePaymentMethod?.paymentMethod;
 
     return (
       <PaymentMethod
         item={parsedItem}
         onPress={() => handlePaymentMethodPress(parsedItem)}
-        selected={selected}
+        selected={isSelected}
         testID={`payment-method-item-${parsedItem.paymentMethod}`}
       />
     );
   };
 
+  useEffect(() => {
+    if (visible && OnRampController.state.selectedPaymentMethod) {
+      const methods = [
+        OnRampController.state.selectedPaymentMethod,
+        ...OnRampController.state.paymentMethods.filter(
+          m => m.paymentMethod !== OnRampController.state.selectedPaymentMethod?.paymentMethod
+        )
+      ];
+      //Update payment methods order
+      setPaymentMethods(methods);
+      setActivePaymentMethod(OnRampController.state.selectedPaymentMethod);
+    }
+  }, [visible]);
+
   return (
     <Modal
       isVisible={visible}
@@ -176,7 +161,7 @@ export function SelectPaymentModal({ title, visible, onClose }: SelectPaymentMod
         </Text>
         <FlexView>
           <FlatList
-            data={paymentMethods}
+            data={availablePaymentMethods}
             renderItem={renderPaymentMethod}
             ref={paymentMethodsRef}
             style={styles.paymentMethodsContainer}
@@ -195,10 +180,10 @@ export function SelectPaymentModal({ title, visible, onClose }: SelectPaymentMod
           data={sortedQuotes}
           bounces={false}
           renderItem={renderQuote}
+          extraData={selectedPaymentMethod}
           contentContainerStyle={styles.listContent}
           ItemSeparatorComponent={renderSeparator}
           fadingEdgeLength={20}
-          ListEmptyComponent={renderEmpty}
           keyExtractor={item => `${item.serviceProvider}-${item.paymentMethodType}`}
           getItemLayout={(_, index) => ({
             length: QUOTE_ITEM_HEIGHT + SEPARATOR_HEIGHT,

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

@@ -7,30 +7,28 @@ import {
   ThemeController,
   RouterController,
   type OnRampControllerState,
-  AssetUtil,
   SnackController,
   ConstantsUtil,
-  ConnectionsController
+  ConnectionsController,
+  AssetController
 } from '@reown/appkit-core-react-native';
 import {
   Button,
   FlexView,
   Image,
-  ListItem,
   Text,
   TokenButton,
   useTheme
 } from '@reown/appkit-ui-react-native';
 import { NumberUtil, StringUtil } from '@reown/appkit-common-react-native';
 import { SelectorModal } from '../../partials/w3m-selector-modal';
-import { Currency } from './components/Currency';
-import { getPurchaseCurrencies, getCurrencySuggestedValues } from './utils';
+import { Currency, ITEM_HEIGHT as CURRENCY_ITEM_HEIGHT } from './components/Currency';
+import { getPurchaseCurrencies, getQuotesDebounced } from './utils';
 import { CurrencyInput } from './components/CurrencyInput';
 import { SelectPaymentModal } from './components/SelectPaymentModal';
-import { ITEM_HEIGHT as CURRENCY_ITEM_HEIGHT } from './components/Currency';
 import { Header } from './components/Header';
-import { UiUtil } from '../../utils/UiUtil';
 import { LoadingView } from './components/LoadingView';
+import PaymentButton from './components/PaymentButton';
 import styles from './styles';
 
 const MemoizedCurrency = memo(Currency);
@@ -42,24 +40,23 @@ export function OnRampView() {
   const {
     purchaseCurrency,
     paymentCurrency,
-    paymentMethods,
     selectedPaymentMethod,
     paymentAmount,
     quotesLoading,
+    quotes,
     selectedQuote,
     error,
     loading,
     initialLoading
   } = useSnapshot(OnRampController.state) as OnRampControllerState;
   const { activeNetwork } = useSnapshot(ConnectionsController.state);
+  const { networkImages } = useSnapshot(AssetController.state);
   const [searchValue, setSearchValue] = useState('');
   const [isCurrencyModalVisible, setIsCurrencyModalVisible] = useState(false);
   const [isPaymentMethodModalVisible, setIsPaymentMethodModalVisible] = useState(false);
-  const providerImage = OnRampController.getServiceProviderImage(selectedQuote?.serviceProvider);
-  const suggestedValues = getCurrencySuggestedValues(paymentCurrency);
   const purchaseCurrencyCode =
     purchaseCurrency?.currencyCode?.split('_')[0] ?? purchaseCurrency?.currencyCode;
-  const networkImage = AssetUtil.getNetworkImage(activeNetwork?.id);
+  const networkImage = activeNetwork ? networkImages[activeNetwork.id] : undefined;
 
   const getQuotes = useCallback(() => {
     if (OnRampController.canGenerateQuote()) {
@@ -67,24 +64,41 @@ export function OnRampView() {
     }
   }, []);
 
-  const getProviderButtonText = () => {
-    if (selectedQuote) {
-      return 'via ';
+  const getPaymentButtonTitle = () => {
+    if (selectedPaymentMethod) {
+      return selectedPaymentMethod.name;
+    }
+
+    if (quotesLoading) {
+      return 'Loading quotes';
     }
 
-    if (!paymentAmount) {
-      return 'Enter an amount';
+    if (!paymentAmount || quotes?.length === 0) {
+      return 'Enter a valid amount';
     }
 
-    if (!paymentMethods?.length) {
-      return 'No payment methods available';
+    return '';
+  };
+
+  const getPaymentButtonSubtitle = () => {
+    if (selectedQuote) {
+      return StringUtil.capitalize(selectedQuote?.serviceProvider);
+    }
+
+    if (selectedPaymentMethod) {
+      if (quotesLoading) {
+        return 'Loading quotes';
+      }
+
+      if (!paymentAmount || quotes?.length === 0) {
+        return 'Enter a valid amount';
+      }
     }
 
-    return 'Select a provider';
+    return undefined;
   };
 
   const onValueChange = (value: number) => {
-    UiUtil.animateChange();
     if (!value) {
       OnRampController.abortGetQuotes();
       OnRampController.setPaymentAmount(0);
@@ -95,13 +109,7 @@ export function OnRampView() {
     }
 
     OnRampController.setPaymentAmount(value);
-    OnRampController.getQuotesDebounced();
-  };
-
-  const onSuggestedValuePress = (value: number) => {
-    UiUtil.animateChange();
-    OnRampController.setPaymentAmount(value);
-    getQuotes();
+    getQuotesDebounced();
   };
 
   const handleSearch = (value: string) => {
@@ -141,10 +149,6 @@ export function OnRampView() {
     setIsPaymentMethodModalVisible(false);
   };
 
-  useEffect(() => {
-    getQuotes();
-  }, [selectedPaymentMethod, getQuotes]);
-
   useEffect(() => {
     if (error?.type === ConstantsUtil.ONRAMP_ERROR_TYPES.FAILED_TO_LOAD) {
       SnackController.showInternalError({
@@ -195,8 +199,6 @@ export function OnRampView() {
             value={paymentAmount?.toString()}
             symbol={paymentCurrency?.currencyCode}
             error={error?.message}
-            suggestedValues={suggestedValues}
-            onSuggestedValuePress={onSuggestedValuePress}
             isAmountError={
               error?.type === ConstantsUtil.ONRAMP_ERROR_TYPES.AMOUNT_TOO_LOW ||
               error?.type === ConstantsUtil.ONRAMP_ERROR_TYPES.AMOUNT_TOO_HIGH ||
@@ -211,46 +213,16 @@ export function OnRampView() {
             onValueChange={onValueChange}
             style={styles.currencyInput}
           />
-          <ListItem
-            chevron
-            backgroundColor="gray-glass-005"
+          <PaymentButton
+            title={getPaymentButtonTitle()}
+            subtitle={getPaymentButtonSubtitle()}
+            paymentLogo={selectedPaymentMethod?.logos[themeMode ?? 'light']}
+            providerLogo={OnRampController.getServiceProviderImage(selectedQuote?.serviceProvider)}
+            disabled={!paymentAmount || quotes?.length === 0}
             loading={quotesLoading || loading}
             onPress={() => setIsPaymentMethodModalVisible(true)}
-            style={styles.paymentMethodButton}
-            imageSrc={selectedPaymentMethod?.logos[themeMode ?? 'light']}
-            imageStyle={styles.paymentMethodImage}
-            imageContainerStyle={[
-              styles.paymentMethodImageContainer,
-              { backgroundColor: Theme['gray-glass-010'] }
-            ]}
-            disabled={!selectedPaymentMethod || !paymentAmount}
             testID="payment-method-button"
-          >
-            <FlexView>
-              {selectedPaymentMethod?.name && (
-                <Text variant="paragraph-400" color="fg-100">
-                  {selectedPaymentMethod.name}
-                </Text>
-              )}
-              {getProviderButtonText() && (
-                <FlexView flexDirection="row" alignItems="center" margin={['3xs', '0', '0', '0']}>
-                  <Text variant="small-400" color="fg-150">
-                    {getProviderButtonText()}
-                  </Text>
-                  {selectedQuote && (
-                    <>
-                      {providerImage && (
-                        <Image source={providerImage} style={styles.providerImage} />
-                      )}
-                      <Text variant="small-400" color="fg-150">
-                        {StringUtil.capitalize(selectedQuote?.serviceProvider)}
-                      </Text>
-                    </>
-                  )}
-                </FlexView>
-              )}
-            </FlexView>
-          </ListItem>
+          />
           <FlexView
             flexDirection="row"
             alignItems="center"

package/src/views/w3m-onramp-view/styles.ts

@@ -37,5 +37,9 @@ export default StyleSheet.create({
     width: 14,
     borderRadius: BorderRadius.full,
     borderWidth: 1
+  },
+  paymentButtonMock: {
+    borderRadius: BorderRadius.s,
+    height: 64
   }
 });

package/src/views/w3m-onramp-view/utils.ts

@@ -1,13 +1,17 @@
 import {
   OnRampController,
-  NetworkController,
-  type OnRampFiatCurrency,
-  ConstantsUtil
+  ConnectionsController,
+  CoreHelperUtil
 } from '@reown/appkit-core-react-native';
 
 // -------------------------- Utils --------------------------
 export const getPurchaseCurrencies = (searchValue?: string, filterSelected?: boolean) => {
-  const networkId = NetworkController.state.caipNetwork?.id?.split(':')[1];
+  const networkId = getNetworkId();
+
+  if (!networkId) {
+    return [];
+  }
+
   let networkTokens =
     OnRampController.state.purchaseCurrencies?.filter(c => c.chainId === networkId) ?? [];
 
@@ -21,104 +25,30 @@ export const getPurchaseCurrencies = (searchValue?: string, filterSelected?: boo
     ? networkTokens.filter(
         item =>
           item.name.toLowerCase().includes(searchValue) ||
-          item.currencyCode.toLowerCase().includes(searchValue)
+          item.currencyCode.toLowerCase()?.split('_')?.[0]?.includes(searchValue)
       )
     : networkTokens;
 };
 
-// Helper function to generate values based on limits and default value
-function generateValuesFromLimits(
-  minAmount: number,
-  maxAmount: number,
-  defaultAmount?: number | null
-): number[] {
-  // Use default amount if provided, otherwise calculate a reasonable default
-  const baseAmount = defaultAmount || Math.min(maxAmount, Math.max(minAmount * 5, 50));
-
-  // Generate two values less than the default and the default itself
-  const value1 = Math.max(minAmount, baseAmount * 0.5);
-  const value2 = Math.max(minAmount, baseAmount * 0.75);
-  const value3 = baseAmount;
+export const getQuotesDebounced = CoreHelperUtil.debounce(function () {
+  OnRampController.getQuotes();
+}, 500);
 
-  // Ensure all values are within the maximum limit
-  const safeValue1 = Math.min(value1, maxAmount);
-  const safeValue2 = Math.min(value2, maxAmount);
-  const safeValue3 = Math.min(value3, maxAmount);
+export const getNetworkId = (): string | undefined => {
+  const [namespace, chainId] =
+    ConnectionsController.state.activeNetwork?.caipNetworkId?.split(':') ?? [];
 
-  // Round all values to nice numbers
-  return [safeValue1, safeValue2, safeValue3].map(v => roundToNiceNumber(v));
-}
-
-// Helper function to round to nice numbers
-function roundToNiceNumber(value: number): number {
-  if (value < 10) return Math.ceil(value);
-
-  if (value < 100) {
-    // Round to nearest 10
-    return Math.ceil(value / 10) * 10;
-  } else if (value < 1000) {
-    // Round to nearest 50
-    return Math.ceil(value / 50) * 50;
-  } else if (value < 10000) {
-    // Round to nearest 100
-    return Math.ceil(value / 100) * 100;
-  } else if (value < 100000) {
-    // Round to nearest 1000
-    return Math.ceil(value / 1000) * 1000;
-  } else if (value < 1000000) {
-    // Round to nearest 10000
-    return Math.ceil(value / 10000) * 10000;
-  } else {
-    // Round to nearest 100000
-    return Math.ceil(value / 100000) * 100000;
+  if (!namespace || !chainId) {
+    return undefined;
   }
-}
-
-export const getCurrencySuggestedValues = (currency?: OnRampFiatCurrency) => {
-  if (!currency) return [];
 
-  const limit = OnRampController.getCurrencyLimit(currency);
-
-  // If we have predefined values for this currency, use them
-  if (
-    ConstantsUtil.CURRENCY_SUGGESTED_VALUES[
-      currency.currencyCode as keyof typeof ConstantsUtil.CURRENCY_SUGGESTED_VALUES
-    ]
-  ) {
-    const suggestedValues =
-      ConstantsUtil.CURRENCY_SUGGESTED_VALUES[
-        currency.currencyCode as keyof typeof ConstantsUtil.CURRENCY_SUGGESTED_VALUES
-      ];
-
-    // Ensure values are within limits
-    if (limit) {
-      const minAmount = limit.minimumAmount ?? 0;
-      const maxAmount = limit.maximumAmount ?? Infinity;
-
-      // Filter values that are within limits
-      const validValues = suggestedValues?.filter(
-        (value: number) => value >= minAmount && value <= maxAmount
-      );
-
-      // If we have valid values, return them
-      if (validValues?.length) {
-        return validValues;
-      }
-
-      // If no valid values, generate new ones based on limits and default
-      return generateValuesFromLimits(minAmount, maxAmount, limit?.defaultAmount);
-    }
-
-    return suggestedValues;
+  if (namespace === 'solana') {
+    return '101'; // Solana mainnet on Meld
   }
 
-  // Fallback to generating values from limits
-  if (limit) {
-    const minAmount = limit.minimumAmount ?? 0;
-    const maxAmount = limit.maximumAmount ?? Infinity;
-
-    return generateValuesFromLimits(minAmount, maxAmount, limit?.defaultAmount);
+  if (namespace === 'bip122') {
+    return `${namespace}:${chainId}`; // Bitcoin mainnet
   }
 
-  return [];
+  return chainId;
 };

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

@@ -46,6 +46,7 @@ export function SwapPreviewView() {
     loadingQuote || loadingBuildTransaction || loadingTransaction || loadingApprovalTransaction;
 
   const onCancel = () => {
+    SwapController.clearTransactionLoaders();
     RouterController.goBack();
   };