@ledgerhq/live-common 21.35.0 → 21.36.2

package/src/families/tezos/bridge/js.ts

@@ -76,7 +76,7 @@ const getTransactionStatus = async (
     feeTooHigh?: Error;
     recipient?: Error;
   } = {};
-  let amountMustReset = false;
+  let resetTotalSpent = false;
 
   // Recipient validation logic
   if (t.mode !== "undelegate") {
@@ -100,7 +100,7 @@ const getTransactionStatus = async (
   const estimatedFees = t.estimatedFees || new BigNumber(0);
   if (t.mode === "send") {
     if (!errors.amount && t.amount.eq(0) && !t.useAllAmount) {
-      amountMustReset = true;
+      resetTotalSpent = true;
       errors.amount = new AmountRequired();
     } else if (t.amount.gt(0) && estimatedFees.times(10).gt(t.amount)) {
       warnings.feeTooHigh = new FeeTooHigh();
@@ -128,7 +128,7 @@ const getTransactionStatus = async (
     // remap taquito errors
     if (t.taquitoError.endsWith("balance_too_low")) {
       if (t.mode === "send") {
-        amountMustReset = true;
+        resetTotalSpent = true;
         errors.amount = new NotEnoughBalance();
       } else {
         errors.amount = new NotEnoughBalanceToDelegate();
@@ -138,12 +138,12 @@ const getTransactionStatus = async (
     } else if (!errors.amount) {
       // unidentified error case
       errors.amount = new Error(t.taquitoError);
-      amountMustReset = true;
+      resetTotalSpent = true;
     }
   }
 
   if (!errors.amount && account.balance.lte(0)) {
-    amountMustReset = true;
+    resetTotalSpent = true;
     errors.amount = new NotEnoughBalance();
   }
 
@@ -154,20 +154,20 @@ const getTransactionStatus = async (
     t.amount.lt(EXISTENTIAL_DEPOSIT) &&
     (await api.getAccountByAddress(t.recipient)).type === "empty"
   ) {
-    amountMustReset = true;
+    resetTotalSpent = true;
     errors.amount = new NotEnoughBalanceBecauseDestinationNotCreated("", {
       minimalAmount: "0.275 XTZ",
     });
   }
 
-  const amount = amountMustReset ? new BigNumber(0) : t.amount;
-
   const result = {
     errors,
     warnings,
     estimatedFees,
-    amount,
-    totalSpent: amount.plus(estimatedFees),
+    amount: t.amount,
+    totalSpent: resetTotalSpent
+      ? new BigNumber(0)
+      : t.amount.plus(estimatedFees),
   };
   return Promise.resolve(result);
 };
@@ -344,9 +344,9 @@ const broadcast = async ({ signedOperation: { operation, signature } }) => {
   return patchOperationWithHash(operation, hash);
 };
 
-const scanAccounts = makeScanAccounts(getAccountShape);
+const scanAccounts = makeScanAccounts({ getAccountShape });
 
-const sync = makeSync(getAccountShape);
+const sync = makeSync({ getAccountShape });
 
 const getPreloadStrategy = (_currency) => ({
   preloadMaxAge: 30 * 1000,

package/src/families/tezos/specs.ts

@@ -26,6 +26,8 @@ function expectRevealed(account) {
 
 const tezosUnit = getCryptoCurrencyById("tezos").units[0];
 
+const safeMinimumForDestinationNotCreated = parseCurrencyUnit(tezosUnit, "0.6");
+
 const tezos: AppSpec<Transaction> = {
   name: "Tezos",
   currency: getCryptoCurrencyById("tezos"),
@@ -51,7 +53,7 @@ const tezos: AppSpec<Transaction> = {
         const amount = maxSpendable.div(2).integerValue();
         if (
           sibling.balance.eq(0) &&
-          amount.lt(parseCurrencyUnit(tezosUnit, "0.3"))
+          amount.lt(safeMinimumForDestinationNotCreated)
         ) {
           throw new Error("need more funds to send to new address");
         }
@@ -71,7 +73,7 @@ const tezos: AppSpec<Transaction> = {
         const amount = maxSpendable.div(2).integerValue();
         if (
           sibling.balance.eq(0) &&
-          amount.lt(parseCurrencyUnit(tezosUnit, "0.3"))
+          amount.lt(safeMinimumForDestinationNotCreated)
         ) {
           throw new Error("need more funds to send to new address");
         }
@@ -93,7 +95,7 @@ const tezos: AppSpec<Transaction> = {
         const recipient = sibling.freshAddress;
         if (
           sibling.balance.eq(0) &&
-          maxSpendable.lt(parseCurrencyUnit(tezosUnit, "0.3"))
+          maxSpendable.lt(safeMinimumForDestinationNotCreated)
         ) {
           throw new Error("need more funds to send to new address");
         }

package/src/families/tron/bridge/js.ts

@@ -466,7 +466,7 @@ const getAccountShape = async (info: GetAccountShapeArg0, syncConfig) => {
   };
 };
 
-const scanAccounts = makeScanAccounts(getAccountShape);
+const scanAccounts = makeScanAccounts({ getAccountShape });
 // the balance does not update straightaway so we should ignore recent operations if they are in pending for a bit
 const preferPendingOperationsUntilBlockValidation = 35;
 
@@ -490,7 +490,7 @@ const postSync = (initial: Account, parent: Account): Account => {
   return parent;
 };
 
-const sync = makeSync(getAccountShape, postSync);
+const sync = makeSync({ getAccountShape, postSync });
 
 const currencyBridge: CurrencyBridge = {
   preload: async () => {

package/src/featureFlags/FeatureToggle.tsx

@@ -9,7 +9,7 @@ type Props = {
   children?: ReactNode;
 };
 
-export const FeatureToggle = ({
+const FeatureToggle = ({
   feature: featureId,
   fallback,
   children,
@@ -22,3 +22,5 @@ export const FeatureToggle = ({
 
   return <>{children || null}</>;
 };
+
+export default FeatureToggle;

package/src/featureFlags/defaultFeatures.ts

@@ -4,4 +4,7 @@ export const defaultFeatures: DefaultFeatures = {
   learn: {
     enabled: false,
   },
+  pushNotifications: {
+    enabled: false,
+  },
 };

package/src/featureFlags/index.ts

@@ -1,4 +1,7 @@
+import useFeature from "./useFeature";
+import FeatureToggle from "./FeatureToggle";
+
+export { useFeature, FeatureToggle };
+
 export * from "./defaultFeatures";
-export * from "./FeatureToggle";
 export * from "./provider";
-export * from "./useFeature";

package/src/featureFlags/types.ts

@@ -1,4 +1,5 @@
-export type FeatureId = "learn"; // Add others with union (e.g. "learn" | "market" | "foo")
+// Add others with union (e.g. "learn" | "market" | "foo")
+export type FeatureId = "learn" | "pushNotifications";
 
 // We use objects instead of direct booleans for potential future improvements
 // like feature versioning etc

package/src/featureFlags/useFeature.ts

@@ -1,8 +1,10 @@
 import { useFeatureFlags } from "./provider";
 import { Feature, FeatureId } from "./types";
 
-export default function useFeature(key: FeatureId): Feature | null {
+const useFeature = (key: FeatureId): Feature | null => {
   const featureFlags = useFeatureFlags();
 
   return featureFlags.getFeature(key);
-}
+};
+
+export default useFeature;

package/src/hw/actions/app.ts

@@ -634,7 +634,8 @@ export const createAction = (
       ...state,
       inWrongDeviceForAccount:
         state.derivation && appRequest.account
-          ? state.derivation.address !== appRequest.account.freshAddress
+          ? state.derivation.address !== appRequest.account.freshAddress &&
+            state.derivation.address !== appRequest.account.seedIdentifier // Use-case added for Hedera
             ? {
                 accountName: getAccountName(appRequest.account),
               }

package/src/market/MarketDataProvider.tsx

@@ -7,7 +7,6 @@ import React, {
   ReactElement,
   useReducer,
   useEffect,
-  useState,
 } from "react";
 
 import { useDebounce } from "../hooks/useDebounce";
@@ -19,9 +18,9 @@ import {
   MarketCurrencyChartDataRequestParams,
   CurrencyData,
   SingleCoinState,
+  SupportedCoins,
 } from "./types";
 import defaultFetchApi from "./api/api";
-
 type Props = {
   children: React.ReactNode;
   fetchApi?: MarketDataApi;
@@ -31,7 +30,7 @@ type Props = {
 type API = {
   refresh: (param?: MarketListRequestParams) => void;
   refreshChart: (param?: MarketCurrencyChartDataRequestParams) => void;
-  selectCurrency: (key: string) => void;
+  selectCurrency: (id?: string, data?: CurrencyData, range?: string) => void;
   loadNextPage: () => Promise<boolean>;
   setCounterCurrency: (counterCurrency: string) => void;
 };
@@ -113,23 +112,25 @@ function marketDataReducer(state, action) {
       };
     }
     case ACTIONS.UPDATE_SINGLE_MARKET_DATA: {
-      const marketData = [...state.marketData.map((data) => ({ ...data }))];
-      const index = marketData.findIndex(({ id }) => id === action.payload.id);
-      if (index >= 0) {
-        marketData[index] = { ...marketData[index], ...action.payload };
-      }
-      return { ...state, marketData, loading: false };
+      return {
+        ...state,
+        selectedCoinData: { ...state.selectedCoinData, ...action.payload },
+        loading: false,
+      };
     }
     case ACTIONS.UPDATE_SINGLE_CHART_DATA: {
-      const marketData = [...state.marketData.map((data) => ({ ...data }))];
-      const index = marketData.findIndex(({ id }) => id === action.payload.id);
-      if (index >= 0) {
-        marketData[index].chartData = {
-          ...marketData[index].chartData,
-          ...action.payload.chartData,
-        };
-      }
-      return { ...state, marketData, loading: false };
+      const chartRequestParams = {
+        ...state.chartRequestParams,
+        loadingChart: false,
+      };
+      const selectedCoinData = { ...state.selectedCoinData };
+
+      selectedCoinData.chartData = {
+        ...selectedCoinData.chartData,
+        ...action.payload.chartData,
+      };
+
+      return { ...state, selectedCoinData, chartRequestParams };
     }
 
     case ACTIONS.REFRESH_MARKET_DATA: {
@@ -184,12 +185,23 @@ function marketDataReducer(state, action) {
       return { ...state, loadingChart: action.payload };
     case ACTIONS.SET_ERROR:
       return { ...state, error: action.payload, loading: false };
-    case ACTIONS.SELECT_CURRENCY:
+    case ACTIONS.SELECT_CURRENCY: {
+      const chartRequestParams = {
+        ...state.chartRequestParams,
+        counterCurrency: state.requestParams.counterCurrency,
+        range: action.payload.range || state.requestParams.range,
+        id: action.payload.id,
+        loadingChart: !!action.payload.id,
+        lastRequestTime: Date.now(),
+      };
       return {
         ...state,
-        selectedCurrency: action.payload,
-        loading: !!action.payload,
+        selectedCurrency: action.payload.id,
+        selectedCoinData: action.payload.data,
+        loading: !!action.payload.id,
+        chartRequestParams,
       };
+    }
     default:
       return state;
   }
@@ -207,15 +219,15 @@ export const MarketDataProvider = ({
   });
   const api = fetchApi || defaultFetchApi;
   const {
-    marketData,
     requestParams,
     chartRequestParams,
     loading,
     loadingChart,
     page,
+    selectedCoinData,
   } = useDebounce(state, 300);
 
-  const handleError = useCallback((payload) => {
+  const handleError = useCallback((payload: Error) => {
     dispatch({ type: ACTIONS.SET_ERROR, payload });
   }, []);
 
@@ -224,7 +236,7 @@ export const MarketDataProvider = ({
       const ticker = countervalue.ticker.toLowerCase();
       api.supportedCounterCurrencies().then(
         (supportedCounterCurrencies) =>
-          api.setSupportedCoinsList().then((coins) => {
+          api.setSupportedCoinsList().then((coins: SupportedCoins) => {
             dispatch({
               type: ACTIONS.IS_READY,
               payload: {
@@ -250,12 +262,9 @@ export const MarketDataProvider = ({
       chartRequestParams?.counterCurrency &&
       !loadingChart
     ) {
-      const currentMarketData = marketData.find(
-        ({ id }: CurrencyData) => id === chartRequestParams.id
-      );
       const range = chartRequestParams.range;
 
-      if (currentMarketData && !currentMarketData?.chartData?.[range]) {
+      if (selectedCoinData && !selectedCoinData?.chartData?.[range]) {
         api.currencyChartData(chartRequestParams).then(
           (chartData) =>
             dispatch({
@@ -270,14 +279,10 @@ export const MarketDataProvider = ({
           payload: false,
         });
     }
-  }, [chartRequestParams, marketData, loadingChart, api, handleError]);
+  }, [chartRequestParams, selectedCoinData, api, handleError, loadingChart]);
 
   useEffect(() => {
-    if (
-      chartRequestParams?.id &&
-      chartRequestParams?.counterCurrency &&
-      !loading
-    ) {
+    if (chartRequestParams?.id && chartRequestParams?.counterCurrency) {
       dispatch({ type: ACTIONS.SET_LOADING, payload: true });
       api
         .listPaginated({
@@ -321,37 +326,34 @@ export const MarketDataProvider = ({
     dispatch({ type: ACTIONS.REFRESH_CHART_DATA, payload });
   }, []);
 
-  const selectCurrency = useCallback((id) => {
-    dispatch({
-      type: ACTIONS.REFRESH_CHART_DATA,
-      payload: {
-        id,
-      },
-    });
+  const selectCurrency = useCallback((id, data, range) => {
+    dispatch({ type: ACTIONS.SELECT_CURRENCY, payload: { id, data, range } });
   }, []);
 
-  const loadNextPage = useCallback(() => {
-    return new Promise((resolve, reject) => {
-      if (loading) {
-        reject(new Error());
-      } else {
-        const newPage = page + 1;
-        api.listPaginated({ ...requestParams, page: newPage }).then(
-          (marketData) => {
-            dispatch({
-              type: ACTIONS.UPDATE_MARKET_DATA,
-              payload: { marketData, page: newPage },
-            });
-            resolve(true);
-          },
-          (err) => {
-            handleError(err);
-            reject(new Error(err));
-          }
-        );
-      }
-    });
-  }, [loading, page, api, requestParams, handleError]);
+  const loadNextPage = useCallback(
+    () =>
+      new Promise((resolve, reject) => {
+        if (loading) {
+          reject(new Error());
+        } else {
+          const newPage = page + 1;
+          api.listPaginated({ ...requestParams, page: newPage }).then(
+            (marketData) => {
+              dispatch({
+                type: ACTIONS.UPDATE_MARKET_DATA,
+                payload: { marketData, page: newPage },
+              });
+              resolve(true);
+            },
+            (err) => {
+              handleError(err);
+              reject(new Error(err));
+            }
+          );
+        }
+      }),
+    [loading, page, api, requestParams, handleError]
+  );
 
   const setCounterCurrency = useCallback(
     (payload) => dispatch({ type: ACTIONS.UPDATE_COUNTERVALUE, payload }),
@@ -379,16 +381,16 @@ export function useMarketData(): MarketDataContextType {
 }
 
 type SingleCoinProviderData = SingleCoinState & {
+  selectCurrency: (id?: string, data?: CurrencyData, range?: string) => void;
   refreshChart: (param?: MarketCurrencyChartDataRequestParams) => void;
   setCounterCurrency: (counterCurrency: string) => void;
 };
 
-export function useSingleCoinMarketData(
-  currencyId: string
-): SingleCoinProviderData {
+export function useSingleCoinMarketData(): SingleCoinProviderData {
   const {
-    marketData,
     selectedCurrency,
+    selectedCoinData,
+    selectCurrency,
     chartRequestParams,
     loading,
     loadingChart,
@@ -399,9 +401,10 @@ export function useSingleCoinMarketData(
     supportedCounterCurrencies,
   } = useContext(MarketDataContext);
 
-  const [state, setState] = useState<SingleCoinProviderData>({
-    selectedCoinData: undefined,
+  return {
     selectedCurrency,
+    selectedCoinData,
+    selectCurrency,
     chartRequestParams,
     loading,
     loadingChart,
@@ -410,33 +413,5 @@ export function useSingleCoinMarketData(
     refreshChart,
     setCounterCurrency,
     supportedCounterCurrencies,
-  });
-
-  useEffect(() => {
-    if (marketData)
-      setState((s) => ({
-        ...s,
-        selectedCoinData:
-          marketData.find(({ id }) => id === currencyId) || s.selectedCoinData,
-        selectedCurrency,
-        chartRequestParams,
-        loading,
-        loadingChart,
-        error,
-        counterCurrency,
-        supportedCounterCurrencies,
-      }));
-  }, [
-    marketData,
-    currencyId,
-    selectedCurrency,
-    chartRequestParams,
-    loading,
-    loadingChart,
-    error,
-    counterCurrency,
-    supportedCounterCurrencies,
-  ]);
-
-  return state;
+  };
 }

package/src/platform/providers/GlobalCatalogProvider/api/mock.json

@@ -394,6 +394,19 @@
       "platform": "all",
       "branch": "debug",
       "currencies": "*"
+    },
+    {
+      "appId": "dummy-live-app",
+      "type": "LIVE_APP",
+      "tags": [
+        "tools"
+      ],
+      "categories": [
+        "other"
+      ],
+      "platform": "all",
+      "branch": "stable",
+      "currencies": "*"
     }
   ]
-}
+}