@dynamic-labs/sdk-react-core 2.0.0-alpha.21 → 2.0.0-alpha.23

package/src/lib/utils/constants/localStorage.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const AUTH_TOKEN = 'dynamic_authentication_token';
+const AUTH_MIN_TOKEN = 'dynamic_min_authentication_token';
 const AUTH_USER = 'dynamic_authenticated_user';
 const LAST_USED_WALLET = 'dynamic_last_used_wallet';
 const NETWORKS_STORAGE_KEY = 'dynamic_networks';
@@ -14,24 +15,23 @@ const NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY = 'dynamic_newtoweb3_wallet_extension_
 const CONNECTED_WALLETS_INFO = 'dynamic_connected_wallets';
 const AUTH_MODE = 'dynamic_auth_mode';
 const CONNECTED_WALLET_NAME_SERVICE = 'dynamic_connected_wallet_ns';
-const IS_FULLY_CONNECTED = 'dynamic_fully_connected';
-const IS_MULTI_WALLET_ENABLED = 'dynamic_multi_wallet_enabled';
+const BRIDGE_ONBOARDING_COMPLETED = 'dynamic_bridge_onboarding_completed';
 const DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = 'dynamic_context_session_settings';
 const WAGMI_LAST_SESSION_SETTINGS = 'dynamic_wagmi_session_settings';
 const EMBEDDED_WALLET_SESSION_SETTINGS = 'dynamic_embedded_wallet_session_settings';
 const EMBEDDED_WALLET_SECURE_BANNER = 'dynamic_embedded_secure_banner';
 const PHONE_INPUT_DEFAULT_COUNTRY = 'dynamic_phone_input_default_country';
 
+exports.AUTH_MIN_TOKEN = AUTH_MIN_TOKEN;
 exports.AUTH_MODE = AUTH_MODE;
 exports.AUTH_TOKEN = AUTH_TOKEN;
 exports.AUTH_USER = AUTH_USER;
+exports.BRIDGE_ONBOARDING_COMPLETED = BRIDGE_ONBOARDING_COMPLETED;
 exports.CONNECTED_WALLETS_INFO = CONNECTED_WALLETS_INFO;
 exports.CONNECTED_WALLET_NAME_SERVICE = CONNECTED_WALLET_NAME_SERVICE;
 exports.DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS;
 exports.EMBEDDED_WALLET_SECURE_BANNER = EMBEDDED_WALLET_SECURE_BANNER;
 exports.EMBEDDED_WALLET_SESSION_SETTINGS = EMBEDDED_WALLET_SESSION_SETTINGS;
-exports.IS_FULLY_CONNECTED = IS_FULLY_CONNECTED;
-exports.IS_MULTI_WALLET_ENABLED = IS_MULTI_WALLET_ENABLED;
 exports.LAST_USED_WALLET = LAST_USED_WALLET;
 exports.NETWORKS_STORAGE_KEY = NETWORKS_STORAGE_KEY;
 exports.NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY = NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY;

package/src/lib/utils/constants/localStorage.d.ts

@@ -1,4 +1,5 @@
 export declare const AUTH_TOKEN = "dynamic_authentication_token";
+export declare const AUTH_MIN_TOKEN = "dynamic_min_authentication_token";
 export declare const AUTH_USER = "dynamic_authenticated_user";
 export declare const LAST_USED_WALLET = "dynamic_last_used_wallet";
 export declare const NETWORKS_STORAGE_KEY = "dynamic_networks";
@@ -11,8 +12,7 @@ export declare const NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY = "dynamic_newtoweb3_wa
 export declare const CONNECTED_WALLETS_INFO = "dynamic_connected_wallets";
 export declare const AUTH_MODE = "dynamic_auth_mode";
 export declare const CONNECTED_WALLET_NAME_SERVICE = "dynamic_connected_wallet_ns";
-export declare const IS_FULLY_CONNECTED = "dynamic_fully_connected";
-export declare const IS_MULTI_WALLET_ENABLED = "dynamic_multi_wallet_enabled";
+export declare const BRIDGE_ONBOARDING_COMPLETED = "dynamic_bridge_onboarding_completed";
 export declare const DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = "dynamic_context_session_settings";
 export declare const WAGMI_LAST_SESSION_SETTINGS = "dynamic_wagmi_session_settings";
 export declare const EMBEDDED_WALLET_SESSION_SETTINGS = "dynamic_embedded_wallet_session_settings";

