@ledgerhq/live-common 34.50.0-nightly.6 → 34.51.0-nightly.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (179) hide show
  1. package/lib/bridge/generic-alpaca/prepareTransaction.d.ts.map +1 -1
  2. package/lib/bridge/generic-alpaca/prepareTransaction.js +3 -6
  3. package/lib/bridge/generic-alpaca/prepareTransaction.js.map +1 -1
  4. package/lib/bridge/generic-alpaca/tests/prepareTransaction.test.js +60 -0
  5. package/lib/bridge/generic-alpaca/tests/prepareTransaction.test.js.map +1 -1
  6. package/lib/bridge/generic-alpaca/types.d.ts +0 -1
  7. package/lib/bridge/generic-alpaca/types.d.ts.map +1 -1
  8. package/lib/exchange/swap/postSwapState.d.ts.map +1 -1
  9. package/lib/exchange/swap/postSwapState.js +19 -23
  10. package/lib/exchange/swap/postSwapState.js.map +1 -1
  11. package/lib/exchange/swap/setBroadcastTransaction.d.ts +4 -4
  12. package/lib/exchange/swap/setBroadcastTransaction.js +7 -7
  13. package/lib/exchange/swap/setBroadcastTransaction.js.map +1 -1
  14. package/lib/exchange/swap/types.d.ts +3 -3
  15. package/lib/exchange/swap/types.d.ts.map +1 -1
  16. package/lib/families/tezos/config.js +2 -2
  17. package/lib/modularDrawer/hooks/modules/useRightMarketTrendModule.js +5 -2
  18. package/lib/modularDrawer/hooks/modules/useRightMarketTrendModule.js.map +1 -1
  19. package/lib/modularDrawer/hooks/useRightBalanceAsset.d.ts +5 -8
  20. package/lib/modularDrawer/hooks/useRightBalanceAsset.d.ts.map +1 -1
  21. package/lib/modularDrawer/hooks/useRightBalanceAsset.js +15 -24
  22. package/lib/modularDrawer/hooks/useRightBalanceAsset.js.map +1 -1
  23. package/lib/modularDrawer/hooks/useRightBalanceNetwork.d.ts +6 -25
  24. package/lib/modularDrawer/hooks/useRightBalanceNetwork.d.ts.map +1 -1
  25. package/lib/modularDrawer/hooks/useRightBalanceNetwork.js +4 -3
  26. package/lib/modularDrawer/hooks/useRightBalanceNetwork.js.map +1 -1
  27. package/lib/modularDrawer/modules/createNetworkConfiguration.d.ts.map +1 -1
  28. package/lib/modularDrawer/modules/createNetworkConfiguration.js +8 -4
  29. package/lib/modularDrawer/modules/createNetworkConfiguration.js.map +1 -1
  30. package/lib/modularDrawer/utils/__tests__/calculateProviderTotal.test.d.ts +2 -0
  31. package/lib/modularDrawer/utils/__tests__/calculateProviderTotal.test.d.ts.map +1 -0
  32. package/lib/modularDrawer/utils/__tests__/calculateProviderTotal.test.js +212 -0
  33. package/lib/modularDrawer/utils/__tests__/calculateProviderTotal.test.js.map +1 -0
  34. package/lib/modularDrawer/utils/__tests__/groupAccountsByAsset.test.d.ts +2 -0
  35. package/lib/modularDrawer/utils/__tests__/groupAccountsByAsset.test.d.ts.map +1 -0
  36. package/lib/modularDrawer/utils/__tests__/groupAccountsByAsset.test.js +202 -0
  37. package/lib/modularDrawer/utils/__tests__/groupAccountsByAsset.test.js.map +1 -0
  38. package/lib/modularDrawer/utils/calculateProviderTotal.d.ts +1 -0
  39. package/lib/modularDrawer/utils/calculateProviderTotal.d.ts.map +1 -1
  40. package/lib/modularDrawer/utils/calculateProviderTotal.js +10 -2
  41. package/lib/modularDrawer/utils/calculateProviderTotal.js.map +1 -1
  42. package/lib/modularDrawer/utils/getBalanceAndFiatValueByAssets.d.ts +6 -4
  43. package/lib/modularDrawer/utils/getBalanceAndFiatValueByAssets.d.ts.map +1 -1
  44. package/lib/modularDrawer/utils/getBalanceAndFiatValueByAssets.js +9 -22
  45. package/lib/modularDrawer/utils/getBalanceAndFiatValueByAssets.js.map +1 -1
  46. package/lib/modularDrawer/utils/groupAccountsByAsset.d.ts +4 -3
  47. package/lib/modularDrawer/utils/groupAccountsByAsset.d.ts.map +1 -1
  48. package/lib/modularDrawer/utils/groupAccountsByAsset.js +27 -11
  49. package/lib/modularDrawer/utils/groupAccountsByAsset.js.map +1 -1
  50. package/lib/modularDrawer/utils/index.d.ts +0 -1
  51. package/lib/modularDrawer/utils/index.d.ts.map +1 -1
  52. package/lib/modularDrawer/utils/index.js +1 -3
  53. package/lib/modularDrawer/utils/index.js.map +1 -1
  54. package/lib/modularDrawer/utils/sortByBalance.d.ts +1 -3
  55. package/lib/modularDrawer/utils/sortByBalance.d.ts.map +1 -1
  56. package/lib/modularDrawer/utils/sortByBalance.js +6 -18
  57. package/lib/modularDrawer/utils/sortByBalance.js.map +1 -1
  58. package/lib/modularDrawer/utils/type.d.ts +9 -8
  59. package/lib/modularDrawer/utils/type.d.ts.map +1 -1
  60. package/lib/wallet-api/Exchange/server.js +6 -6
  61. package/lib/wallet-api/Exchange/server.js.map +1 -1
  62. package/lib-es/bridge/generic-alpaca/prepareTransaction.d.ts.map +1 -1
  63. package/lib-es/bridge/generic-alpaca/prepareTransaction.js +3 -6
  64. package/lib-es/bridge/generic-alpaca/prepareTransaction.js.map +1 -1
  65. package/lib-es/bridge/generic-alpaca/tests/prepareTransaction.test.js +60 -0
  66. package/lib-es/bridge/generic-alpaca/tests/prepareTransaction.test.js.map +1 -1
  67. package/lib-es/bridge/generic-alpaca/types.d.ts +0 -1
  68. package/lib-es/bridge/generic-alpaca/types.d.ts.map +1 -1
  69. package/lib-es/exchange/swap/postSwapState.d.ts.map +1 -1
  70. package/lib-es/exchange/swap/postSwapState.js +19 -23
  71. package/lib-es/exchange/swap/postSwapState.js.map +1 -1
  72. package/lib-es/exchange/swap/setBroadcastTransaction.d.ts +4 -4
  73. package/lib-es/exchange/swap/setBroadcastTransaction.js +7 -7
  74. package/lib-es/exchange/swap/setBroadcastTransaction.js.map +1 -1
  75. package/lib-es/exchange/swap/types.d.ts +3 -3
  76. package/lib-es/exchange/swap/types.d.ts.map +1 -1
  77. package/lib-es/families/tezos/config.js +2 -2
  78. package/lib-es/modularDrawer/hooks/modules/useRightMarketTrendModule.js +1 -1
  79. package/lib-es/modularDrawer/hooks/modules/useRightMarketTrendModule.js.map +1 -1
  80. package/lib-es/modularDrawer/hooks/useRightBalanceAsset.d.ts +5 -8
  81. package/lib-es/modularDrawer/hooks/useRightBalanceAsset.d.ts.map +1 -1
  82. package/lib-es/modularDrawer/hooks/useRightBalanceAsset.js +15 -24
  83. package/lib-es/modularDrawer/hooks/useRightBalanceAsset.js.map +1 -1
  84. package/lib-es/modularDrawer/hooks/useRightBalanceNetwork.d.ts +6 -25
  85. package/lib-es/modularDrawer/hooks/useRightBalanceNetwork.d.ts.map +1 -1
  86. package/lib-es/modularDrawer/hooks/useRightBalanceNetwork.js +4 -3
  87. package/lib-es/modularDrawer/hooks/useRightBalanceNetwork.js.map +1 -1
  88. package/lib-es/modularDrawer/modules/createNetworkConfiguration.d.ts.map +1 -1
  89. package/lib-es/modularDrawer/modules/createNetworkConfiguration.js +8 -4
  90. package/lib-es/modularDrawer/modules/createNetworkConfiguration.js.map +1 -1
  91. package/lib-es/modularDrawer/utils/__tests__/calculateProviderTotal.test.d.ts +2 -0
  92. package/lib-es/modularDrawer/utils/__tests__/calculateProviderTotal.test.d.ts.map +1 -0
  93. package/lib-es/modularDrawer/utils/__tests__/calculateProviderTotal.test.js +207 -0
  94. package/lib-es/modularDrawer/utils/__tests__/calculateProviderTotal.test.js.map +1 -0
  95. package/lib-es/modularDrawer/utils/__tests__/groupAccountsByAsset.test.d.ts +2 -0
  96. package/lib-es/modularDrawer/utils/__tests__/groupAccountsByAsset.test.d.ts.map +1 -0
  97. package/lib-es/modularDrawer/utils/__tests__/groupAccountsByAsset.test.js +197 -0
  98. package/lib-es/modularDrawer/utils/__tests__/groupAccountsByAsset.test.js.map +1 -0
  99. package/lib-es/modularDrawer/utils/calculateProviderTotal.d.ts +1 -0
  100. package/lib-es/modularDrawer/utils/calculateProviderTotal.d.ts.map +1 -1
  101. package/lib-es/modularDrawer/utils/calculateProviderTotal.js +10 -2
  102. package/lib-es/modularDrawer/utils/calculateProviderTotal.js.map +1 -1
  103. package/lib-es/modularDrawer/utils/getBalanceAndFiatValueByAssets.d.ts +6 -4
  104. package/lib-es/modularDrawer/utils/getBalanceAndFiatValueByAssets.d.ts.map +1 -1
  105. package/lib-es/modularDrawer/utils/getBalanceAndFiatValueByAssets.js +9 -22
  106. package/lib-es/modularDrawer/utils/getBalanceAndFiatValueByAssets.js.map +1 -1
  107. package/lib-es/modularDrawer/utils/groupAccountsByAsset.d.ts +4 -3
  108. package/lib-es/modularDrawer/utils/groupAccountsByAsset.d.ts.map +1 -1
  109. package/lib-es/modularDrawer/utils/groupAccountsByAsset.js +27 -11
  110. package/lib-es/modularDrawer/utils/groupAccountsByAsset.js.map +1 -1
  111. package/lib-es/modularDrawer/utils/index.d.ts +0 -1
  112. package/lib-es/modularDrawer/utils/index.d.ts.map +1 -1
  113. package/lib-es/modularDrawer/utils/index.js +0 -1
  114. package/lib-es/modularDrawer/utils/index.js.map +1 -1
  115. package/lib-es/modularDrawer/utils/sortByBalance.d.ts +1 -3
  116. package/lib-es/modularDrawer/utils/sortByBalance.d.ts.map +1 -1
  117. package/lib-es/modularDrawer/utils/sortByBalance.js +5 -15
  118. package/lib-es/modularDrawer/utils/sortByBalance.js.map +1 -1
  119. package/lib-es/modularDrawer/utils/type.d.ts +9 -8
  120. package/lib-es/modularDrawer/utils/type.d.ts.map +1 -1
  121. package/lib-es/wallet-api/Exchange/server.js +6 -6
  122. package/lib-es/wallet-api/Exchange/server.js.map +1 -1
  123. package/package.json +70 -70
  124. package/src/bridge/generic-alpaca/prepareTransaction.ts +3 -7
  125. package/src/bridge/generic-alpaca/tests/prepareTransaction.test.ts +78 -0
  126. package/src/bridge/generic-alpaca/types.ts +1 -1
  127. package/src/exchange/swap/postSwapState.ts +28 -32
  128. package/src/exchange/swap/setBroadcastTransaction.ts +12 -12
  129. package/src/exchange/swap/types.ts +3 -3
  130. package/src/families/tezos/config.ts +2 -2
  131. package/src/modularDrawer/hooks/modules/useRightMarketTrendModule.tsx +1 -1
  132. package/src/modularDrawer/hooks/useRightBalanceAsset.tsx +22 -38
  133. package/src/modularDrawer/hooks/useRightBalanceNetwork.tsx +5 -7
  134. package/src/modularDrawer/modules/createNetworkConfiguration.ts +10 -5
  135. package/src/modularDrawer/utils/__tests__/calculateProviderTotal.test.ts +237 -0
  136. package/src/modularDrawer/utils/__tests__/groupAccountsByAsset.test.ts +228 -0
  137. package/src/modularDrawer/utils/calculateProviderTotal.ts +13 -2
  138. package/src/modularDrawer/utils/getBalanceAndFiatValueByAssets.ts +13 -37
  139. package/src/modularDrawer/utils/groupAccountsByAsset.ts +38 -19
  140. package/src/modularDrawer/utils/index.ts +0 -2
  141. package/src/modularDrawer/utils/sortByBalance.tsx +5 -18
  142. package/src/modularDrawer/utils/type.ts +13 -4
  143. package/src/wallet-api/Exchange/server.ts +6 -6
  144. package/lib/modularDrawer/utils/__tests__/counterValueFormatter.test.d.ts +0 -2
  145. package/lib/modularDrawer/utils/__tests__/counterValueFormatter.test.d.ts.map +0 -1
  146. package/lib/modularDrawer/utils/__tests__/counterValueFormatter.test.js +0 -496
  147. package/lib/modularDrawer/utils/__tests__/counterValueFormatter.test.js.map +0 -1
  148. package/lib/modularDrawer/utils/counterValueFormatter.d.ts +0 -14
  149. package/lib/modularDrawer/utils/counterValueFormatter.d.ts.map +0 -1
  150. package/lib/modularDrawer/utils/counterValueFormatter.js +0 -107
  151. package/lib/modularDrawer/utils/counterValueFormatter.js.map +0 -1
  152. package/lib/modularDrawer/utils/getBalanceAndFiatValue.d.ts +0 -20
  153. package/lib/modularDrawer/utils/getBalanceAndFiatValue.d.ts.map +0 -1
  154. package/lib/modularDrawer/utils/getBalanceAndFiatValue.js +0 -39
  155. package/lib/modularDrawer/utils/getBalanceAndFiatValue.js.map +0 -1
  156. package/lib/modularDrawer/utils/parseToBigNumber.d.ts +0 -9
  157. package/lib/modularDrawer/utils/parseToBigNumber.d.ts.map +0 -1
  158. package/lib/modularDrawer/utils/parseToBigNumber.js +0 -24
  159. package/lib/modularDrawer/utils/parseToBigNumber.js.map +0 -1
  160. package/lib-es/modularDrawer/utils/__tests__/counterValueFormatter.test.d.ts +0 -2
  161. package/lib-es/modularDrawer/utils/__tests__/counterValueFormatter.test.d.ts.map +0 -1
  162. package/lib-es/modularDrawer/utils/__tests__/counterValueFormatter.test.js +0 -494
  163. package/lib-es/modularDrawer/utils/__tests__/counterValueFormatter.test.js.map +0 -1
  164. package/lib-es/modularDrawer/utils/counterValueFormatter.d.ts +0 -14
  165. package/lib-es/modularDrawer/utils/counterValueFormatter.d.ts.map +0 -1
  166. package/lib-es/modularDrawer/utils/counterValueFormatter.js +0 -103
  167. package/lib-es/modularDrawer/utils/counterValueFormatter.js.map +0 -1
  168. package/lib-es/modularDrawer/utils/getBalanceAndFiatValue.d.ts +0 -20
  169. package/lib-es/modularDrawer/utils/getBalanceAndFiatValue.d.ts.map +0 -1
  170. package/lib-es/modularDrawer/utils/getBalanceAndFiatValue.js +0 -32
  171. package/lib-es/modularDrawer/utils/getBalanceAndFiatValue.js.map +0 -1
  172. package/lib-es/modularDrawer/utils/parseToBigNumber.d.ts +0 -9
  173. package/lib-es/modularDrawer/utils/parseToBigNumber.d.ts.map +0 -1
  174. package/lib-es/modularDrawer/utils/parseToBigNumber.js +0 -17
  175. package/lib-es/modularDrawer/utils/parseToBigNumber.js.map +0 -1
  176. package/src/modularDrawer/utils/__tests__/counterValueFormatter.test.ts +0 -549
  177. package/src/modularDrawer/utils/counterValueFormatter.ts +0 -165
  178. package/src/modularDrawer/utils/getBalanceAndFiatValue.ts +0 -53
  179. package/src/modularDrawer/utils/parseToBigNumber.ts +0 -17
