Skip to content

Commit

Permalink
Merge pull request #194 from mintlayer/dev
Browse files Browse the repository at this point in the history
Dev-04-11-2024
  • Loading branch information
owlsua authored Nov 4, 2024
2 parents d9db2de + a7310d5 commit 481a53f
Show file tree
Hide file tree
Showing 144 changed files with 8,099 additions and 13,421 deletions.
19,185 changes: 6,569 additions & 12,616 deletions package-lock.json

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "browser-extension",
"version": "1.3.3",
"version": "1.3.4",
"private": true,
"dependencies": {
"@mintlayer/entropy-generator": "^1.0.4",
Expand All @@ -11,21 +11,21 @@
"buffer": "^6.0.3",
"canvas": "^2.11.2",
"d3": "^7.9.0",
"date-fns": "^3.6.0",
"date-fns": "^4.1.0",
"jest-webgl-canvas-mock": "^2.5.3",
"konva": "^9.3.11",
"konva": "^9.3.16",
"node-forge": "^1.3.1",
"pbkdf2": "^3.1.2",
"process": "^0.11.10",
"react": "^18.3.1",
"react-app-rewired": "^2.2.1",
"react-dom": "^18.3.1",
"react-konva": "^18.2.10",
"react-qr-code": "^2.0.14",
"react-router-dom": "^6.23.1",
"react-qr-code": "^2.0.15",
"react-router-dom": "^6.27.0",
"stream-browserify": "^3.0.0",
"@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
"web-vitals": "^4.1.1"
"web-vitals": "^4.2.4"
},
"scripts": {
"start": "react-app-rewired start",
Expand Down Expand Up @@ -157,26 +157,26 @@
]
},
"devDependencies": {
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/react": "^16.0.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@mdx-js/loader": "^3.0.1",
"@mdx-js/react": "^3.0.1",
"@playwright/test": "^1.44.1",
"@mdx-js/loader": "^3.1.0",
"@mdx-js/react": "^3.1.0",
"@playwright/test": "^1.48.2",
"@svgr/webpack": "^8.1.0",
"@types/node": "^20.14.2",
"@types/node": "^22.8.6",
"@types/tiny-secp256k1": "^2.0.1",
"dotenv-webpack": "^8.1.0",
"ecpair": "^2.1.0",
"env-cmd": "^10.1.0",
"fake-indexeddb": "^6.0.0",
"gh-pages": "^6.1.1",
"gh-pages": "^6.2.0",
"http-server": "^14.1.1",
"husky": "^9.0.11",
"husky": "^9.1.6",
"indexeddb-export-import": "^2.1.5",
"jest-canvas-mock": "^2.5.2",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"pretty-quick": "^4.0.0",
"react-app-rewire-alias": "^1.1.7",
"react-scripts": "5.0.1",
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
5 changes: 5 additions & 0 deletions public/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,10 @@
display: flex;
justify-content: center;
padding: 30px 0 0 0;
height: 100vh;
}

body {
border-radius: 30px;
}
}
Binary file modified public/logo128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/logo16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/logo192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/logo32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/logo96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/manifestDefault.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 3,
"name": "Mojito - A Mintlayer Wallet",
"version": "1.3.3",
"version": "1.3.4",
"short_name": "Mojito",
"description": "Mojito is a non-custodial decentralized crypto wallet that lets you send and receive BTC and ML from any other address.",
"homepage_url": "https://www.mintlayer.org/",
Expand Down
2 changes: 1 addition & 1 deletion public/manifestFirefox.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 3,
"name": "Mojito - A Mintlayer Wallet",
"version": "1.3.3",
"version": "1.3.4",
"description": "Mojito is a non-custodial decentralized crypto wallet that lets you send and receive BTC and ML from any other address.",
"homepage_url": "https://www.mintlayer.org/",
"icons": {
Expand Down
3 changes: 3 additions & 0 deletions src/assets/images/icon-account.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions src/assets/images/icon-add-wallet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/images/icon-arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/images/icon-arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/images/icon-arrow-right-top.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/images/icon-arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions src/assets/images/icon-arrow.svg

This file was deleted.

6 changes: 3 additions & 3 deletions src/assets/images/icon-close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions src/assets/images/icon-delegation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/images/icon-expand.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/assets/images/icon-hamburger.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/images/icon-home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions src/assets/images/icon-login.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 481a53f

Please sign in to comment.