Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
MartyHav committed Jan 9, 2023
2 parents ccdee1b + a6f919e commit c3cd6d7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "haven_web_wallet",
"version": "3.0.0",
"version": "3.0.2",
"private": true,
"dependencies": {
"big-integer": "^1.6.51",
"haven-wallet-core": "^3.0.0",
"haven-wallet-core": "^3.0.2",
"history": "^5.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const ExchangeSummary = ({
if( fromTicker === Ticker.XHV && toTicker === Ticker.xUSD){
unlock_time = "~21d";
}else if( fromTicker === Ticker.xUSD && toTicker === Ticker.XHV ){
unlock_time = "~12h";
unlock_time = "~21d";
}else{
unlock_time = "~48h"
}
Expand Down
4 changes: 2 additions & 2 deletions haven-desktop-app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "haven",
"productName": "Haven",
"version": "3.0.0",
"version": "3.0.2",
"description": "Desktop App for Haven Vault",
"main": "dist/index.js",
"scripts": {
Expand All @@ -28,7 +28,7 @@
"dependencies": {
"axios": "^1.2.0",
"electron-squirrel-startup": "^1.0.0",
"haven-wallet-core": "^3.0.0",
"haven-wallet-core": "^3.0.2",
"rxjs": "^7.5.7"
},
"devDependencies": {
Expand Down

0 comments on commit c3cd6d7

Please sign in to comment.