Skip to content

Commit

Permalink
Merge branch 'master' into release/interlay/2.14.13
Browse files Browse the repository at this point in the history
* master: (241 commits)
  chore: release v2.41.13
  chore: bump bridge and add new dependency (#1664)
  Fixed a small dashboard display issue (#1658)
  chore: release v2.41.12
  api: improve cache-control headers (#1659)
  chore: release v2.41.11
  chore: release v2.41.10
  HDX and BNC icons (#1655)
  api: add Vercel KV cache for storing market data (#1654)
  Tom/bridge 0.5.1 (#1651)
  chore: release v2.41.9
  chore: bump bridge (#1648)
  chore: release v2.41.8
  hotfix: XCM polkadot/kintsugi max transferable balance (#1645)
  Revert "[release] Interlay 2.41.7 (#1639)" (#1641)
  [release] Interlay 2.41.7 (#1639)
  chore: release v2.41.7
  fix: chart counter enum and lower value for collateral (#1638)
  chore: release v2.41.6
  refactor: line chart config (#1635)
  ...

# Conflicts:
#	package.json
#	src/services/fetchers/cumulative-vault-collateral-volumes-fetcher.ts
#	yarn.lock
  • Loading branch information
tomjeatt committed Jul 9, 2024
2 parents 2453614 + 58d0cc5 commit 0454c32
Show file tree
Hide file tree
Showing 3 changed files with 6,533 additions and 6,893 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "interbtc-ui",
"version": "2.41.12",
"version": "2.41.13",
"private": true,
"dependencies": {
"@acala-network/sdk-core": "^4.1.5",
"@craco/craco": "^6.1.1",
"@headlessui/react": "^1.1.1",
"@heroicons/react": "^2.0.18",
"@interlay/bridge": "^0.5.1",
"@interlay/bridge": "^0.6.0",
"@interlay/interbtc-api": "2.6.0",
"@interlay/monetary-js": "0.7.3",
"@polkadot/api": "10.9.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const cumulativeVaultCollateralVolumesFetcher = async (
[ticker]: [
...(result[ticker] || []),
{
amount: newMonetaryAmount(volumeData.amount || 0, currency),
amount: newMonetaryAmount(volumeData?.amount || 0, currency),
tillTimestamp: cutoffTimestamps.find((cutoffTimestamp) => cutoffTimestamp.getTime().toString() === timestamp)
}
]
Expand Down
Loading

0 comments on commit 0454c32

Please sign in to comment.