Merge branch 'main' into test/remove-redundant-dapp-pom

input-output-hk · Jan 27, 2025 · 1c5a07c · 1c5a07c
2 parents 0ae60b0 + 5dc3410
commit 1c5a07c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/apps/browser-extension-wallet/manifest.json b/apps/browser-extension-wallet/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "$WALLET_MANIFEST_NAME",
   "description": "One fast, accessible, and secure platform for digital assets, DApps, NFTs, and DeFi.",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "manifest_version": 3,
   "key": "$LACE_EXTENSION_KEY",
   "icons": {

diff --git a/apps/browser-extension-wallet/package.json b/apps/browser-extension-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lace/browser-extension-wallet",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "description": "A fully capable wallet packaged as browser extensions for Chrome, Firefox, and Edge",
   "homepage": "https://github.com/input-output-hk/lace/blob/master/apps/browser-extension-wallet/README.md",
   "bugs": {

diff --git a/apps/browser-extension-wallet/src/lib/scripts/background/config.ts b/apps/browser-extension-wallet/src/lib/scripts/background/config.ts
@@ -68,8 +68,8 @@ export const getProviders = async (chainName: Wallet.ChainName): Promise<Wallet.
       useBlockfrostRewardsProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_REWARDS_PROVIDER),
       useBlockfrostTxSubmitProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_TX_SUBMIT_PROVIDER),
       useBlockfrostUtxoProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_UTXO_PROVIDER),
-      useBlockfrostAddressDiscovery: isExperimentEnabled(ExperimentName.BLOCKFROST_ADDRESS_DISCOVERY),
-      useBlockfrostInputResolver: isExperimentEnabled(ExperimentName.BLOCKFROST_INPUT_RESOLVER)
+      useBlockfrostAddressDiscovery: true,
+      useBlockfrostInputResolver: true
     }
   });
 };

diff --git a/apps/browser-extension-wallet/src/stores/slices/wallet-activities-slice.ts b/apps/browser-extension-wallet/src/stores/slices/wallet-activities-slice.ts
@@ -140,6 +140,8 @@ const mapWalletActivities = memoize(
       Pick<IBlockchainProvider, 'inputResolver'> &
       Pick<WalletInfoSlice, 'isSharedWallet'>
   ) => {
+    const TX_LIMIT_SIZE = 10;
+    const txHistorySlice = transactions.history.slice(-TX_LIMIT_SIZE);
     const epochRewardsMapper = (earnedEpoch: Wallet.Cardano.EpochNo, rewards: Reward[]): ExtendedActivityProps => {
       const REWARD_SPENDABLE_DELAY_EPOCHS = 2;
       const spendableEpoch = (earnedEpoch + REWARD_SPENDABLE_DELAY_EPOCHS) as Wallet.Cardano.EpochNo;
@@ -276,8 +278,8 @@ const mapWalletActivities = memoize(
     const getHistoricalTransactions = async () => {
       const filtered =
         !assetDetails || assetDetails?.id === cardanoCoin.id
-          ? transactions.history.map((tx) => ({ tx }))
-          : await filterTransactionByAssetId(transactions.history);
+          ? txHistorySlice.map((tx) => ({ tx }))
+          : await filterTransactionByAssetId(txHistorySlice);
       return flatten(await Promise.all(filtered.map((tx) => historicTransactionMapper(tx))));
     };
 

diff --git a/...xtension-wallet/src/views/browser-view/features/activity/helpers/common-tx-transformer.ts b/...xtension-wallet/src/views/browser-view/features/activity/helpers/common-tx-transformer.ts
@@ -14,7 +14,7 @@ import { hasPhase2ValidationFailed } from '@src/utils/phase2-validation';
 import { createTxInspector, Milliseconds, transactionSummaryInspector } from '@cardano-sdk/core';
 
 // eslint-disable-next-line no-magic-numbers
-const TIMEOUT = 1000 as Milliseconds;
+const TIMEOUT = 2000 as Milliseconds;
 
 export interface TxTransformerInput {
   tx: Wallet.TxInFlight | Wallet.Cardano.HydratedTx | Wallet.KeyManagement.WitnessedTx;

diff --git a/packages/nami/src/ui/app/components/historyViewer.tsx b/packages/nami/src/ui/app/components/historyViewer.tsx
@@ -84,7 +84,7 @@ const HistoryViewer = () => {
               fontWeight="bold"
               color="gray.400"
             >
-              ... nothing more
+              Use a Cardano explorer to see full transaction history.
             </Box>
           ) : (
             <Box textAlign="center">