package/src/lib/utils/constants/localStorage.js

@@ -1,4 +1,5 @@
 const AUTH_TOKEN = 'dynamic_authentication_token';
+const AUTH_MIN_TOKEN = 'dynamic_min_authentication_token';
 const AUTH_USER = 'dynamic_authenticated_user';
 const LAST_USED_WALLET = 'dynamic_last_used_wallet';
 const NETWORKS_STORAGE_KEY = 'dynamic_networks';
@@ -10,12 +11,11 @@ const NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY = 'dynamic_newtoweb3_wallet_extension_
 const CONNECTED_WALLETS_INFO = 'dynamic_connected_wallets';
 const AUTH_MODE = 'dynamic_auth_mode';
 const CONNECTED_WALLET_NAME_SERVICE = 'dynamic_connected_wallet_ns';
-const IS_FULLY_CONNECTED = 'dynamic_fully_connected';
-const IS_MULTI_WALLET_ENABLED = 'dynamic_multi_wallet_enabled';
+const BRIDGE_ONBOARDING_COMPLETED = 'dynamic_bridge_onboarding_completed';
 const DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = 'dynamic_context_session_settings';
 const WAGMI_LAST_SESSION_SETTINGS = 'dynamic_wagmi_session_settings';
 const EMBEDDED_WALLET_SESSION_SETTINGS = 'dynamic_embedded_wallet_session_settings';
 const EMBEDDED_WALLET_SECURE_BANNER = 'dynamic_embedded_secure_banner';
 const PHONE_INPUT_DEFAULT_COUNTRY = 'dynamic_phone_input_default_country';
 
-export { AUTH_MODE, AUTH_TOKEN, AUTH_USER, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER, EMBEDDED_WALLET_SESSION_SETTINGS, IS_FULLY_CONNECTED, IS_MULTI_WALLET_ENABLED, LAST_USED_WALLET, NETWORKS_STORAGE_KEY, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, NONCE_STORAGE_KEY, PHONE_INPUT_DEFAULT_COUNTRY, PRIMARY_WALLET_ID, PROJECT_SETTINGS_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };
+export { AUTH_MIN_TOKEN, AUTH_MODE, AUTH_TOKEN, AUTH_USER, BRIDGE_ONBOARDING_COMPLETED, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER, EMBEDDED_WALLET_SESSION_SETTINGS, LAST_USED_WALLET, NETWORKS_STORAGE_KEY, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, NONCE_STORAGE_KEY, PHONE_INPUT_DEFAULT_COUNTRY, PRIMARY_WALLET_ID, PROJECT_SETTINGS_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };

