Skip to content

Commit

Permalink
Merge branch 'develop' into tim/eng-3496-fix-utxo-500-issue-add-a-fal…
Browse files Browse the repository at this point in the history
…lback-option-to-our-api-httpsbtc
  • Loading branch information
teebszet committed Jan 10, 2024
2 parents b1ff53e + e30276a commit fb290f7
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@ledgerhq/hw-transport-webusb": "^6.27.13",
"@phosphor-icons/react": "^2.0.10",
"@react-spring/web": "^9.6.1",
"@secretkeylabs/xverse-core": "7.2.0-31ce442",
"@secretkeylabs/xverse-core": "8.0.0",
"@stacks/connect": "7.4.1",
"@stacks/stacks-blockchain-api-types": "6.1.1",
"@stacks/transactions": "6.9.0",
Expand Down
4 changes: 2 additions & 2 deletions src/app/screens/coinDashboard/transactionsHistoryList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import { CurrencyTypes } from '@utils/constants';
import { formatDate } from '@utils/date';
import { isLedgerAccount } from '@utils/helper';
import {
Tx,
isAddressTransactionWithTransfers,
isBrc20Transaction,
isBrc20TransactionArr,
isBtcTransaction,
isBtcTransactionArr,
Tx,
} from '@utils/transactions/transactions';
import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
Expand Down Expand Up @@ -193,7 +193,7 @@ export default function TransactionsHistoryList(props: TransactionsHistoryListPr
: selectedAccount.id,
network: network.type,
esploraProvider: btcClient,
seedVault,
getSeedPhrase: seedVault.getSeed,
}
: undefined;

Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/speedUpTransaction/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function SpeedUpTransactionScreen() {
: selectedAccount.id,
network: network.type,
esploraProvider: btcClient,
seedVault,
getSeedPhrase: seedVault.getSeed,
});
setRbfTransaction(rbfTx);

Expand Down

0 comments on commit fb290f7

Please sign in to comment.