@@ -1,11 +1,13 @@
1
- import type { CounterValuesState } from "@ledgerhq/live-countervalues/types";
2
1
  import type { CryptoOrTokenCurrency, Currency } from "@ledgerhq/types-cryptoassets";
3
2
  import { AssetType } from "./type";
4
3
  import { AccountLike } from "@ledgerhq/types-live";
4
+ import BigNumber from "bignumber.js";
5
+ import type { CounterValuesState } from "@ledgerhq/live-countervalues/types";
5
6
  interface ExtendedAssetType extends AssetType {
6
- balance?: string;
7
- fiatValue?: string;
7
+ currency?: CryptoOrTokenCurrency;
8
+ balance?: BigNumber;
9
+ fiatValue?: number;
8
10
  }
9
- export declare const getBalanceAndFiatValueByAssets: (accounts: AccountLike[], assets: CryptoOrTokenCurrency[], counterValuesState: CounterValuesState, targetCurrency: Currency, isDiscreetMode: boolean | undefined, userLocale: string) => ExtendedAssetType[];
11
+ export declare const getBalanceAndFiatValueByAssets: (accounts: AccountLike[], assets: CryptoOrTokenCurrency[], counterValuesState: CounterValuesState, targetCurrency: Currency) => ExtendedAssetType[];
10
12
  export {};