package/src/lib/utils/functions/formatPhone/formatPhone.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var reactInternationalPhone = require('react-international-phone');
+var getCustomCountries = require('../getCustomCountries/getCustomCountries.cjs');
 
 /**
  * This takes a phone number (with country code, doesn't work otherwise)
@@ -10,7 +11,11 @@ var reactInternationalPhone = require('react-international-phone');
  */
 const formatPhone = (phone) => {
     var _a;
-    const { country } = reactInternationalPhone.guessCountryByPartialPhoneNumber({ phone });
+    const { country } = reactInternationalPhone.guessCountryByPartialPhoneNumber({
+        // Enables using custom formatting
+        countries: getCustomCountries.getCustomCountries(),
+        phone,
+    });
     if (!country)
         return phone;
     const strippedPhone = reactInternationalPhone.removeDialCode({ dialCode: country.dialCode, phone });

package/src/lib/utils/functions/formatPhone/formatPhone.js

@@ -1,4 +1,5 @@
 import { guessCountryByPartialPhoneNumber, removeDialCode, getActiveFormattingMask } from 'react-international-phone';
+import { getCustomCountries } from '../getCustomCountries/getCustomCountries.js';
 
 /**
  * This takes a phone number (with country code, doesn't work otherwise)
@@ -6,7 +7,11 @@ import { guessCountryByPartialPhoneNumber, removeDialCode, getActiveFormattingMa
  */
 const formatPhone = (phone) => {
     var _a;
-    const { country } = guessCountryByPartialPhoneNumber({ phone });
+    const { country } = guessCountryByPartialPhoneNumber({
+        // Enables using custom formatting
+        countries: getCustomCountries(),
+        phone,
+    });
     if (!country)
         return phone;
     const strippedPhone = removeDialCode({ dialCode: country.dialCode, phone });

package/src/lib/utils/functions/getCustomCountries/getCustomCountries.cjs

@@ -0,0 +1,25 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var reactInternationalPhone = require('react-international-phone');
+
+// To see which iso2 maps to which country, see
+// https://github.com/goveo/react-international-phone/blob/master/src/data/countryData.ts
+const getCustomCountries = (withVerification) => {
+    const customCountries = reactInternationalPhone.defaultCountries.map(reactInternationalPhone.parseCountry).map((country) => {
+        if (country.iso2 === 'br')
+            country.format = '(..) .....-....';
+        if (country.iso2 === 'fr')
+            country.format = '(.) .. .. .. ..';
+        return reactInternationalPhone.buildCountryData(country);
+    });
+    return withVerification
+        ? customCountries.filter(([, iso2]) => supportedCountriesForVerification.includes(iso2))
+        : customCountries;
+};
+/** Which countries we support sending OTPs to */
+const supportedCountriesForVerification = ['us', 'ca'];
+
+exports.getCustomCountries = getCustomCountries;
+exports.supportedCountriesForVerification = supportedCountriesForVerification;

package/src/lib/utils/functions/getCustomCountries/getCustomCountries.d.ts

@@ -0,0 +1,4 @@
+import { CountryData, CountryIso2 } from 'react-international-phone';
+export declare const getCustomCountries: (withVerification?: boolean) => CountryData[];
+/** Which countries we support sending OTPs to */
+export declare const supportedCountriesForVerification: CountryIso2[];

package/src/lib/utils/functions/getCustomCountries/getCustomCountries.js

@@ -0,0 +1,20 @@
+import { defaultCountries, parseCountry, buildCountryData } from 'react-international-phone';
+
+// To see which iso2 maps to which country, see
+// https://github.com/goveo/react-international-phone/blob/master/src/data/countryData.ts
+const getCustomCountries = (withVerification) => {
+    const customCountries = defaultCountries.map(parseCountry).map((country) => {
+        if (country.iso2 === 'br')
+            country.format = '(..) .....-....';
+        if (country.iso2 === 'fr')
+            country.format = '(.) .. .. .. ..';
+        return buildCountryData(country);
+    });
+    return withVerification
+        ? customCountries.filter(([, iso2]) => supportedCountriesForVerification.includes(iso2))
+        : customCountries;
+};
+/** Which countries we support sending OTPs to */
+const supportedCountriesForVerification = ['us', 'ca'];
+
+export { getCustomCountries, supportedCountriesForVerification };

package/src/lib/utils/functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.cjs

@@ -5,21 +5,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 /**
  * This will return a string which we can present to the user credential type
  * @param decodedJwt
- * @returns CredentialType | undefined
+ * @param type optional parameter to check for specific credential type
+ * @returns JwtVerifiedCredentialFormatEnum | undefined
  */
-const getUserVerifiedCredentialType = (decodedJwt) => {
-    var _a;
-    const verifiedCredential = (_a = decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find((credentials) => credentials.id === decodedJwt.lastVerifiedCredentialId);
-    if (!(verifiedCredential === null || verifiedCredential === void 0 ? void 0 : verifiedCredential.publicIdentifier)) {
-        return;
+const getUserVerifiedCredentialType = (decodedJwt, type) => {
+    var _a, _b, _c;
+    if (type) {
+        return (_b = (_a = decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find((credentials) => credentials.format === type)) === null || _b === void 0 ? void 0 : _b.format;
     }
-    if (verifiedCredential === null || verifiedCredential === void 0 ? void 0 : verifiedCredential.email) {
-        return 'email';
-    }
-    if (verifiedCredential === null || verifiedCredential === void 0 ? void 0 : verifiedCredential.phoneNumber) {
-        return 'phone';
-    }
-    return 'wallet';
+    const verifiedCredential = (_c = decodedJwt.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.find((credentials) => credentials.id === decodedJwt.lastVerifiedCredentialId);
+    return verifiedCredential === null || verifiedCredential === void 0 ? void 0 : verifiedCredential.format;
 };
 
 exports.getUserVerifiedCredentialType = getUserVerifiedCredentialType;

package/src/lib/utils/functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.d.ts

@@ -1,9 +1,8 @@
-import { DynamicJwt } from '@dynamic-labs/sdk-api';
-type CredentialType = 'email' | 'phone' | 'wallet';
+import { DynamicJwt, JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api';
 /**
  * This will return a string which we can present to the user credential type
  * @param decodedJwt
- * @returns CredentialType | undefined
+ * @param type optional parameter to check for specific credential type
+ * @returns JwtVerifiedCredentialFormatEnum | undefined
  */
-export declare const getUserVerifiedCredentialType: (decodedJwt: DynamicJwt) => CredentialType | undefined;
-export {};
+export declare const getUserVerifiedCredentialType: (decodedJwt: DynamicJwt, type?: JwtVerifiedCredentialFormatEnum) => JwtVerifiedCredentialFormatEnum | undefined;

package/src/lib/utils/functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.js

@@ -1,21 +1,16 @@
 /**
  * This will return a string which we can present to the user credential type
  * @param decodedJwt
- * @returns CredentialType | undefined
+ * @param type optional parameter to check for specific credential type
+ * @returns JwtVerifiedCredentialFormatEnum | undefined
  */
-const getUserVerifiedCredentialType = (decodedJwt) => {
-    var _a;
-    const verifiedCredential = (_a = decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find((credentials) => credentials.id === decodedJwt.lastVerifiedCredentialId);
-    if (!(verifiedCredential === null || verifiedCredential === void 0 ? void 0 : verifiedCredential.publicIdentifier)) {
-        return;
+const getUserVerifiedCredentialType = (decodedJwt, type) => {
+    var _a, _b, _c;
+    if (type) {
+        return (_b = (_a = decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find((credentials) => credentials.format === type)) === null || _b === void 0 ? void 0 : _b.format;
     }
-    if (verifiedCredential === null || verifiedCredential === void 0 ? void 0 : verifiedCredential.email) {
-        return 'email';
-    }
-    if (verifiedCredential === null || verifiedCredential === void 0 ? void 0 : verifiedCredential.phoneNumber) {
-        return 'phone';
-    }
-    return 'wallet';
+    const verifiedCredential = (_c = decodedJwt.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.find((credentials) => credentials.id === decodedJwt.lastVerifiedCredentialId);
+    return verifiedCredential === null || verifiedCredential === void 0 ? void 0 : verifiedCredential.format;
 };
 
 export { getUserVerifiedCredentialType };

package/src/lib/utils/functions/getWalletProvider/getWalletProvider.d.ts

@@ -1,2 +1,3 @@
-import { WalletConnector, WalletProvider } from '../../../..';
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { WalletProvider } from '../../../shared';
 export declare const getWalletProvider: (connector: WalletConnector) => WalletProvider;

package/src/lib/utils/functions/handleUnlinkHelper/handleUnlinkHelper.cjs

@@ -34,8 +34,8 @@ const handleUnlinkHelper = ({ environmentId, primaryWalletId, walletId, }) => _t
     const token = getAuthToken.getAuthToken();
     if (!token)
         return;
-    const jwt = yield api.unlinkWallet({ environmentId, primaryWalletId, walletId }, token);
-    return updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(jwt);
+    const response = yield api.unlinkWallet({ environmentId, primaryWalletId, walletId }, token);
+    return updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
 });
 
 exports.handleUnlinkHelper = handleUnlinkHelper;

package/src/lib/utils/functions/handleUnlinkHelper/handleUnlinkHelper.js

@@ -30,8 +30,8 @@ const handleUnlinkHelper = ({ environmentId, primaryWalletId, walletId, }) => __
     const token = getAuthToken();
     if (!token)
         return;
-    const jwt = yield unlinkWallet({ environmentId, primaryWalletId, walletId }, token);
-    return updateJWTAndCreateUserProfile(jwt);
+    const response = yield unlinkWallet({ environmentId, primaryWalletId, walletId }, token);
+    return updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
 });
 
 export { handleUnlinkHelper };

package/src/lib/utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.cjs

@@ -5,14 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var sdkApi = require('@dynamic-labs/sdk-api');
 var isProviderEnabled = require('../isProviderEnabled/isProviderEnabled.cjs');
 
-const isEmailProviderEnabled = (providers) => 
-// For v0.19 we will support emailOnly and Dynamic as email providers
-// For v0.20/v1 we need to remove emailOnly and leave Dynamic as the only one email provider
-// Ticket: https://linear.app/dynamic-labs/issue/GVTY-213/remove-emailonly-as-a-provider-from-sdk
-// (Blocto and Magic stay as they are)
-providers !== undefined &&
-    (isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.EmailOnly) ||
-        isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.Dynamic) ||
+const isEmailProviderEnabled = (providers) => providers !== undefined &&
+    (isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.Dynamic) ||
         isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.Blocto) ||
         isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.MagicLink));
 

package/src/lib/utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.js

@@ -1,14 +1,8 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
 import { isProviderEnabled } from '../isProviderEnabled/isProviderEnabled.js';
 
-const isEmailProviderEnabled = (providers) => 
-// For v0.19 we will support emailOnly and Dynamic as email providers
-// For v0.20/v1 we need to remove emailOnly and leave Dynamic as the only one email provider
-// Ticket: https://linear.app/dynamic-labs/issue/GVTY-213/remove-emailonly-as-a-provider-from-sdk
-// (Blocto and Magic stay as they are)
-providers !== undefined &&
-    (isProviderEnabled(providers, ProviderEnum.EmailOnly) ||
-        isProviderEnabled(providers, ProviderEnum.Dynamic) ||
+const isEmailProviderEnabled = (providers) => providers !== undefined &&
+    (isProviderEnabled(providers, ProviderEnum.Dynamic) ||
         isProviderEnabled(providers, ProviderEnum.Blocto) ||
         isProviderEnabled(providers, ProviderEnum.MagicLink));
 

package/src/lib/utils/functions/storeAuthToken/index.cjs

@@ -17,8 +17,9 @@ var localStorage = require('../../../shared/utils/classes/storage/localStorage.c
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 
-const storeAuthToken = (jwt) => {
+const storeAuthToken = (jwt, minifiedJwt) => {
     localStorage.LocalStorage.setToLS(localStorage$1.AUTH_TOKEN, jwt, true);
+    localStorage.LocalStorage.setToLS(localStorage$1.AUTH_MIN_TOKEN, minifiedJwt, true);
 };
 
 exports.storeAuthToken = storeAuthToken;

package/src/lib/utils/functions/storeAuthToken/index.d.ts

@@ -1 +1 @@
-export declare const storeAuthToken: (jwt: string) => void;
+export declare const storeAuthToken: (jwt: string, minifiedJwt: string) => void;

package/src/lib/utils/functions/storeAuthToken/index.js

@@ -6,15 +6,16 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import { AUTH_TOKEN } from '../../constants/localStorage.js';
+import { AUTH_TOKEN, AUTH_MIN_TOKEN } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 
-const storeAuthToken = (jwt) => {
+const storeAuthToken = (jwt, minifiedJwt) => {
     LocalStorage.setToLS(AUTH_TOKEN, jwt, true);
+    LocalStorage.setToLS(AUTH_MIN_TOKEN, minifiedJwt, true);
 };
 
 export { storeAuthToken };

package/src/lib/utils/functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.cjs

@@ -7,12 +7,12 @@ var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs
 var createUserProfile = require('../createUserProfile/createUserProfile.cjs');
 var index = require('../storeAuthToken/index.cjs');
 
-const updateJWTAndCreateUserProfile = (jwt) => {
+const updateJWTAndCreateUserProfile = (jwt, minJwt) => {
     const decodedJWT = decodeJwt.decodeJwt(jwt);
-    if (!jwt || !decodedJWT) {
+    if (!jwt || !decodedJWT || !minJwt) {
         throw new utils.DynamicError('Invalid session');
     }
-    index.storeAuthToken(jwt);
+    index.storeAuthToken(jwt, minJwt);
     return createUserProfile.createUserProfile(decodedJWT);
 };
 

package/src/lib/utils/functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.d.ts

@@ -1 +1 @@
-export declare const updateJWTAndCreateUserProfile: (jwt: string | undefined) => import("../../../shared").UserProfile;
+export declare const updateJWTAndCreateUserProfile: (jwt: string | undefined, minJwt: string | undefined) => import("../../../shared").UserProfile;

package/src/lib/utils/functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js

@@ -3,12 +3,12 @@ import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.j
 import { createUserProfile } from '../createUserProfile/createUserProfile.js';
 import { storeAuthToken } from '../storeAuthToken/index.js';
 
-const updateJWTAndCreateUserProfile = (jwt) => {
+const updateJWTAndCreateUserProfile = (jwt, minJwt) => {
     const decodedJWT = decodeJwt(jwt);
-    if (!jwt || !decodedJWT) {
+    if (!jwt || !decodedJWT || !minJwt) {
         throw new DynamicError('Invalid session');
     }
-    storeAuthToken(jwt);
+    storeAuthToken(jwt, minJwt);
     return createUserProfile(decodedJWT);
 };
 

package/src/lib/utils/functions/walletListBuilder/utils/getCalculatedOffset/getCalculatedOffset.cjs

@@ -2,16 +2,21 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('../../../../constants/colors.cjs');
+var values = require('../../../../constants/values.cjs');
 var findLastPriorityIndex = require('../findLastWalletIndex/findLastPriorityIndex.cjs');
 
 const getCalculatedOffset = ({ hasWalletFilter, defaultOffset, list, priorityList, }) => {
     const lastPriorityIndex = findLastPriorityIndex.findLastPriorityIndex(list, priorityList);
-    if (hasWalletFilter ||
-        list.length <= defaultOffset ||
-        lastPriorityIndex === -1) {
+    if (defaultOffset === values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW &&
+        !hasWalletFilter &&
+        list.length > defaultOffset &&
+        lastPriorityIndex !== -1) {
+        return lastPriorityIndex + 1;
+    }
+    else {
         return defaultOffset;
     }
-    return lastPriorityIndex + 1;
 };
 
 exports.getCalculatedOffset = getCalculatedOffset;

package/src/lib/utils/functions/walletListBuilder/utils/getCalculatedOffset/getCalculatedOffset.js

@@ -1,13 +1,18 @@
+import '../../../../constants/colors.js';
+import { DEFAULT_NUMBER_OF_WALLETS_TO_SHOW } from '../../../../constants/values.js';
 import { findLastPriorityIndex } from '../findLastWalletIndex/findLastPriorityIndex.js';
 
 const getCalculatedOffset = ({ hasWalletFilter, defaultOffset, list, priorityList, }) => {
     const lastPriorityIndex = findLastPriorityIndex(list, priorityList);
-    if (hasWalletFilter ||
-        list.length <= defaultOffset ||
-        lastPriorityIndex === -1) {
+    if (defaultOffset === DEFAULT_NUMBER_OF_WALLETS_TO_SHOW &&
+        !hasWalletFilter &&
+        list.length > defaultOffset &&
+        lastPriorityIndex !== -1) {
+        return lastPriorityIndex + 1;
+    }
+    else {
         return defaultOffset;
     }
-    return lastPriorityIndex + 1;
 };
 
 export { getCalculatedOffset };

package/src/lib/utils/functions/walletListBuilder/walletListBuilder.cjs

@@ -107,8 +107,10 @@ const walletListBuilder = ({ authMode, connectedWallets, multiWallet, numberOfWa
     const finalizedWalletList = groupWallets
         ? groupWalletOptions.groupWalletOptions(walletBook, walletsList)
         : walletsList;
+    // If a filter has been applied we want to add an offset to the number of wallets
+    // to include the installed and last used wallets
     const updatedNumberOfWalletsToShow = showMoreWalletsWithFilter && hasWalletFilter
-        ? calculateWithFilterNumberOfWalletsToShow(orderedInputList, firstPriorityWallets.concat(installedWallets), numberOfWalletsToShow)
+        ? calculateWalletOffsetBasedOnInstalledAndLastUsedWallets(orderedInputList, firstPriorityWallets.concat(installedWallets), numberOfWalletsToShow)
         : numberOfWalletsToShow;
     return {
         numberOfWallets: walletsList.length,
@@ -126,14 +128,30 @@ const orderAndFilterList = (walletList, walletsFilter, isWalletConnectList, reco
         return sortedWalletList;
     }
 };
+const KEEP_WALLETS_NAME_LIST = ['wallet connect'];
 const applySearchFilterToWalletOptionList = (rawSearchFilter, walletOptionList) => {
     const searchFilter = rawSearchFilter.trim().toLowerCase();
+    const cleanName = (name) => {
+        const trimmedLowerName = name.trim().toLowerCase();
+        if (KEEP_WALLETS_NAME_LIST.includes(trimmedLowerName)) {
+            return trimmedLowerName;
+        }
+        else {
+            return trimmedLowerName
+                .replace('wallet', '')
+                .replace('evm', '')
+                .replace('starknet', '')
+                .replace('solana', '')
+                .replace('flow', '')
+                .replace('bitcoin', '');
+        }
+    };
     return walletOptionList.filter((walletOption) => {
         var _a;
-        return walletOption.name.trim().toLowerCase().includes(searchFilter) ||
+        return cleanName(walletOption.name).includes(searchFilter) ||
             (
             // Validate nested wallets
-            (_a = walletOption.groupedWallets) === null || _a === void 0 ? void 0 : _a.some((nestedWalletOption) => nestedWalletOption.name.trim().toLowerCase().includes(searchFilter)));
+            (_a = walletOption.groupedWallets) === null || _a === void 0 ? void 0 : _a.some((nestedWalletOption) => cleanName(nestedWalletOption.name).includes(searchFilter)));
     });
 };
 const listToDisplay = (finalizedList, searchFilter, isWalletConnectList, numberOfWalletsToShow, hasWalletFilter, loginWithEmail) => {
@@ -158,19 +176,18 @@ const listToDisplay = (finalizedList, searchFilter, isWalletConnectList, numberO
     }
 };
 /**
- * When a filter is applied we would like to show the installed + last used wallets
- * in addition to the wallets that the filter has specified.
  * This calculation adds an offset to numberOfWalletsToShow so we will show the
  * intended wallets + installed and last used.
+ * We should would only apply the additonal offset if the installed wallets was not in the original list.
  *
  * For example:
  * we want to show 4 wallets: ['metamask', 'rainbow', 'walletconnect', 'coinbase']
  * and someone is using brave with installed phantom he should see
  * [ 'brave injected', phantom ,'metamask', 'rainbow', 'walletconnect', 'coinbase',]
- *
- * note — this should only apply to the WalletList view!
+ * And when someone is using metamask and coinbase they should see
+ * [ 'metamask', 'coinbase', 'rainbow', 'walletconnect']
  */
-const calculateWithFilterNumberOfWalletsToShow = (allWalletsOrdered, installedOrUsedWallets, numberOfWalletsToShow) => {
+const calculateWalletOffsetBasedOnInstalledAndLastUsedWallets = (allWalletsOrdered, installedOrUsedWallets, numberOfWalletsToShow) => {
     const filteredWallets = allWalletsOrdered.slice(0, numberOfWalletsToShow);
     const offset = installedOrUsedWallets.filter((wallet) => !filteredWallets.includes(wallet)).length;
     return numberOfWalletsToShow + offset;
@@ -190,4 +207,5 @@ const getSignWithEmailWallet = (signWithEmailWalletName, inputList) => {
 
 exports.PRIORITY_WALLET_LIST = PRIORITY_WALLET_LIST;
 exports.SIGN_IN_WITH_EMAIL_WALLET_NAME = SIGN_IN_WITH_EMAIL_WALLET_NAME;
+exports.calculateWalletOffsetBasedOnInstalledAndLastUsedWallets = calculateWalletOffsetBasedOnInstalledAndLastUsedWallets;
 exports.walletListBuilder = walletListBuilder;

package/src/lib/utils/functions/walletListBuilder/walletListBuilder.d.ts

@@ -24,4 +24,17 @@ type BuilderResult = {
 export declare const PRIORITY_WALLET_LIST: string[];
 export declare const SIGN_IN_WITH_EMAIL_WALLET_NAME = "Sign In With Email";
 export declare const walletListBuilder: ({ authMode, connectedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }: BuilderParams) => BuilderResult;
+/**
+ * This calculation adds an offset to numberOfWalletsToShow so we will show the
+ * intended wallets + installed and last used.
+ * We should would only apply the additonal offset if the installed wallets was not in the original list.
+ *
+ * For example:
+ * we want to show 4 wallets: ['metamask', 'rainbow', 'walletconnect', 'coinbase']
+ * and someone is using brave with installed phantom he should see
+ * [ 'brave injected', phantom ,'metamask', 'rainbow', 'walletconnect', 'coinbase',]
+ * And when someone is using metamask and coinbase they should see
+ * [ 'metamask', 'coinbase', 'rainbow', 'walletconnect']
+ */
+export declare const calculateWalletOffsetBasedOnInstalledAndLastUsedWallets: (allWalletsOrdered: WalletOption[], installedOrUsedWallets: WalletOption[], numberOfWalletsToShow: number) => number;
 export {};

package/src/lib/utils/functions/walletListBuilder/walletListBuilder.js

@@ -103,8 +103,10 @@ const walletListBuilder = ({ authMode, connectedWallets, multiWallet, numberOfWa
     const finalizedWalletList = groupWallets
         ? groupWalletOptions(walletBook, walletsList)
         : walletsList;
+    // If a filter has been applied we want to add an offset to the number of wallets
+    // to include the installed and last used wallets
     const updatedNumberOfWalletsToShow = showMoreWalletsWithFilter && hasWalletFilter
-        ? calculateWithFilterNumberOfWalletsToShow(orderedInputList, firstPriorityWallets.concat(installedWallets), numberOfWalletsToShow)
+        ? calculateWalletOffsetBasedOnInstalledAndLastUsedWallets(orderedInputList, firstPriorityWallets.concat(installedWallets), numberOfWalletsToShow)
         : numberOfWalletsToShow;
     return {
         numberOfWallets: walletsList.length,
@@ -122,14 +124,30 @@ const orderAndFilterList = (walletList, walletsFilter, isWalletConnectList, reco
         return sortedWalletList;
     }
 };
+const KEEP_WALLETS_NAME_LIST = ['wallet connect'];
 const applySearchFilterToWalletOptionList = (rawSearchFilter, walletOptionList) => {
     const searchFilter = rawSearchFilter.trim().toLowerCase();
+    const cleanName = (name) => {
+        const trimmedLowerName = name.trim().toLowerCase();
+        if (KEEP_WALLETS_NAME_LIST.includes(trimmedLowerName)) {
+            return trimmedLowerName;
+        }
+        else {
+            return trimmedLowerName
+                .replace('wallet', '')
+                .replace('evm', '')
+                .replace('starknet', '')
+                .replace('solana', '')
+                .replace('flow', '')
+                .replace('bitcoin', '');
+        }
+    };
     return walletOptionList.filter((walletOption) => {
         var _a;
-        return walletOption.name.trim().toLowerCase().includes(searchFilter) ||
+        return cleanName(walletOption.name).includes(searchFilter) ||
             (
             // Validate nested wallets
-            (_a = walletOption.groupedWallets) === null || _a === void 0 ? void 0 : _a.some((nestedWalletOption) => nestedWalletOption.name.trim().toLowerCase().includes(searchFilter)));
+            (_a = walletOption.groupedWallets) === null || _a === void 0 ? void 0 : _a.some((nestedWalletOption) => cleanName(nestedWalletOption.name).includes(searchFilter)));
     });
 };
 const listToDisplay = (finalizedList, searchFilter, isWalletConnectList, numberOfWalletsToShow, hasWalletFilter, loginWithEmail) => {
@@ -154,19 +172,18 @@ const listToDisplay = (finalizedList, searchFilter, isWalletConnectList, numberO
     }
 };
 /**
- * When a filter is applied we would like to show the installed + last used wallets
- * in addition to the wallets that the filter has specified.
  * This calculation adds an offset to numberOfWalletsToShow so we will show the
  * intended wallets + installed and last used.
+ * We should would only apply the additonal offset if the installed wallets was not in the original list.
  *
  * For example:
  * we want to show 4 wallets: ['metamask', 'rainbow', 'walletconnect', 'coinbase']
  * and someone is using brave with installed phantom he should see
  * [ 'brave injected', phantom ,'metamask', 'rainbow', 'walletconnect', 'coinbase',]
- *
- * note — this should only apply to the WalletList view!
+ * And when someone is using metamask and coinbase they should see
+ * [ 'metamask', 'coinbase', 'rainbow', 'walletconnect']
  */
-const calculateWithFilterNumberOfWalletsToShow = (allWalletsOrdered, installedOrUsedWallets, numberOfWalletsToShow) => {
+const calculateWalletOffsetBasedOnInstalledAndLastUsedWallets = (allWalletsOrdered, installedOrUsedWallets, numberOfWalletsToShow) => {
     const filteredWallets = allWalletsOrdered.slice(0, numberOfWalletsToShow);
     const offset = installedOrUsedWallets.filter((wallet) => !filteredWallets.includes(wallet)).length;
     return numberOfWalletsToShow + offset;
@@ -184,4 +201,4 @@ const getSignWithEmailWallet = (signWithEmailWalletName, inputList) => {
     return walletOverride;
 };
 
-export { PRIORITY_WALLET_LIST, SIGN_IN_WITH_EMAIL_WALLET_NAME, walletListBuilder };
+export { PRIORITY_WALLET_LIST, SIGN_IN_WITH_EMAIL_WALLET_NAME, calculateWalletOffsetBasedOnInstalledAndLastUsedWallets, walletListBuilder };