Skip to content

Commit

Permalink
Merge pull request #203 from mintlayer/dev
Browse files Browse the repository at this point in the history
Dev-13-02-2025
  • Loading branch information
owlsua authored Feb 13, 2025
2 parents 09fc9ef + 399ee1a commit c420615
Show file tree
Hide file tree
Showing 109 changed files with 4,228 additions and 2,534 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ INLINE_RUNTIME_CHUNK=false
GENERATE_SOURCEMAP=false
MAINNET_ELECTRUM_SERVERS='https://blockstream.info/api'
TESTNET_ELECTRUM_SERVERS='http://51.158.172.176:3001, https://blockstream.info/testnet/api'
TESTNET_MINTLAYER_SERVERS='https://api-server-lovelace.mintlayer.org'
MAINNET_MINTLAYER_SERVERS='https://api-server.mintlayer.org'
TESTNET_MINTLAYER_SERVERS='https://api-server-lovelace.mintlayer.org/api/v2'
MAINNET_MINTLAYER_SERVERS='https://api-server.mintlayer.org/api/v2'
4 changes: 2 additions & 2 deletions .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ INLINE_RUNTIME_CHUNK=false
GENERATE_SOURCEMAP=false
MAINNET_ELECTRUM_SERVERS='https://blockstream.info/api'
TESTNET_ELECTRUM_SERVERS='http://51.158.172.176:3001, https://blockstream.info/testnet/api'
TESTNET_MINTLAYER_SERVERS='https://api-server-lovelace.mintlayer.org'
MAINNET_MINTLAYER_SERVERS='https://api-server.mintlayer.org'
TESTNET_MINTLAYER_SERVERS='https://api-server-lovelace.mintlayer.org/api/v2'
MAINNET_MINTLAYER_SERVERS='https://api-server.mintlayer.org/api/v2'
4 changes: 2 additions & 2 deletions .env.staging
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ INLINE_RUNTIME_CHUNK=false
GENERATE_SOURCEMAP=true
MAINNET_ELECTRUM_SERVERS='https://blockstream.info/api'
TESTNET_ELECTRUM_SERVERS='http://51.158.172.176:3001, https://blockstream.info/testnet/api'
TESTNET_MINTLAYER_SERVERS='https://api-server-lovelace.mintlayer.org'
MAINNET_MINTLAYER_SERVERS='https://api-server.mintlayer.org'
TESTNET_MINTLAYER_SERVERS='https://api-server-lovelace.mintlayer.org/api/v2'
MAINNET_MINTLAYER_SERVERS='https://api-server.mintlayer.org/api/v2'
112 changes: 62 additions & 50 deletions package-lock.json

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

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "browser-extension",
"version": "1.3.5",
"version": "1.3.6",
"private": true,
"dependencies": {
"@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
"@mintlayer/entropy-generator": "^1.0.4",
"bip32": "^4.0.0",
"bip39": "^3.1.0",
"bitcoinjs-lib": "^6.1.6",
"bitcoinjs-lib": "^6.1.7",
"bluebird": "^3.7.2",
"buffer": "^6.0.3",
"canvas": "^2.11.2",
Expand All @@ -34,7 +34,7 @@
"test": "NODE_ENV=test react-scripts --openssl-legacy-provider test a --testPathIgnorePatterns='src/pages'",
"coverage": "npm test -- --coverage ",
"serve": "npm run build && http-server -p 8000 build/ ",
"e2e": "npx playwright test --workers=1",
"e2e": "npx playwright test --workers=5",
"e2e:debug": "npx playwright test --headed",
"e2e:ui": "npx playwright test --ui",
"eject": "react-scripts eject",
Expand Down Expand Up @@ -160,23 +160,23 @@
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@mdx-js/loader": "^3.1.0",
"@mdx-js/react": "^3.1.0",
"@playwright/test": "^1.48.2",
"@playwright/test": "^1.49.1",
"@svgr/webpack": "^8.1.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/react": "^16.1.0",
"@testing-library/user-event": "^14.5.2",
"@types/node": "^22.9.0",
"@types/node": "^22.10.2",
"@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.2.0",
"http-server": "^14.1.1",
"husky": "^9.1.6",
"husky": "^9.1.7",
"indexeddb-export-import": "^2.1.5",
"jest-canvas-mock": "^2.5.2",
"prettier": "^3.3.3",
"prettier": "^3.4.2",
"pretty-quick": "^4.0.0",
"react-app-rewire-alias": "^1.1.7",
"react-scripts": "5.0.1",
Expand Down
4 changes: 2 additions & 2 deletions playwright.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ const { defineConfig, devices } = require('@playwright/test')
module.exports = defineConfig({
testDir: './tests',
/* Run tests in files in parallel */
fullyParallel: false,
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
forbidOnly: !!process.env.CI,
/* Retry on CI only */
retries: process.env.CI ? 2 : 0,
/* Opt out of parallel tests on CI. */
workers: process.env.CI ? 1 : undefined,
workers: process.env.CI ? 5 : undefined,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: 'html',
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
Expand Down
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.5",
"version": "1.3.6",
"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.5",
"version": "1.3.6",
"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
Loading

0 comments on commit c420615

Please sign in to comment.