11
13
  //# sourceMappingURL=getBalanceAndFiatValueByAssets.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getBalanceAndFiatValueByAssets.d.ts","sourceRoot":"","sources":["../../../src/modularDrawer/utils/getBalanceAndFiatValueByAssets.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAEpF,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,UAAU,iBAAkB,SAAQ,SAAS;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,8BAA8B,aAC/B,WAAW,EAAE,UACf,qBAAqB,EAAE,sBACX,kBAAkB,kBACtB,QAAQ,mDAEZ,MAAM,KACjB,iBAAiB,EAqBnB,CAAC"}
1
+ {"version":3,"file":"getBalanceAndFiatValueByAssets.d.ts","sourceRoot":"","sources":["../../../src/modularDrawer/utils/getBalanceAndFiatValueByAssets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAEpF,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAE7E,UAAU,iBAAkB,SAAQ,SAAS;IAC3C,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,8BAA8B,aAC/B,WAAW,EAAE,UACf,qBAAqB,EAAE,sBACX,kBAAkB,kBACtB,QAAQ,KACvB,iBAAiB,EAgBnB,CAAC"}
@@ -1,15 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getBalanceAndFiatValueByAssets = void 0;
4
- const formatCurrencyUnit_1 = require("@ledgerhq/coin-framework/lib-es/currencies/formatCurrencyUnit");
5
4
  const groupAccountsByAsset_1 = require("./groupAccountsByAsset");
6
- const counterValueFormatter_1 = require("./counterValueFormatter");
7
- const getBalanceAndFiatValueByAssets = (accounts, assets, counterValuesState, targetCurrency, isDiscreetMode = false, userLocale) => {
8
- const groupedAccountsByAsset = (0, groupAccountsByAsset_1.groupAccountsByAsset)(accounts, counterValuesState, targetCurrency, isDiscreetMode);
5
+ const getBalanceAndFiatValueByAssets = (accounts, assets, counterValuesState, targetCurrency) => {
6
+ const groupedAccountsByAsset = (0, groupAccountsByAsset_1.groupAccountsByAsset)(accounts, counterValuesState, targetCurrency);
9
7
  return assets.map(asset => {
10
8
  const assetGroup = groupedAccountsByAsset[asset.id];
11
9
  if (assetGroup) {
12
- return formatAssetDetails(assetGroup, asset, targetCurrency, isDiscreetMode, userLocale);
10
+ return yieldAssetDetails(assetGroup, asset);
13
11
  }
14
12
  return {
15
13
  id: asset.id,
@@ -19,27 +17,16 @@ const getBalanceAndFiatValueByAssets = (accounts, assets, counterValuesState, ta
19
17
  });
20
18
  };
21
19
  exports.getBalanceAndFiatValueByAssets = getBalanceAndFiatValueByAssets;
22
- const formatAssetDetails = (assetGroup, asset, targetCurrency, isDiscreetMode, userLocale) => {
23
- const assetDetails = assetGroup.accounts[0].type === "Account"
24
- ? assetGroup.accounts[0].currency
25
- : assetGroup.accounts[0].token;
26
- const formattedBalance = (0, formatCurrencyUnit_1.formatCurrencyUnit)(assetDetails.units[0], assetGroup.totalBalance, {
27
- showCode: true,
28
- discreet: isDiscreetMode,
29
- });
30
- const formattedFiatValue = (0, counterValueFormatter_1.counterValueFormatter)({
31
- currency: targetCurrency.ticker,
32
- value: assetGroup.totalFiatValue.toNumber(),
33
- locale: userLocale,
34
- allowZeroValue: true,
35
- discreetMode: isDiscreetMode,
36
- });
20
+ const yieldAssetDetails = (assetGroup, asset) => {
21
+ // Use the reference currency for consistent magnitude
22
+ const assetDetails = assetGroup.referenceCurrency;
37
23
  return {
38
24
  id: asset.id,
39
25
  name: asset.name,
40
26
  ticker: asset.ticker,
41
- balance: formattedBalance,
42
- fiatValue: formattedFiatValue,
27
+ currency: assetDetails,
28
+ balance: assetGroup.totalBalance,
29
+ fiatValue: assetGroup.totalFiatValue.toNumber(),
43
30
  };
44
31
  };
45
32
  //# sourceMappingURL=getBalanceAndFiatValueByAssets.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getBalanceAndFiatValueByAssets.js","sourceRoot":"","sources":["../../../src/modularDrawer/utils/getBalanceAndFiatValueByAssets.ts"],"names":[],"mappings":";;;AAAA,sGAAmG;AAGnG,iEAAmF;AAGnF,mEAAgE;AAOzD,MAAM,8BAA8B,GAAG,CAC5C,QAAuB,EACvB,MAA+B,EAC/B,kBAAsC,EACtC,cAAwB,EACxB,iBAA0B,KAAK,EAC/B,UAAkB,EACG,EAAE;IACvB,MAAM,sBAAsB,GAAG,IAAA,2CAAoB,EACjD,QAAQ,EACR,kBAAkB,EAClB,cAAc,EACd,cAAc,CACf,CAAC;IAEF,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QACxB,MAAM,UAAU,GAAG,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEpD,IAAI,UAAU,EAAE;YACd,OAAO,kBAAkB,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;SAC1F;QAED,OAAO;YACL,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA5BW,QAAA,8BAA8B,kCA4BzC;AAEF,MAAM,kBAAkB,GAAG,CACzB,UAA0B,EAC1B,KAA4B,EAC5B,cAAwB,EACxB,cAAuB,EACvB,UAAkB,EACC,EAAE;IACrB,MAAM,YAAY,GAChB,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS;QACvC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ;QACjC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAEnC,MAAM,gBAAgB,GAAG,IAAA,uCAAkB,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE;QAC1F,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,cAAc;KACzB,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAA,6CAAqB,EAAC;QAC/C,QAAQ,EAAE,cAAc,CAAC,MAAM;QAC/B,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,QAAQ,EAAE;QAC3C,MAAM,EAAE,UAAU;QAClB,cAAc,EAAE,IAAI;QACpB,YAAY,EAAE,cAAc;KAC7B,CAAC,CAAC;IAEH,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,gBAAgB;QACzB,SAAS,EAAE,kBAAkB;KAC9B,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"getBalanceAndFiatValueByAssets.js","sourceRoot":"","sources":["../../../src/modularDrawer/utils/getBalanceAndFiatValueByAssets.ts"],"names":[],"mappings":";;;AACA,iEAAmF;AAY5E,MAAM,8BAA8B,GAAG,CAC5C,QAAuB,EACvB,MAA+B,EAC/B,kBAAsC,EACtC,cAAwB,EACH,EAAE;IACvB,MAAM,sBAAsB,GAAG,IAAA,2CAAoB,EAAC,QAAQ,EAAE,kBAAkB,EAAE,cAAc,CAAC,CAAC;IAElG,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QACxB,MAAM,UAAU,GAAG,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEpD,IAAI,UAAU,EAAE;YACd,OAAO,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;SAC7C;QAED,OAAO;YACL,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,8BAA8B,kCAqBzC;AAEF,MAAM,iBAAiB,GAAG,CACxB,UAA0B,EAC1B,KAA4B,EACT,EAAE;IACrB,sDAAsD;IACtD,MAAM,YAAY,GAAG,UAAU,CAAC,iBAAiB,CAAC;IAElD,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE,UAAU,CAAC,YAAY;QAChC,SAAS,EAAE,UAAU,CAAC,cAAc,CAAC,QAAQ,EAAE;KAChD,CAAC;AACJ,CAAC,CAAC"}
@@ -1,11 +1,12 @@
1
- import type { CounterValuesState } from "@ledgerhq/live-countervalues/types";
2
- import { Currency } from "@ledgerhq/types-cryptoassets";
3
1
  import { AccountLike } from "@ledgerhq/types-live";
4
2
  import BigNumber from "bignumber.js";
3
+ import type { CounterValuesState } from "@ledgerhq/live-countervalues/types";
4
+ import { CryptoOrTokenCurrency, Currency } from "@ledgerhq/types-cryptoassets";
5
5
  export type GroupedAccount = {
6
6
  totalBalance: BigNumber;
7
7
  totalFiatValue: BigNumber;
8
8
  accounts: AccountLike[];
9
+ referenceCurrency: CryptoOrTokenCurrency;
9
10
  };
10
- export declare const groupAccountsByAsset: (accounts: AccountLike[], counterValuesState: CounterValuesState, targetCurrency: Currency, isDiscreetMode: boolean) => Record<string, GroupedAccount>;
11
+ export declare const groupAccountsByAsset: (accounts: AccountLike[], counterValuesState: CounterValuesState, targetCurrency: Currency) => Record<string, GroupedAccount>;
11
12
  //# sourceMappingURL=groupAccountsByAsset.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"groupAccountsByAsset.d.ts","sourceRoot":"","sources":["../../../src/modularDrawer/utils/groupAccountsByAsset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,MAAM,MAAM,cAAc,GAAG;IAC3B,YAAY,EAAE,SAAS,CAAC;IACxB,cAAc,EAAE,SAAS,CAAC;IAC1B,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,oBAAoB,aACrB,WAAW,EAAE,sBACH,kBAAkB,kBACtB,QAAQ,kBACR,OAAO,KACtB,OAAO,MAAM,EAAE,cAAc,CAgC/B,CAAC"}
1
+ {"version":3,"file":"groupAccountsByAsset.d.ts","sourceRoot":"","sources":["../../../src/modularDrawer/utils/groupAccountsByAsset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAG/E,MAAM,MAAM,cAAc,GAAG;IAC3B,YAAY,EAAE,SAAS,CAAC;IACxB,cAAc,EAAE,SAAS,CAAC;IAC1B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,iBAAiB,EAAE,qBAAqB,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,aACrB,WAAW,EAAE,sBACH,kBAAkB,kBACtB,QAAQ,KACvB,OAAO,MAAM,EAAE,cAAc,CAkC/B,CAAC"}
@@ -4,29 +4,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.groupAccountsByAsset = void 0;
7
- const getBalanceAndFiatValue_1 = require("./getBalanceAndFiatValue");
8
7
  const bignumber_js_1 = __importDefault(require("bignumber.js"));
9
- const parseToBigNumber_1 = require("./parseToBigNumber");
10
- const groupAccountsByAsset = (accounts, counterValuesState, targetCurrency, isDiscreetMode) => {
8
+ const logic_1 = require("@ledgerhq/live-countervalues/logic");
9
+ const groupAccountsByAsset = (accounts, counterValuesState, targetCurrency) => {
11
10
  const initialGroupedAccounts = {};
12
11
  return accounts.reduce((groupedAccounts, account) => {
13
12
  const assetId = account.type === "Account" ? account.currency.id : account.token.id;
14
- if (!groupedAccounts[assetId]) {
15
- groupedAccounts[assetId] = {
13
+ let assetGroup = groupedAccounts[assetId];
14
+ if (!assetGroup) {
15
+ const currency = account.type === "Account" ? account.currency : account.token;
16
+ assetGroup = groupedAccounts[assetId] = {
16
17
  totalBalance: new bignumber_js_1.default(0),
17
18
  totalFiatValue: new bignumber_js_1.default(0),
18
19
  accounts: [],
20
+ referenceCurrency: currency, // First currency becomes the reference
19
21
  };
20
22
  }
21
- const { fiatValue } = (0, getBalanceAndFiatValue_1.getBalanceAndFiatValue)(account, counterValuesState, targetCurrency, isDiscreetMode, false);
23
+ const currency = account.type === "Account" ? account.currency : account.token;
22
24
  const balance = account.balance;
23
- const parsedFiatValue = (0, parseToBigNumber_1.parseToBigNumber)(fiatValue ?? "0");
24
- groupedAccounts[assetId].totalBalance = groupedAccounts[assetId].totalBalance.plus(balance);
25
- groupedAccounts[assetId].totalFiatValue =
26
- groupedAccounts[assetId].totalFiatValue.plus(parsedFiatValue);
27
- groupedAccounts[assetId].accounts.push(account);
25
+ // Convert balance to reference currency magnitude before summing
26
+ const referenceMagnitude = assetGroup.referenceCurrency.units[0].magnitude || 0;
27
+ const currentMagnitude = currency.units[0].magnitude || 0;
28
+ const magnitudeDiff = referenceMagnitude - currentMagnitude;
29
+ const normalizedBalance = balance.shiftedBy(magnitudeDiff);
30
+ const fiatValue = calculateFiatValue(account, counterValuesState, targetCurrency);
31
+ assetGroup.totalBalance = assetGroup.totalBalance.plus(normalizedBalance);
32
+ assetGroup.totalFiatValue = assetGroup.totalFiatValue.plus(fiatValue || 0);
33
+ assetGroup.accounts.push(account);
28
34
  return groupedAccounts;
29
35
  }, initialGroupedAccounts);
30
36
  };
31
37
  exports.groupAccountsByAsset = groupAccountsByAsset;
38
+ function calculateFiatValue(account, state, toCurrency) {
39
+ const currency = account.type === "Account" ? account.currency : account.token;
40
+ const balanceNumber = account.balance.toNumber();
41
+ const fiatValue = (0, logic_1.calculate)(state, {
42
+ from: currency,
43
+ to: toCurrency,
44
+ value: balanceNumber,
45
+ });
46
+ return fiatValue || 0;
47
+ }
32
48
  //# sourceMappingURL=groupAccountsByAsset.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"groupAccountsByAsset.js","sourceRoot":"","sources":["../../../src/modularDrawer/utils/groupAccountsByAsset.ts"],"names":[],"mappings":";;;;;;AAAA,qEAAkE;AAIlE,gEAAqC;AACrC,yDAAsD;AAQ/C,MAAM,oBAAoB,GAAG,CAClC,QAAuB,EACvB,kBAAsC,EACtC,cAAwB,EACxB,cAAuB,EACS,EAAE;IAClC,MAAM,sBAAsB,GAAmC,EAAE,CAAC;IAElE,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,OAAO,EAAE,EAAE;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAEpF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YAC7B,eAAe,CAAC,OAAO,CAAC,GAAG;gBACzB,YAAY,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;gBAC9B,cAAc,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;gBAChC,QAAQ,EAAE,EAAE;aACb,CAAC;SACH;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,+CAAsB,EAC1C,OAAO,EACP,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,KAAK,CACN,CAAC;QACF,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,MAAM,eAAe,GAAG,IAAA,mCAAgB,EAAC,SAAS,IAAI,GAAG,CAAC,CAAC;QAE3D,eAAe,CAAC,OAAO,CAAC,CAAC,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5F,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc;YACrC,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAChE,eAAe,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEhD,OAAO,eAAe,CAAC;IACzB,CAAC,EAAE,sBAAsB,CAAC,CAAC;AAC7B,CAAC,CAAC;AArCW,QAAA,oBAAoB,wBAqC/B"}
1
+ {"version":3,"file":"groupAccountsByAsset.js","sourceRoot":"","sources":["../../../src/modularDrawer/utils/groupAccountsByAsset.ts"],"names":[],"mappings":";;;;;;AACA,gEAAqC;AAGrC,8DAA+D;AASxD,MAAM,oBAAoB,GAAG,CAClC,QAAuB,EACvB,kBAAsC,EACtC,cAAwB,EACQ,EAAE;IAClC,MAAM,sBAAsB,GAAmC,EAAE,CAAC;IAElE,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,OAAO,EAAE,EAAE;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAEpF,IAAI,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;YAC/E,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG;gBACtC,YAAY,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;gBAC9B,cAAc,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;gBAChC,QAAQ,EAAE,EAAE;gBACZ,iBAAiB,EAAE,QAAQ,EAAE,uCAAuC;aACrE,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/E,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,iEAAiE;QACjE,MAAM,kBAAkB,GAAG,UAAU,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC;QAChF,MAAM,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC;QAC1D,MAAM,aAAa,GAAG,kBAAkB,GAAG,gBAAgB,CAAC;QAC5D,MAAM,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAE3D,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,EAAE,cAAc,CAAC,CAAC;QAElF,UAAU,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC1E,UAAU,CAAC,cAAc,GAAG,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC;QAC3E,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAElC,OAAO,eAAe,CAAC;IACzB,CAAC,EAAE,sBAAsB,CAAC,CAAC;AAC7B,CAAC,CAAC;AAtCW,QAAA,oBAAoB,wBAsC/B;AAEF,SAAS,kBAAkB,CACzB,OAAoB,EACpB,KAAyB,EACzB,UAAoB;IAEpB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAE/E,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IAEjD,MAAM,SAAS,GAAG,IAAA,iBAAS,EAAC,KAAK,EAAE;QACjC,IAAI,EAAE,QAAQ;QACd,EAAE,EAAE,UAAU;QACd,KAAK,EAAE,aAAa;KACrB,CAAC,CAAC;IAEH,OAAO,SAAS,IAAI,CAAC,CAAC;AACxB,CAAC"}
@@ -1,5 +1,4 @@
1
1
  import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
2
- export { getBalanceAndFiatValue } from "./getBalanceAndFiatValue";
3
2
  export { groupCurrenciesByProvider } from "./groupCurrenciesByProvider";
4
3
  declare function isCorrespondingCurrency(elem: CryptoOrTokenCurrency, network: CryptoOrTokenCurrency): boolean;
5
4
  export { isCorrespondingCurrency };
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/modularDrawer/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE,iBAAS,uBAAuB,CAC9B,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAQT;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/modularDrawer/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE,iBAAS,uBAAuB,CAC9B,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAQT;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
@@ -1,8 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isCorrespondingCurrency = exports.groupCurrenciesByProvider = exports.getBalanceAndFiatValue = void 0;
4
- var getBalanceAndFiatValue_1 = require("./getBalanceAndFiatValue");
5
- Object.defineProperty(exports, "getBalanceAndFiatValue", { enumerable: true, get: function () { return getBalanceAndFiatValue_1.getBalanceAndFiatValue; } });
3
+ exports.isCorrespondingCurrency = exports.groupCurrenciesByProvider = void 0;
6
4
  var groupCurrenciesByProvider_1 = require("./groupCurrenciesByProvider");
7
5
  Object.defineProperty(exports, "groupCurrenciesByProvider", { enumerable: true, get: function () { return groupCurrenciesByProvider_1.groupCurrenciesByProvider; } });
8
6
  function isCorrespondingCurrency(elem, network) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modularDrawer/utils/index.ts"],"names":[],"mappings":";;;AAEA,mEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAC/B,yEAAwE;AAA/D,sIAAA,yBAAyB,OAAA;AAElC,SAAS,uBAAuB,CAC9B,IAA2B,EAC3B,OAA8B;IAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE;QACjC,OAAO,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,OAAO,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC;KACzE;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;QAClC,OAAO,IAAI,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC;KAC/B;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAEQ,0DAAuB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modularDrawer/utils/index.ts"],"names":[],"mappings":";;;AACA,yEAAwE;AAA/D,sIAAA,yBAAyB,OAAA;AAElC,SAAS,uBAAuB,CAC9B,IAA2B,EAC3B,OAA8B;IAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE;QACjC,OAAO,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,OAAO,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC;KACzE;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;QAClC,OAAO,IAAI,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC;KAC/B;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAEQ,0DAAuB"}
@@ -1,6 +1,4 @@
1
1
  import { BalanceUI } from "./type";
2
- export declare const parseFiatValue: (value?: string, discreet?: boolean) => number;
3
- export declare function toFiatString(x?: BalanceUI): string | undefined;
4
2
  export declare function hasBalance(balanceData?: BalanceUI): boolean;
5
- export declare function compareByBalanceThenFiat(a: BalanceUI | undefined, b: BalanceUI | undefined, discreet: boolean): number;
3
+ export declare function compareByBalanceThenFiat(a: BalanceUI | undefined, b: BalanceUI | undefined): number;
6
4
  //# sourceMappingURL=sortByBalance.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"sortByBalance.d.ts","sourceRoot":"","sources":["../../../src/modularDrawer/utils/sortByBalance.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,eAAO,MAAM,cAAc,WAAY,MAAM,aAAa,OAAO,WAGhE,CAAC;AAEF,wBAAgB,YAAY,CAAC,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAE9D;AAED,wBAAgB,UAAU,CAAC,WAAW,CAAC,EAAE,SAAS,GAAG,OAAO,CAM3D;AAED,wBAAgB,wBAAwB,CACtC,CAAC,EAAE,SAAS,GAAG,SAAS,EACxB,CAAC,EAAE,SAAS,GAAG,SAAS,EACxB,QAAQ,EAAE,OAAO,GAChB,MAAM,CAQR"}
1
+ {"version":3,"file":"sortByBalance.d.ts","sourceRoot":"","sources":["../../../src/modularDrawer/utils/sortByBalance.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,wBAAgB,UAAU,CAAC,WAAW,CAAC,EAAE,SAAS,GAAG,OAAO,CAE3D;AAED,wBAAgB,wBAAwB,CACtC,CAAC,EAAE,SAAS,GAAG,SAAS,EACxB,CAAC,EAAE,SAAS,GAAG,SAAS,GACvB,MAAM,CASR"}
@@ -1,32 +1,20 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.compareByBalanceThenFiat = exports.hasBalance = exports.toFiatString = exports.parseFiatValue = void 0;
4
- const parseFiatValue = (value, discreet) => {
5
- if (!value || discreet)
6
- return -1;
7
- return parseFloat(value.replace(/[^0-9.-]+/g, "")) || -1;
8
- };
9
- exports.parseFiatValue = parseFiatValue;
10
- function toFiatString(x) {
11
- return x && "fiatValue" in x ? String(x.fiatValue) : undefined;
12
- }
13
- exports.toFiatString = toFiatString;
3
+ exports.compareByBalanceThenFiat = exports.hasBalance = void 0;
14
4
  function hasBalance(balanceData) {
15
- return (!!balanceData &&
16
- (("fiatValue" in balanceData && !!balanceData.fiatValue) ||
17
- ("balance" in balanceData && !!balanceData.balance)));
5
+ return !!balanceData && balanceData.balance !== undefined && balanceData.balance.gt(0);
18
6
  }
19
7
  exports.hasBalance = hasBalance;
20
- function compareByBalanceThenFiat(a, b, discreet) {
8
+ function compareByBalanceThenFiat(a, b) {
21
9
  const ah = hasBalance(a);
22
10
  const bh = hasBalance(b);
23
11
  if (ah && !bh)
24
12
  return -1;
25
13
  if (!ah && bh)
26
14
  return 1;
27
- const af = (0, exports.parseFiatValue)(toFiatString(a), discreet);
28
- const bf = (0, exports.parseFiatValue)(toFiatString(b), discreet);
29
- return bf - af;
15
+ const aFiat = a?.fiatValue ?? 0;
16
+ const bFiat = b?.fiatValue ?? 0;
17
+ return bFiat - aFiat;
30
18
  }
31
19
  exports.compareByBalanceThenFiat = compareByBalanceThenFiat;
32
20
  //# sourceMappingURL=sortByBalance.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"sortByBalance.js","sourceRoot":"","sources":["../../../src/modularDrawer/utils/sortByBalance.tsx"],"names":[],"mappings":";;;AAEO,MAAM,cAAc,GAAG,CAAC,KAAc,EAAE,QAAkB,EAAE,EAAE;IACnE,IAAI,CAAC,KAAK,IAAI,QAAQ;QAAE,OAAO,CAAC,CAAC,CAAC;IAClC,OAAO,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3D,CAAC,CAAC;AAHW,QAAA,cAAc,kBAGzB;AAEF,SAAgB,YAAY,CAAC,CAAa;IACxC,OAAO,CAAC,IAAI,WAAW,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACjE,CAAC;AAFD,oCAEC;AAED,SAAgB,UAAU,CAAC,WAAuB;IAChD,OAAO,CACL,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,WAAW,IAAI,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC;YACtD,CAAC,SAAS,IAAI,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CACvD,CAAC;AACJ,CAAC;AAND,gCAMC;AAED,SAAgB,wBAAwB,CACtC,CAAwB,EACxB,CAAwB,EACxB,QAAiB;IAEjB,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,EAAE,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,CAAC,CAAC;IACzB,IAAI,CAAC,EAAE,IAAI,EAAE;QAAE,OAAO,CAAC,CAAC;IACxB,MAAM,EAAE,GAAG,IAAA,sBAAc,EAAC,YAAY,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IACrD,MAAM,EAAE,GAAG,IAAA,sBAAc,EAAC,YAAY,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IACrD,OAAO,EAAE,GAAG,EAAE,CAAC;AACjB,CAAC;AAZD,4DAYC"}
1
+ {"version":3,"file":"sortByBalance.js","sourceRoot":"","sources":["../../../src/modularDrawer/utils/sortByBalance.tsx"],"names":[],"mappings":";;;AAEA,SAAgB,UAAU,CAAC,WAAuB;IAChD,OAAO,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,KAAK,SAAS,IAAI,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACzF,CAAC;AAFD,gCAEC;AAED,SAAgB,wBAAwB,CACtC,CAAwB,EACxB,CAAwB;IAExB,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,EAAE,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,CAAC,CAAC;IACzB,IAAI,CAAC,EAAE,IAAI,EAAE;QAAE,OAAO,CAAC,CAAC;IAExB,MAAM,KAAK,GAAG,CAAC,EAAE,SAAS,IAAI,CAAC,CAAC;IAChC,MAAM,KAAK,GAAG,CAAC,EAAE,SAAS,IAAI,CAAC,CAAC;IAChC,OAAO,KAAK,GAAG,KAAK,CAAC;AACvB,CAAC;AAZD,4DAYC"}
@@ -1,5 +1,5 @@
1
1
  import { CounterValuesState } from "@ledgerhq/live-countervalues/lib/types";
2
- import { CryptoOrTokenCurrency, Currency } from "@ledgerhq/types-cryptoassets";
2
+ import { CryptoOrTokenCurrency, Currency, Unit } from "@ledgerhq/types-cryptoassets";
3
3
  import { AccountLike } from "@ledgerhq/types-live";
4
4
  import { ReactNode } from "react";
5
5
  import { Observable } from "rxjs";
@@ -7,6 +7,7 @@ import { WalletAPIAccount } from "../../wallet-api/types";
7
7
  import { EnhancedModularDrawerConfiguration } from "../../wallet-api/ModularDrawer/types";
8
8
  import { InterestRate } from "../../dada-client/entities";
9
9
  import { MarketItemResponse } from "../../market/utils/types";
10
+ import BigNumber from "bignumber.js";
10
11
  import { ApyType } from "../../dada-client/types/trend";
11
12
  export type AssetType = {
12
13
  name: string;
@@ -29,14 +30,17 @@ export type AssetWithBalance = AssetType & {
29
30
  };
30
31
  export type UseBalanceDeps = () => {
31
32
  flattenedAccounts: AccountLike[];
32
- discreet: boolean;
33
33
  state: CounterValuesState;
34
34
  counterValueCurrency: Currency;
35
35
  locale: string;
36
36
  };
37
37
  export type BalanceUI = {
38
- balance?: string;
39
- fiatValue?: string;
38
+ balance?: BigNumber;
39
+ fiatValue?: number;
40
+ fiatUnit?: Unit;
41
+ currency?: CryptoOrTokenCurrency;
42
+ locale?: string;
43
+ discreet?: boolean;
40
44
  };
41
45
  export type CreateBalanceItem = (x: BalanceUI) => React.ReactNode;
42
46
  export type CreateAccountsCountAndApy = (args: {
@@ -106,10 +110,7 @@ export type AssetConfigurationDeps = {
106
110
  percent: number;
107
111
  }) => ReactNode;
108
112
  useBalanceDeps: UseBalanceDeps;
109
- balanceItem: (asset: {
110
- fiatValue?: string;
111
- balance?: string;
112
- }) => ReactNode;
113
+ balanceItem: CreateBalanceItem;
113
114
  assetsMap: Map<string, {
114
115
  mainCurrency: CryptoOrTokenCurrency;
115
116
  currencies: CryptoOrTokenCurrency[];
@@ -1 +1 @@
1
- {"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../src/modularDrawer/utils/type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,kCAAkC,EAAE,MAAM,sCAAsC,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;AAE1E,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM;IACjC,iBAAiB,EAAE,WAAW,EAAE,CAAC;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,kBAAkB,CAAC;IAC1B,oBAAoB,EAAE,QAAQ,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACjE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,EAAE,SAAS,KAAK,KAAK,CAAC,SAAS,CAAC;AAElE,MAAM,MAAM,yBAAyB,GAAG,CAAC,IAAI,EAAE;IAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,KAAK,SAAS,CAAC;AAEhB,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,GAAG;IACrD,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,qBAAqB,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,qBAAqB,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,KAAK,SAAS,CAAC;AAEzE,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,mBAAmB,KAAK,eAAe,EAAE,CAAC;AAEhF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,qBAAqB,EAAE,CAAC;IAChC,QAAQ,EAAE,qBAAqB,EAAE,CAAC;IAClC,SAAS,CAAC,EAAE,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAAC;CAC5C,CAAC;AACF,MAAM,MAAM,WAAW,GAAG,CACxB,MAAM,EAAE,iBAAiB,KACtB,KAAK,CAAC,qBAAqB,GAAG,OAAO,GAAG;IAAE,WAAW,CAAC,EAAE,SAAS,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE1F,MAAM,MAAM,wBAAwB,GAAG;IACrC,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,mBAAmB,CAAC;IACnC,mBAAmB,EAAE,yBAAyB,CAAC;IAC/C,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,kBAAkB,GAAG,wBAAwB,GAAG,WAAW,CAAC;AAC1F,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,WAAW,CAAC;AAEvD,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,cAAc,EAAE,kCAAkC,CAAC,UAAU,CAAC,CAAC;IAC/D,SAAS,CAAC,EAAE,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAAC;CAC5C,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,mBAAmB,EAAE,kCAAkC,CAAC,QAAQ,CAAC,CAAC;CACnE,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,KAAK,SAAS,CAAC;IACpE,sBAAsB,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,SAAS,CAAC;IACjE,oBAAoB,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,SAAS,CAAC;IAC9E,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,CAAC,KAAK,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,SAAS,CAAC;IAC5E,SAAS,EAAE,GAAG,CACZ,MAAM,EACN;QAAE,YAAY,EAAE,qBAAqB,CAAC;QAAC,UAAU,EAAE,qBAAqB,EAAE,CAAA;KAAE,CAC7E,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,CACzC,sBAAsB,EAAE,sBAAsB,KAC3C,CAAC,KAAK,EAAE,KAAK,KAAK,CAAC,MAAM,EAAE,qBAAqB,EAAE,KAAK,CAAC,qBAAqB,GAAG,SAAS,CAAC,EAAE,CAAC;AAElG,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE;QACL,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAClC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,QAAQ,EAAE,qBAAqB,EAAE,CAAC;IAClC,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACtC,CAAC"}
1
+ {"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../src/modularDrawer/utils/type.ts"],"names":[],"mappings":"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"}
@@ -332,9 +332,9 @@ const handlers = ({ accounts, tracking, manifest, uiHooks: { "custom.exchange.st
332
332
  targetCurrencyId: toCurrency?.id,
333
333
  hardwareWalletType: deviceInfo?.modelId,
334
334
  swapAppVersion,
335
- fromAccountId: fromAccount.id,
336
- toAccountId: toAccount?.id,
337
- amount: amountExpectedTo.toString(),
335
+ fromAccountAddress,
336
+ toAccountAddress,
337
+ fromAmount,
338
338
  });
339
339
  resolve({ operationHash, swapId });
340
340
  },
@@ -350,11 +350,11 @@ const handlers = ({ accounts, tracking, manifest, uiHooks: { "custom.exchange.st
350
350
  hardwareWalletType: deviceInfo?.modelId,
351
351
  swapType: quoteId ? "fixed" : "float",
352
352
  swapAppVersion,
353
- fromAccountId: fromAccount.id,
354
- toAccountId: toAccount?.id,
353
+ fromAccountAddress,
354
+ toAccountAddress,
355
355
  refundAddress,
356
356
  payoutAddress,
357
- amount: amountExpectedTo.toString(),
357
+ fromAmount,
358
358
  seedIdFrom: mainFromAccount.seedIdentifier,
359
359
  seedIdTo: toParentAccount?.seedIdentifier || toAccount?.seedIdentifier,
360
360
  });
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/wallet-api/Exchange/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/wallet-api/Exchange/server.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI9D,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAgB7C,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,KAAA,GACH,aAAa,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAuFlE;AAED,wBAAgB,aAAa,CAC3B,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,KAAK,SAAS,GACpE;IACD,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,CAcA"}
1
+ {"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI9D,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAgB7C,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,KAAA,GACH,aAAa,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAmFlE;AAED,wBAAgB,aAAa,CAC3B,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,KAAK,SAAS,GACpE;IACD,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,CAcA"}
@@ -17,7 +17,8 @@ export function genericPrepareTransaction(network, kind) {
17
17
  const { assetReference, assetOwner } = getAssetFromToken
18
18
  ? getAssetInfos(transaction, account.freshAddress, getAssetFromToken)
19
19
  : assetInfosFallback(transaction);
20
- let fees = transaction.customFees?.parameters?.fees || null;
20
+ const customParametersFees = transaction.customFees?.parameters?.fees;
21
+ let fees = customParametersFees || null;
21
22
  if (fees === null) {
22
23
  fees = (await estimateFees(transactionToIntent(account, {
23
24
  ...transaction,
@@ -31,7 +32,7 @@ export function genericPrepareTransaction(network, kind) {
31
32
  assetOwner,
32
33
  customFees: {
33
34
  parameters: {
34
- fees: new BigNumber(fees.toString()),
35
+ fees: customParametersFees ? new BigNumber(customParametersFees.toString()) : undefined,
35
36
  },
36
37
  },
37
38
  };
@@ -47,10 +48,6 @@ export function genericPrepareTransaction(network, kind) {
47
48
  typeof storageLimit === "number" ||
48
49
  typeof storageLimit === "string")) {
49
50
  next.storageLimit = new BigNumber(storageLimit.toString());
50
- // Add storageLimit to customFees parameters
51
- if (next.customFees?.parameters) {
52
- next.customFees.parameters.storageLimit = new BigNumber(storageLimit.toString());
53
- }
54
51
  }
55
52
  }
56
53
  // align with stellar/xrp: when send max (or staking intents), reflect validated amount in UI
@@ -1 +1 @@
1
- {"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAI9E,SAAS,IAAI,CAAC,CAA+B,EAAE,CAA+B;IAC5E,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,kBAAkB,CAAC,WAA+B;IAIzD,OAAO;QACL,cAAc,EAAE,WAAW,CAAC,cAAc,IAAI,EAAE;QAChD,UAAU,EAAE,WAAW,CAAC,UAAU,IAAI,EAAE;KACzC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,OAAe,EACf,IAAI;IAEJ,OAAO,KAAK,EAAE,OAAO,EAAE,WAA+B,EAAE,EAAE;QACxD,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,YAAY,CACzF,OAAO,CAAC,QAAQ,CAAC,EAAE,EACnB,IAAI,CACL,CAAC;QACF,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,iBAAiB;YACtD,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,EAAE,iBAAiB,CAAC;YACrE,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACpC,MAAM,oBAAoB,GAAG,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC;QACtE,IAAI,IAAI,GAA8B,oBAAoB,IAAI,IAAI,CAAC;QACnE,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,IAAI,GAAG,CACL,MAAM,YAAY,CAChB,mBAAmB,CACjB,OAAO,EACP;gBACE,GAAG,WAAW;aACf,EACD,iBAAiB,CAClB,CACF,CACF,CAAC,KAAK,CAAC;SACT;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE;YAC3D,MAAM,IAAI,GAAuB;gBAC/B,GAAG,WAAW;gBACd,IAAI,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACpC,cAAc;gBACd,UAAU;gBACV,UAAU,EAAE;oBACV,UAAU,EAAE;wBACV,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;qBACxF;iBACF;aACF,CAAC;YAEF,gEAAgE;YAChE,MAAM,aAAa,GAAG,MAAM,YAAY,CACtC,mBAAmB,CACjB,OAAO,EACP;gBACE,GAAG,WAAW;aACf,EACD,iBAAiB,CAClB,CACF,CAAC;YACF,MAAM,MAAM,GAAG,aAAa,EAAE,UAAU,CAAC;YACzC,IAAI,MAAM,EAAE;gBACV,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;gBAC5C,IACE,YAAY,KAAK,SAAS;oBAC1B,CAAC,OAAO,YAAY,KAAK,QAAQ;wBAC/B,OAAO,YAAY,KAAK,QAAQ;wBAChC,OAAO,YAAY,KAAK,QAAQ,CAAC,EACnC;oBACA,IAAI,CAAC,YAAY,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;iBAC5D;aACF;YAED,6FAA6F;YAC7F,IACE,WAAW,CAAC,YAAY;gBACxB,WAAW,CAAC,MAAM,CAAC,KAAK,OAAO;gBAC/B,WAAW,CAAC,MAAM,CAAC,KAAK,SAAS,EACjC;gBACA,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,cAAc,CACrC,mBAAmB,CACjB,OAAO,EACP;oBACE,GAAG,WAAW;iBACf,EACD,iBAAiB,CAClB,CACF,CAAC;gBACF,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;aAChD;YACD,OAAO,IAAI,CAAC;SACb;QAED,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,EAAsB,EACtB,KAAa,EACb,iBAAqE;IAKrE,IAAI,EAAE,CAAC,YAAY,EAAE;QACnB,MAAM,EAAE,KAAK,EAAE,GAAG,oBAAoB,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;QAExD,IAAI,CAAC,KAAK;YAAE,OAAO,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAE1C,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9C,OAAO;YACL,UAAU,EAAE,CAAC,YAAY,IAAI,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;YAC7D,cAAc,EAAE,CAAC,gBAAgB,IAAI,KAAK,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE;SAC1E,CAAC;KACH;IACD,OAAO,kBAAkB,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC"}
@@ -66,5 +66,65 @@ describe("genericPrepareTransaction", () => {
66
66
  const result = await prepareTransaction(account, baseTransaction);
67
67
  expect(result).toBe(baseTransaction); // still same reference
68
68
  });
69
+ it("propagates storageLimit from second estimation", async () => {
70
+ const estimatedFee = new BigNumber(491);
71
+ const estimateFeesFirstCall = jest.fn().mockResolvedValue({
72
+ value: estimatedFee,
73
+ parameters: { storageLimit: 300 },
74
+ });
75
+ const estimateFeesSecondCall = jest.fn().mockResolvedValue({
76
+ value: estimatedFee,
77
+ parameters: { storageLimit: 0 },
78
+ });
79
+ getAlpacaApi.mockReturnValue({
80
+ estimateFees: jest
81
+ .fn()
82
+ .mockImplementationOnce(() => estimateFeesFirstCall())
83
+ .mockImplementationOnce(() => estimateFeesSecondCall()),
84
+ });
85
+ const txWithoutCustomFees = { ...baseTransaction, customFees: undefined };
86
+ const prepareTransaction = genericPrepareTransaction(network, kind);
87
+ const result = await prepareTransaction(account, txWithoutCustomFees);
88
+ expect(result).toEqual(expect.objectContaining({
89
+ fees: estimatedFee,
90
+ storageLimit: new BigNumber(0),
91
+ customFees: {
92
+ parameters: {
93
+ fees: undefined,
94
+ },
95
+ },
96
+ }));
97
+ expect(getAlpacaApi().estimateFees).toHaveBeenCalledTimes(2);
98
+ });
99
+ it("propagates storageLimit showing new account scenario", async () => {
100
+ const estimatedFee = new BigNumber(491);
101
+ const estimateFeesFirstCall = jest.fn().mockResolvedValue({
102
+ value: estimatedFee,
103
+ parameters: { storageLimit: 300 },
104
+ });
105
+ const estimateFeesSecondCall = jest.fn().mockResolvedValue({
106
+ value: estimatedFee,
107
+ parameters: { storageLimit: 277 },
108
+ });
109
+ getAlpacaApi.mockReturnValue({
110
+ estimateFees: jest
111
+ .fn()
112
+ .mockImplementationOnce(() => estimateFeesFirstCall())
113
+ .mockImplementationOnce(() => estimateFeesSecondCall()),
114
+ });
115
+ const txWithoutCustomFees = { ...baseTransaction, customFees: undefined };
116
+ const prepareTransaction = genericPrepareTransaction(network, kind);
117
+ const result = await prepareTransaction(account, txWithoutCustomFees);
118
+ expect(result).toEqual(expect.objectContaining({
119
+ fees: estimatedFee,
120
+ storageLimit: new BigNumber(277),
121
+ customFees: {
122
+ parameters: {
123
+ fees: undefined,
124
+ },
125
+ },
126
+ }));
127
+ expect(getAlpacaApi().estimateFees).toHaveBeenCalledTimes(2);
128
+ });
69
129
  });
70
130
  //# sourceMappingURL=prepareTransaction.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/tests/prepareTransaction.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/tests/prepareTransaction.test.ts"],"names":[],"mappings":"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"}