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

package/src/utils/CoreHelperUtil.ts

@@ -2,16 +2,22 @@
 
 import { Linking, Platform } from 'react-native';
 import {
+  BlockchainAdapter,
   ConstantsUtil as CommonConstants,
+  type AdapterType,
   type Balance,
   type CaipAddress,
-  type CaipNetwork
+  type CaipNetwork,
+  type ChainNamespace,
+  type SocialProvider,
+  type LinkingRecord
 } from '@reown/appkit-common-react-native';
 
 import * as ct from 'countries-and-timezones';
 
 import { ConstantsUtil } from './ConstantsUtil';
-import type { DataWallet, LinkingRecord } from './TypeUtil';
+import type { DataWallet, SdkVersion } from './TypeUtil';
+
 // -- Helpers -----------------------------------------------------------------
 async function isAppInstalledIos(deepLink?: string): Promise<boolean> {
   try {
@@ -102,7 +108,7 @@ export const CoreHelperUtil = {
     };
   },
 
-  formatUniversalUrl(appUrl: string, wcUri: string): LinkingRecord {
+  formatUniversalUrl(appUrl: string, wcUri: string, provider?: SocialProvider): LinkingRecord {
     if (CoreHelperUtil.isLinkModeURL(wcUri)) {
       return {
         redirect: wcUri,
@@ -120,7 +126,9 @@ export const CoreHelperUtil = {
     const encodedWcUrl = encodeURIComponent(wcUri);
 
     return {
-      redirect: `${safeAppUrl}wc?uri=${encodedWcUrl}`,
+      redirect: provider
+        ? `${safeAppUrl}wc?uri=${encodedWcUrl}&provider=${provider}`
+        : `${safeAppUrl}wc?uri=${encodedWcUrl}`,
       href: safeAppUrl
     };
   },
@@ -149,8 +157,8 @@ export const CoreHelperUtil = {
     return formattedBalance ? `${formattedBalance} ${symbol}` : `0.000 ${symbol || ''}`;
   },
 
-  isAddress(address: string, chain = 'eip155'): boolean {
-    switch (chain) {
+  isAddress(address: string, namespace: ChainNamespace = 'eip155'): boolean {
+    switch (namespace) {
       case 'eip155':
         if (!/^(?:0x)?[0-9a-f]{40}$/iu.test(address)) {
           return false;
@@ -191,7 +199,7 @@ export const CoreHelperUtil = {
       const { timeZone } = new Intl.DateTimeFormat().resolvedOptions();
       const country = ct.getCountryForTimezone(timeZone);
 
-      return country ? country.id : 'US'; // 'id' is the ISO country code (e.g., "GB" for United Kingdom)
+      return country ? country.id : 'US'; // 'id' is the ISO country code (e.g., "US" for United States)
     } catch (error) {
       return 'US';
     }
@@ -282,7 +290,7 @@ export const CoreHelperUtil = {
 
     let sum = 0;
     for (const item of array) {
-      sum += item.value ?? 0;
+      sum += item?.value ?? 0;
     }
 
     const roundedNumber = sum.toFixed(2);
@@ -322,5 +330,19 @@ export const CoreHelperUtil = {
         func(...args);
       }, wait);
     };
+  },
+
+  generateSdkVersion(adapters: BlockchainAdapter[], version: string): SdkVersion {
+    const hasNoAdapters = adapters.length === 0;
+    const universalType: AdapterType = 'universal';
+
+    const adapterNames = hasNoAdapters
+      ? universalType
+      : adapters
+          .sort((a, b) => a.adapterType.localeCompare(b.adapterType))
+          .map(adapter => adapter.adapterType)
+          .join(',');
+
+    return `react-native-${adapterNames}-${version}`;
   }
 };

package/src/utils/FetchUtil.ts

@@ -88,26 +88,53 @@ export class FetchUtil {
   }
 
   private createUrl({ path, params }: RequestArguments) {
-    const url = new URL(path, this.baseUrl);
-    if (params) {
-      Object.entries(params).forEach(([key, value]) => {
-        if (value) {
-          url.searchParams.append(key, value);
-        }
-      });
+    let fullUrl: string;
+
+    const isAbsoluteUrl = path.startsWith('http://') || path.startsWith('https://');
+
+    if (isAbsoluteUrl) {
+      fullUrl = path;
+    } else {
+      const baseUrl = this.baseUrl.endsWith('/') ? this.baseUrl : `${this.baseUrl}/`;
+      const pathUrl = path.startsWith('/') ? path.substring(1) : path;
+      fullUrl = `${baseUrl}${pathUrl}`;
     }
 
+    const allParams: Record<string, string | undefined> = { ...params };
     if (this.clientId) {
-      url.searchParams.append('clientId', this.clientId);
+      allParams['clientId'] = this.clientId;
+    }
+
+    const queryParams: string[] = [];
+    for (const key in allParams) {
+      const value = allParams[key];
+      if (value !== undefined && value !== null && value !== '') {
+        queryParams.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+      }
+    }
+
+    if (queryParams.length > 0) {
+      const queryString = queryParams.join('&');
+      if (fullUrl.includes('?')) {
+        fullUrl = `${fullUrl}&${queryString}`;
+      } else {
+        fullUrl = `${fullUrl}?${queryString}`;
+      }
     }
 
-    return url.toString();
+    return fullUrl;
   }
 
   private async processResponse<T>(response: Response) {
     if (!response.ok) {
       if (response.headers.get('content-type')?.includes('application/json')) {
-        return Promise.reject((await response.json()) as T);
+        try {
+          const errorData = await response.json();
+
+          return Promise.reject(errorData);
+        } catch (jsonError) {
+          return Promise.reject(`Code: ${response.status} - ${response.statusText}`);
+        }
       }
 
       const errorText = await response.text();