From 8e8c32f501812b0cc5dd5977a74e7bfb70845a40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:09:26 +0000 Subject: [PATCH 01/33] Bump dawidd6/action-download-artifact from 2 to 3 (#1000) Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 2 to 3. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](https://github.com/dawidd6/action-download-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/android-build.yml | 2 +- .github/workflows/client-image.yml | 4 ++-- .github/workflows/coordinator-image.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 437b091f..0f7fd3f6 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -23,7 +23,7 @@ jobs: - name: 'Download Android Web.bundle Artifact (built frontend)' if: inputs.semver == '' # Only if workflow fired from frontend-build.yml - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: workflow: frontend-build.yml workflow_conclusion: success diff --git a/.github/workflows/client-image.yml b/.github/workflows/client-image.yml index da7831e2..2071b050 100644 --- a/.github/workflows/client-image.yml +++ b/.github/workflows/client-image.yml @@ -26,7 +26,7 @@ jobs: - name: 'Download basic.selfhosted.js Artifact' if: inputs.semver == '' # Only if workflow fired from frontend-build.yml - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: workflow: frontend-build.yml workflow_conclusion: success @@ -42,7 +42,7 @@ jobs: - name: 'Download pro.selfhosted.js Artifact' if: inputs.semver == '' # Only if workflow fired from frontend-build.yml - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: workflow: frontend-build.yml workflow_conclusion: success diff --git a/.github/workflows/coordinator-image.yml b/.github/workflows/coordinator-image.yml index c39b5773..e4a3cb84 100644 --- a/.github/workflows/coordinator-image.yml +++ b/.github/workflows/coordinator-image.yml @@ -17,7 +17,7 @@ jobs: - name: 'Download Basic main.js Artifact' if: inputs.semver == '' # Only if workflow fired from frontend-build.yml - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: workflow: frontend-build.yml workflow_conclusion: success @@ -33,7 +33,7 @@ jobs: - name: 'Download pro.js Artifact' if: inputs.semver == '' # Only if workflow fired from frontend-build.yml - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: workflow: frontend-build.yml workflow_conclusion: success From b56a664386cbd6db9b71b0127ba5c3cee798bb9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:09:49 +0000 Subject: [PATCH 02/33] Bump react-router-dom from 6.20.0 to 6.21.0 in /frontend (#1002) Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.20.0 to 6.21.0. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.21.0/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 26 +++++++++++++------------- frontend/package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 52c55d30..c3707448 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -43,7 +43,7 @@ "react-image": "^4.1.0", "react-leaflet": "^4.2.1", "react-qr-code": "^2.0.11", - "react-router-dom": "^6.20.0", + "react-router-dom": "^6.21.0", "react-smooth-image": "^1.1.0", "react-world-flags": "^1.6.0", "reconnecting-websocket": "^4.4.0", @@ -3839,9 +3839,9 @@ } }, "node_modules/@remix-run/router": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.13.0.tgz", - "integrity": "sha512-5dMOnVnefRsl4uRnAdoWjtVTdh8e6aZqgM4puy9nmEADH72ck+uXwzpJLEKE9Q6F8ZljNewLgmTfkxUrBdv4WA==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.0.tgz", + "integrity": "sha512-WOHih+ClN7N8oHk9N4JUiMxQJmRVaOxcg8w7F/oHUXzJt920ekASLI/7cYX8XkntDWRhLZtsk6LbGrkgOAvi5A==", "engines": { "node": ">=14.0.0" } @@ -13994,11 +13994,11 @@ } }, "node_modules/react-router": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.20.0.tgz", - "integrity": "sha512-pVvzsSsgUxxtuNfTHC4IxjATs10UaAtvLGVSA1tbUE4GDaOSU1Esu2xF5nWLz7KPiMuW8BJWuPFdlGYJ7/rW0w==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.0.tgz", + "integrity": "sha512-hGZ0HXbwz3zw52pLZV3j3+ec+m/PQ9cTpBvqjFQmy2XVUWGn5MD+31oXHb6dVTxYzmAeaiUBYjkoNz66n3RGCg==", "dependencies": { - "@remix-run/router": "1.13.0" + "@remix-run/router": "1.14.0" }, "engines": { "node": ">=14.0.0" @@ -14008,12 +14008,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.20.0.tgz", - "integrity": "sha512-CbcKjEyiSVpA6UtCHOIYLUYn/UJfwzp55va4yEfpk7JBN3GPqWfHrdLkAvNCcpXr8QoihcDMuk0dzWZxtlB/mQ==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.0.tgz", + "integrity": "sha512-1dUdVj3cwc1npzJaf23gulB562ESNvxf7E4x8upNJycqyUm5BRRZ6dd3LrlzhtLaMrwOCO8R0zoiYxdaJx4LlQ==", "dependencies": { - "@remix-run/router": "1.13.0", - "react-router": "6.20.0" + "@remix-run/router": "1.14.0", + "react-router": "6.21.0" }, "engines": { "node": ">=14.0.0" diff --git a/frontend/package.json b/frontend/package.json index e141eb34..c4a936ec 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -82,7 +82,7 @@ "react-image": "^4.1.0", "react-leaflet": "^4.2.1", "react-qr-code": "^2.0.11", - "react-router-dom": "^6.20.0", + "react-router-dom": "^6.21.0", "react-smooth-image": "^1.1.0", "react-world-flags": "^1.6.0", "reconnecting-websocket": "^4.4.0", From d133cc4f3f0302080a554577c4c55d75e328f8b6 Mon Sep 17 00:00:00 2001 From: blockdyor <140545954+blockdyor@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:10:09 +0100 Subject: [PATCH 03/33] Update README.md (#999) Added Robosats review published on blockdyor.com --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 830ff2dc..137ca5cc 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,7 @@ Check out the [Developer Rewards Panel](https://github.com/users/Reckless-Satosh - **[Bitcoin Magazine](https://bitcoinmagazine.com/business/robosats-private-bitcoin-exchange)** - **[KYC? Not Me!](https://kycnot.me/service/robosats)** - **[H17N Bitcoin](https://h17n.com/exchange/robosats/)** +- **[blockdyor](https://blockdyor.com/robosats/)** ## Inspiration The concept of a simple custody-minimized lightning exchange with hold invoices is inspired in [P2PLNBOT](https://github.com/grunch/p2plnbot) by @grunch From b5410cd4ddf23f51a49a13fe05d10b51e419fc77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:10:24 +0000 Subject: [PATCH 04/33] Bump @mui/icons-material from 5.14.0 to 5.15.0 in /frontend (#1001) Bumps [@mui/icons-material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-icons-material) from 5.14.0 to 5.15.0. - [Release notes](https://github.com/mui/material-ui/releases) - [Changelog](https://github.com/mui/material-ui/blob/master/CHANGELOG.md) - [Commits](https://github.com/mui/material-ui/commits/v5.15.0/packages/mui-icons-material) --- updated-dependencies: - dependency-name: "@mui/icons-material" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 18 +++++++++--------- frontend/package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c3707448..e5635861 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -14,7 +14,7 @@ "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", "@mui/base": "^5.0.0-beta.7", - "@mui/icons-material": "^5.14.0", + "@mui/icons-material": "^5.15.0", "@mui/lab": "^5.0.0-alpha.136", "@mui/material": "^5.14.0", "@mui/system": "^5.14.0", @@ -1879,9 +1879,9 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz", - "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.6.tgz", + "integrity": "sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -3114,18 +3114,18 @@ } }, "node_modules/@mui/icons-material": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.14.0.tgz", - "integrity": "sha512-z7lYNteDi1GMkF9JP/m2RWuCYK1M/FlaeBSUK7/IhIYzIXNhAVjfD8jRq5vFBV31qkEi2aGBS2z5SfLXwH6U0A==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.0.tgz", + "integrity": "sha512-zHY6fOkaK7VfhWeyxO8MjO3IAjEYpYMXuqUhX7TkUZJ9+TSH/9dn4ClG4K2j6hdgBU5Yrq2Z/89Bo6BHHp7AdQ==", "dependencies": { - "@babel/runtime": "^7.22.5" + "@babel/runtime": "^7.23.5" }, "engines": { "node": ">=12.0.0" }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@mui/material": "^5.0.0", diff --git a/frontend/package.json b/frontend/package.json index c4a936ec..23295a6d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -53,7 +53,7 @@ "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", "@mui/base": "^5.0.0-beta.7", - "@mui/icons-material": "^5.14.0", + "@mui/icons-material": "^5.15.0", "@mui/lab": "^5.0.0-alpha.136", "@mui/material": "^5.14.0", "@mui/system": "^5.14.0", From 169b2ba81a4de9a13ed98b713bddeb90710d303e Mon Sep 17 00:00:00 2001 From: Alan Stocco <31071496+alanStocco@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:10:38 +0100 Subject: [PATCH 05/33] wallets compatibility - add breez (#1003) --- docs/_pages/docs/03-understand/07-wallets.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/_pages/docs/03-understand/07-wallets.md b/docs/_pages/docs/03-understand/07-wallets.md index 94e13787..b59e0fc6 100644 --- a/docs/_pages/docs/03-understand/07-wallets.md +++ b/docs/_pages/docs/03-understand/07-wallets.md @@ -31,6 +31,7 @@ This is a non-exhaustive compilation based on past experience of users. We have |[Blink](#blink-mobile-former-bitcoin-beach-wallet)|[2.2.73](https://www.blink.sv/)|{{page.phone}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}} |{{page.thumbsup}}| |[Blixt](#blixt-androidios-lnd-light-backend-on-device)|[v0.4.1](https://github.com/hsjoberg/blixt-wallet)|{{page.phone}}|{{page.soso}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.thumbsup}}| |[Blue](#bluewallet-mobile)|[1.4.4](https://bluewallet.io/)|{{page.phone}}|{{page.good}}|{{page.unclear}}|{{page.unclear}}|{{page.good}}|{{page.unclear}}| +|[Breez](#breez-mobile)|[0.16](https://breez.technology/mobile/)|{{page.phone}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}}| |[Cash App](#cash-app-mobile)|[4.7](https://cash.app/)|{{page.phone}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}} |{{page.thumbsup}}| |[Core Lightning](#core-lightning--cln-cli-interface)|[v0.11.1](https://github.com/ElementsProject/lightning)|{{page.cli}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.thumbsup}}| |[Electrum](#electrum-desktop)|[4.1.4](https://github.com/spesmilo/electrum)|{{page.laptop}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.thumbsup}}|| @@ -65,6 +66,9 @@ Most development testing for RoboSats has been done using Blixt. This is one of ### Bluewallet (Mobile) It works well. Bluewallet has discontinued their custodial service. Previously, the custodial service would cause issues where escrows that RoboSats returns are charged to users and where slashed bonds are charged twice by Bluewallet! This was a known bug for long time in Bluewallet, so they shut down their LN custodial service (which ended up making RoboSats a smoother experience for users). +### Breez (Mobile) +It works well with RoboSats. Breez is a non-custodial wallet. So keep in mind channels managment and stuff like that. It's a versatile and easy-to-use interface. + ### Cash App (Mobile) Works well with RoboSats. Hodl invoices (Bonds) show as "Pending" in the transaction history. Payouts to the Cash App wallet function as intended. Custodial wallet by Block, Inc., formerly known as Square, Inc., which is led by Jack Dorsey. From 01e067a971487b2b301033af6eb2ca5ae6f47b11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:11:54 +0000 Subject: [PATCH 06/33] Bump isort from 5.12.0 to 5.13.0 (#997) Bumps [isort](https://github.com/pycqa/isort) from 5.12.0 to 5.13.0. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](https://github.com/pycqa/isort/compare/5.12.0...5.13.0) --- updated-dependencies: - dependency-name: isort dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index 15af5c24..c1f4c696 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,6 +1,6 @@ coverage==7.3.2 black==23.3.0 -isort==5.12.0 +isort==5.13.0 flake8==6.1.0 pyflakes==3.1.0 drf-openapi-tester==2.3.3 From 5c6b5dd619cae657d6c2b8d3b7f36e04f756a641 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:12:14 +0000 Subject: [PATCH 07/33] Bump grpcio from 1.59.2 to 1.60.0 (#996) Bumps [grpcio](https://github.com/grpc/grpc) from 1.59.2 to 1.60.0. - [Release notes](https://github.com/grpc/grpc/releases) - [Changelog](https://github.com/grpc/grpc/blob/master/doc/grpc_release_schedule.md) - [Commits](https://github.com/grpc/grpc/compare/v1.59.2...v1.60.0) --- updated-dependencies: - dependency-name: grpcio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cd447e2a..b84d8c0c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ djangorestframework==3.14.0 channels==4.0.0 channels-redis==4.1.0 celery==5.3.6 -grpcio==1.59.2 +grpcio==1.60.0 googleapis-common-protos==1.61.0 grpcio-tools==1.59.2 numpy==1.26.0 From d64f2515c88bc07b1cdbd8a68dee0907ab0072f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:12:28 +0000 Subject: [PATCH 08/33] Bump pre-commit from 3.5.0 to 3.6.0 (#995) Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.5.0...v3.6.0) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index c1f4c696..b37d6d5c 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -4,4 +4,4 @@ isort==5.13.0 flake8==6.1.0 pyflakes==3.1.0 drf-openapi-tester==2.3.3 -pre-commit==3.5.0 \ No newline at end of file +pre-commit==3.6.0 \ No newline at end of file From 86b5a878def9857efe77561655340a93d0fa6e26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:13:40 +0000 Subject: [PATCH 09/33] Bump googleapis-common-protos from 1.61.0 to 1.62.0 (#993) Bumps [googleapis-common-protos](https://github.com/googleapis/python-api-common-protos) from 1.61.0 to 1.62.0. - [Release notes](https://github.com/googleapis/python-api-common-protos/releases) - [Changelog](https://github.com/googleapis/python-api-common-protos/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/python-api-common-protos/compare/v1.61.0...v1.62.0) --- updated-dependencies: - dependency-name: googleapis-common-protos dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b84d8c0c..0260f689 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ channels==4.0.0 channels-redis==4.1.0 celery==5.3.6 grpcio==1.60.0 -googleapis-common-protos==1.61.0 +googleapis-common-protos==1.62.0 grpcio-tools==1.59.2 numpy==1.26.0 Pillow==10.1.0 From 637314b27e8ff2effb86abaa9417eaa82d504d79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:13:48 +0000 Subject: [PATCH 10/33] Bump typescript from 5.3.2 to 5.3.3 in /mobile (#992) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.3.2 to 5.3.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.2...v5.3.3) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- mobile/package-lock.json | 8 ++++---- mobile/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mobile/package-lock.json b/mobile/package-lock.json index 357514ec..39424d54 100644 --- a/mobile/package-lock.json +++ b/mobile/package-lock.json @@ -40,7 +40,7 @@ "metro-react-native-babel-preset": "^0.75.1", "prettier": "^3.1.0", "react-test-renderer": "18.2.0", - "typescript": "^5.3.2" + "typescript": "^5.3.3" } }, "node_modules/@ampproject/remapping": { @@ -13742,9 +13742,9 @@ } }, "node_modules/typescript": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", - "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/mobile/package.json b/mobile/package.json index d84d1673..43ded4ad 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -44,7 +44,7 @@ "metro-react-native-babel-preset": "^0.75.1", "prettier": "^3.1.0", "react-test-renderer": "18.2.0", - "typescript": "^5.3.2" + "typescript": "^5.3.3" }, "resolutions": { "@types/react": "^18" From e0871482531b6f5644ad1c5a1750b30788b636c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:13:59 +0000 Subject: [PATCH 11/33] Bump eslint-config-prettier from 9.0.0 to 9.1.0 in /mobile (#991) Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 9.0.0 to 9.1.0. - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v9.0.0...v9.1.0) --- updated-dependencies: - dependency-name: eslint-config-prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- mobile/package-lock.json | 8 ++++---- mobile/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mobile/package-lock.json b/mobile/package-lock.json index 39424d54..9d5af4f6 100644 --- a/mobile/package-lock.json +++ b/mobile/package-lock.json @@ -27,7 +27,7 @@ "@typescript-eslint/parser": "^5.59.6", "babel-jest": "^29.7.0", "eslint": "^8.39.0", - "eslint-config-prettier": "^9.0.0", + "eslint-config-prettier": "^9.1.0", "eslint-config-standard-with-typescript": "^34.0.1", "eslint-import-resolver-typescript": "^3.6.0", "eslint-plugin-import": "^2.27.5", @@ -6181,9 +6181,9 @@ } }, "node_modules/eslint-config-prettier": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", - "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", + "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", "dev": true, "bin": { "eslint-config-prettier": "bin/cli.js" diff --git a/mobile/package.json b/mobile/package.json index 43ded4ad..1582a438 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -31,7 +31,7 @@ "@typescript-eslint/parser": "^5.59.6", "babel-jest": "^29.7.0", "eslint": "^8.39.0", - "eslint-config-prettier": "^9.0.0", + "eslint-config-prettier": "^9.1.0", "eslint-config-standard-with-typescript": "^34.0.1", "eslint-import-resolver-typescript": "^3.6.0", "eslint-plugin-import": "^2.27.5", From 9294fd01d5870e5a817209c7a3923339ea80f298 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:14:16 +0000 Subject: [PATCH 12/33] Bump @react-native-community/netinfo from 11.1.1 to 11.2.0 in /mobile (#990) Bumps [@react-native-community/netinfo](https://github.com/react-native-netinfo/react-native-netinfo) from 11.1.1 to 11.2.0. - [Release notes](https://github.com/react-native-netinfo/react-native-netinfo/releases) - [Changelog](https://github.com/react-native-netinfo/react-native-netinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-native-netinfo/react-native-netinfo/compare/v11.1.1...v11.2.0) --- updated-dependencies: - dependency-name: "@react-native-community/netinfo" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- mobile/package-lock.json | 8 ++++---- mobile/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mobile/package-lock.json b/mobile/package-lock.json index 9d5af4f6..b3d55091 100644 --- a/mobile/package-lock.json +++ b/mobile/package-lock.json @@ -9,7 +9,7 @@ "version": "0.5.3", "dependencies": { "@react-native-clipboard/clipboard": "^1.12.1", - "@react-native-community/netinfo": "^11.1.1", + "@react-native-community/netinfo": "^11.2.0", "react": "18.2.0", "react-native": "^0.71.8", "react-native-encrypted-storage": "^4.0.3", @@ -4096,9 +4096,9 @@ "license": "MIT" }, "node_modules/@react-native-community/netinfo": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-11.1.1.tgz", - "integrity": "sha512-AoIcGL7WeXobSxMUz0ukXXCaQgIReR3xLfZJ/GTd3HN/iceuN6UvqAddfjxgqQWMcb6t2SfrjQnbUPfvattp/A==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-11.2.0.tgz", + "integrity": "sha512-Zpq8/BTBUUI4kito41VUtn/dGQZU1/SCNHvPZkjlUo41Mec38z13ntxeaIC+2LP5Dw0xKpZ/Lql47BZeXk+Ocg==", "peerDependencies": { "react-native": ">=0.59" } diff --git a/mobile/package.json b/mobile/package.json index 1582a438..8e398086 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@react-native-clipboard/clipboard": "^1.12.1", - "@react-native-community/netinfo": "^11.1.1", + "@react-native-community/netinfo": "^11.2.0", "react": "18.2.0", "react-native": "^0.71.8", "react-native-encrypted-storage": "^4.0.3", From 6c1d425fa3dad50e6f1487c97c7d6b4d5ce94a99 Mon Sep 17 00:00:00 2001 From: Tony Nakamoto <103112761+TonyNakamoto@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:15:28 +0700 Subject: [PATCH 13/33] russian translation (#989) * back at it ru.json * Update ru.json * Update ru.json mempool fees made me update Russian language :D --- frontend/static/locales/ru.json | 502 ++++++++++++++++---------------- 1 file changed, 251 insertions(+), 251 deletions(-) diff --git a/frontend/static/locales/ru.json b/frontend/static/locales/ru.json index a44d0f8a..d015b761 100644 --- a/frontend/static/locales/ru.json +++ b/frontend/static/locales/ru.json @@ -1,109 +1,109 @@ { "#1": "Phrases in basic/Main.tsx", - "Using Testnet Bitcoin": "Using Testnet Bitcoin", + "Using Testnet Bitcoin": "Использование тестнет Биткойна", "#2": "Phrases in basic/BookPage/index.tsx", - "Chart": "Схемами", - "Create": "Create", - "List": "List", + "Chart": "График", + "Create": "Создать", + "List": "Список", "Map": "Карта", "#3": "Phrases in basic/MakerPage/index.tsx", - "Existing orders match yours!": "Existing orders match yours!", + "Existing orders match yours!": "Существующие ордеры совпадают с вашими!", "#4": "Phrases in basic/NavBar/MoreTooltip.tsx", - "Community and public support": "Community and public support", - "Coordinator summary": "Coordinator summary", + "Community and public support": "Поддержка сообщества", + "Coordinator summary": "Сводка координатора", "Learn RoboSats": "Изучить RoboSats", - "RoboSats information": "RoboSats information", - "Stats for nerds": "Stats for nerds", + "RoboSats information": "Информация о RoboSats", + "Stats for nerds": "Статистика для умников", "#5": "Phrases in basic/NavBar/NavBar.tsx", - "More": "More", - "Offers": "Offers", + "More": "Больше", + "Offers": "Оферы", "Order": "Ордер", "Robot": "Робот", - "Settings": "Settings", + "Settings": "Настройки", "#6": "Phrases in basic/OrderPage/index.tsx", "Contract": "Контракт", "#7": "Phrases in basic/RobotPage/Onboarding.tsx", - "1. Generate a token": "1. Generate a token", - "2. Meet your robot identity": "2. Meet your robot identity", - "3. Browse or create an order": "3. Browse or create an order", - "Building your robot!": "Building your robot!", - "Continue": "Continue", - "Generate token": "Generate token", - "Hi! My name is": "Hi! My name is", - "If you need help on your RoboSats journey join our public support": "If you need help on your RoboSats journey join our public support", - "RoboSats is a peer-to-peer marketplace. You can browse the public offers or create a new one.": "RoboSats is a peer-to-peer marketplace. You can browse the public offers or create a new one.", - "See profile": "See profile", - "Store it somewhere safe!": "Store it somewhere safe!", - "Telegram group": "Telegram group", + "1. Generate a token": "1. Создайте токен", + "2. Meet your robot identity": "2. Познакомьтесь со своей личностью робота", + "3. Browse or create an order": "3. Просмотрите или создайте заказ", + "Building your robot!": "Постройте своего робота!", + "Continue": "Продолжить", + "Generate token": "Сгенерировать токен", + "Hi! My name is": "Привет! Меня зовут", + "If you need help on your RoboSats journey join our public support": "Если вам нужна помощь в путешествии по RoboSats, присоединяйтесь к поддержке нашего сообщества", + "RoboSats is a peer-to-peer marketplace. You can browse the public offers or create a new one.": "RoboSats — это P2P торговая площадка. Вы можете просматривать публичные предложения или создавать новые.", + "See profile": "Посмотреть профиль", + "Store it somewhere safe!": "Храните его в безопасном месте!", + "Telegram group": "Телеграмм группа", "This is your trading avatar": "Это Ваш торговый аватар", - "This temporary key gives you access to a unique and private robot identity for your trade.": "This temporary key gives you access to a unique and private robot identity for your trade.", - "You can also add your own random characters into the token or": "You can also add your own random characters into the token or", - "or visit the robot school for documentation.": "or visit the robot school for documentation.", - "roll again": "roll again", + "This temporary key gives you access to a unique and private robot identity for your trade.": "Этот временный ключ дает вам доступ к уникальному и личному идентификатору робота для вашей сделки.", + "You can also add your own random characters into the token or": "Вы также можете добавить в токен свои собственные случайные символы или", + "or visit the robot school for documentation.": "или посетить школу роботов для документации.", + "roll again": "ещё раз", "#8": "Phrases in basic/RobotPage/Recovery.tsx", - "Enter your robot token to re-build your robot and gain access to its trades.": "Enter your robot token to re-build your robot and gain access to its trades.", - "Paste token here": "Paste token here", - "Recover": "Recover", - "Robot recovery": "Robot recovery", + "Enter your robot token to re-build your robot and gain access to its trades.": "Введите токен своего робота, чтобы восстанавить своего робота и получить доступ к его сделкам.", + "Paste token here": "Вставте токен сюда", + "Recover": "Восстановить", + "Robot recovery": "Восстановление робота", "#9": "Phrases in basic/RobotPage/RobotProfile.tsx", - "Active order #{{orderID}}": "Active order #{{orderID}}", - "Add Robot": "Add Robot", - "Add a new Robot": "Add a new Robot", - "Building...": "Building...", - "Delete Garage": "Delete Garage", - "Last order #{{orderID}}": "Last order #{{orderID}}", - "Logout": "Logout", - "Reusing trading identity degrades your privacy against other users, coordinators and observers.": "Reusing trading identity degrades your privacy against other users, coordinators and observers.", - "Robot Garage": "Robot Garage", + "Active order #{{orderID}}": "Активный ордер #{{orderID}}", + "Add Robot": "Добавить робота", + "Add a new Robot": "Добавить нового робота", + "Building...": "Строим...", + "Delete Garage": "Удалить гараж", + "Last order #{{orderID}}": "Последний ордер #{{orderID}}", + "Logout": "Выйти", + "Reusing trading identity degrades your privacy against other users, coordinators and observers.": "Повторное использование торговых данных ухудшает вашу конфиденциальность по отношению к другим пользователям, координаторам и наблюдателям.", + "Robot Garage": "Гараж роботов", "Store your token safely": "Храните Ваш токен в безопасности", - "Welcome back!": "Welcome back!", + "Welcome back!": "С возвращением!", "#10": "Phrases in basic/RobotPage/TokenInput.tsx", "Copied!": "Скопировано!", "#11": "Phrases in basic/RobotPage/Welcome.tsx", - "A Simple and Private LN P2P Exchange": "A Simple and Private LN P2P Exchange", - "Create a new robot and learn to use RoboSats": "Create a new robot and learn to use RoboSats", - "Fast Generate Robot": "Fast Generate Robot", - "Recover an existing robot using your token": "Recover an existing robot using your token", - "Recovery": "Recovery", - "Start": "Start", + "A Simple and Private LN P2P Exchange": "Простой и приватный LN P2P обменник", + "Create a new robot and learn to use RoboSats": "Создайте нового робота и научитесь использовать RoboSats", + "Fast Generate Robot": "Быстрое создание робота", + "Recover an existing robot using your token": "Восстановить существующего робота с помощью вашего токена", + "Recovery": "Восстановление", + "Start": "Старт", "#12": "Phrases in basic/RobotPage/index.tsx", - "Connecting to TOR": "Connecting to TOR", - "Connection encrypted and anonymized using TOR.": "Connection encrypted and anonymized using TOR.", - "Not enough entropy, make it more complex": "Not enough entropy, make it more complex", - "The token is too short": "The token is too short", - "This ensures maximum privacy, however you might feel the app behaves slow. If connection is lost, restart the app.": "This ensures maximum privacy, however you might feel the app behaves slow. If connection is lost, restart the app.", + "Connecting to TOR": "Подключение к TOR", + "Connection encrypted and anonymized using TOR.": "Соединение зашифровано и анонимизировано с помощью TOR.", + "Not enough entropy, make it more complex": "Недостаточно энтропии, усложните", + "The token is too short": "Токен слишком короткий", + "This ensures maximum privacy, however you might feel the app behaves slow. If connection is lost, restart the app.": "Это обеспечивает максимальную конфиденциальность, однако вы можете почувствовать, что приложение работает медленно. Если соединение потеряно, перезапустите приложение.", "#13": "Phrases in components/TorConnection.tsx", - "Connected to TOR network": "Connected to TOR network", - "Connecting to TOR network": "Connecting to TOR network", - "Connection error": "Connection error", - "Initializing TOR daemon": "Initializing TOR daemon", + "Connected to TOR network": "Подключено к сети TOR", + "Connecting to TOR network": "Подключение к сети TOR", + "Connection error": "Ошибка подключения", + "Initializing TOR daemon": "Инициализация TOR daemon", "#14": "Phrases in components/BookTable/BookControl.tsx", - "ANY": "Любую валюту", + "ANY": "Любой", "Buy": "Купить", - "DESTINATION": "DESTINATION", + "DESTINATION": "МЕСТО НАЗНАЧЕНИЯ", "I want to": "Я хочу", - "METHOD": "METHOD", + "METHOD": "МЕТОД", "Select Payment Currency": "Выбрать Валюту", - "Select Payment Method": "Select Payment Method", + "Select Payment Method": "Выбрать способ оплаты", "Sell": "Продать", - "Show Lightning swaps": "Show Lightning swaps", - "Swap In": "Swap In", - "Swap Out": "Swap Out", + "Show Lightning swaps": "Показать Лайтнинг свопы", + "Swap In": "Своп в", + "Swap Out": "Своп из", "and use": "и использовать", - "pay with": "pay with", + "pay with": "оплатить", "#15": "Phrases in components/BookTable/index.tsx", "Add filter": "Добавить фильтр", "Amount": "Сумма", "An error occurred.": "Произошла ошибка.", "And": "И", "Be the first one to create an order": "Будьте первым, кто создаст ордер", - "Bond": "Bond", + "Bond": "Залог", "Column title": "Заголовок столбца", "Columns": "Столбцы", "Currency": "Валюта", "Delete": "Удалить", - "Destination": "Destination", - "Expiry": "Expiry", + "Destination": "Место назначения", + "Expiry": "Истечение", "Filter": "Фильтр", "Filter value": "Значение фильтра", "Find column": "Найти столбец", @@ -111,7 +111,7 @@ "Hide all": "Скрыть все", "Is": "Кто", "Logic operator": "Логический оператор", - "Manage columns": "Manage columns", + "Manage columns": "Управление столбцами", "Menu": "Меню", "No orders found to buy BTC for {{currencyCode}}": "Не найдено ордеров на покупку BTC за {{currencyCode}}", "No orders found to sell BTC for {{currencyCode}}": "Не найдено ордеров на продажу BTC за {{currencyCode}}", @@ -125,7 +125,7 @@ "Premium": "Наценка", "Price": "Цена", "Reorder column": "Изменить порядок столбца", - "Sats now": "Sats now", + "Sats now": "Сатох сейчас ", "Select columns": "Выбрать столбцы", "Show all": "Показать все", "Show columns": "Показать столбцы", @@ -133,7 +133,7 @@ "Sort": "Сортировать", "Sort by ASC": "Сортировать по ВОСХ", "Sort by DESC": "Сортировать по НИСХ", - "Timer": "Timer", + "Timer": "Таймер", "Unsort": "Несортировать", "Value": "Значение", "any": "любой", @@ -156,11 +156,11 @@ "yes": "да", "#16": "Phrases in components/Charts/DepthChart/index.tsx", "#17": "Phrases in components/Charts/MapChart/index.tsx", - "Accept": "Accept", - "By doing so, you will be fetching map tiles from a third-party provider. Depending on your setup, private information might be leaked to servers outside the RoboSats federation.": "By doing so, you will be fetching map tiles from a third-party provider. Depending on your setup, private information might be leaked to servers outside the RoboSats federation.", + "Accept": "Принять", + "By doing so, you will be fetching map tiles from a third-party provider. Depending on your setup, private information might be leaked to servers outside the RoboSats federation.": "Поступая таким образом вы будете получать фрагменты карты от стороннего поставщика. В зависимости от ваших настроек личная информация может попасть на серверы за пределами федерации RoboSats.", "Close": "Закрыть", - "Download high resolution map?": "Download high resolution map?", - "Show tiles": "Show tiles", + "Download high resolution map?": "Загрузить карту в высоком разрешении?", + "Show tiles": "Показать карту", "#18": "Phrases in components/Charts/helpers/OrderTooltip/index.tsx", "#19": "Phrases in components/Dialogs/AuditPGP.tsx", "Go back": "Вернуться", @@ -180,37 +180,37 @@ "Your public key": "Ваш публичный ключ", "#20": "Phrases in components/Dialogs/Community.tsx", "Community": "Сообщество", - "Follow RoboSats in Nostr": "Follow RoboSats in Nostr", + "Follow RoboSats in Nostr": "Подпиcаться на RoboSats в Nostr", "Follow RoboSats in Twitter": "Подпиcаться на RoboSats в Twitter", "Github Issues - The Robotic Satoshis Open Source Project": "Github Issues - The Robotic Satoshis проект с открытым исходным кодом", "Join RoboSats English speaking community!": "Присоединиться к англоязычному сообществу RoboSats!", - "Join RoboSats SimpleX group": "Join RoboSats SimpleX group", + "Join RoboSats SimpleX group": "Присоединиться к групе RoboSats на SimpleX", "Join RoboSats Spanish speaking community!": "Присоединиться к испаноязычному сообществу RoboSats!", - "Nostr Official Account": "Nostr Official Account", - "RoboSats in Reddit": "RoboSats в Reddit", - "RoboSats main public support": "RoboSats main public support", - "Support is only offered via SimpleX. Join our community if you have questions or want to hang out with other cool robots. Please, use our Github Issues if you find a bug or want to see new features!": "Support is only offered via SimpleX. Join our community if you have questions or want to hang out with other cool robots. Please, use our Github Issues if you find a bug or want to see new features!", + "Nostr Official Account": " Официальный акаунт Nostr", + "RoboSats in Reddit": "RoboSats на Reddit", + "RoboSats main public support": "Основная общественная поддержка RoboSats", + "Support is only offered via SimpleX. Join our community if you have questions or want to hang out with other cool robots. Please, use our Github Issues if you find a bug or want to see new features!": "Поддержка предоставляется только через SimpleX. Присоединяйтесь к нашему сообществу, если у вас есть вопросы или вы хотите пообщаться с другими крутыми роботами. Пожалуйста, воспользуйтесь нашим Github issues, если вы обнаружили ошибку или хотите увидеть новые функции!", "Tell us about a new feature or a bug": "Расскажите нам о новой функции или ошибке", "Twitter Official Account": "Официальный аккаунт в Twitter", - "We are abandoning Telegram! Our old TG groups": "We are abandoning Telegram! Our old TG groups", + "We are abandoning Telegram! Our old TG groups": "Мы отказываемся от Telegram! Наши старые группы ТГ", "#21": "Phrases in components/Dialogs/CoordinatorSummary.tsx", "Book liquidity": "Ликвидность книги ордеров", - "Coordinator Summary": "Coordinator Summary", + "Coordinator Summary": "Описание координатора", "Current onchain payout fee": "Текущая комиссия за выплату ончейн", - "Last 24h mean premium": "Last 24h mean premium", + "Last 24h mean premium": "Средняя наценка за последние 24 часа", "Maker fee": "Комиссия мейкера", "Public buy orders": "Ордера на покупку", "Public sell orders": "Ордера на продажу", "Taker fee": "Комиссия тейкера", "Today active robots": "Сегодня активных роботов", "#22": "Phrases in components/Dialogs/EnableTelegram.tsx", - "Browser": "Browser", + "Browser": "Браузер", "Enable": "Включить", "Enable TG Notifications": "Включить уведомления TG", "You will be taken to a conversation with RoboSats telegram bot. Simply open the chat and press Start. Note that by enabling telegram notifications you might lower your level of anonymity.": "Вы перейдёте к разговору с Telegram ботом RoboSats. Просто откройте чат и нажмите Старт. Обратите внимание, что включив уведомления Telegram, Вы можете снизить уровень анонимности.", "#23": "Phrases in components/Dialogs/F2fMap.tsx", - "Choose a location": "Choose a location", - "Save": "Save", + "Choose a location": "Выберите местоположение", + "Save": "Сохранить", "#24": "Phrases in components/Dialogs/Info.tsx", "(GitHub).": "(GitHub).", "(Telegram)": "(Telegram)", @@ -218,7 +218,7 @@ "All of them as long as they are fast. You can write down your preferred payment method(s). You will have to match with a peer who also accepts that method. The step to exchange fiat has a expiry time of 24 hours before a dispute is automatically open. We highly recommend using instant fiat payment rails.": "Все, если они быстрые. Вы можете записать свой предпочитаемый способ(ы) оплаты. Ваш метод оплаты должен совпасть с методом оплаты Вашего партнёра. Этап по обмену фиатной валюты составляет 24 часа, перед тем как автоматически откроется диспут. Мы настоятельно рекомендуем использовать мгновенные фиатные платёжные системы.", "Are there trade limits?": "Существуют ли ограничения торговли?", "At no point, AnonymousAlice01 and BafflingBob02 have to entrust the bitcoin funds to each other. In case they have a conflict, RoboSats staff will help resolving the dispute.": "Алиса01 и Боб02 не доверяют Биткойн средства друг другу ни на каком из этапов сделки. В случае возникновения конфликта персонал RoboSats поможет разрешить диспут.", - "Be aware your fiat payment provider might charge extra fees. In any case, the buyer bears the costs of sending fiat. That includes banking charges, transfer fees and foreign exchange spreads. The seller must receive exactly the amount stated in the order details.": "Be aware your fiat payment provider might charge extra fees. In any case, the buyer bears the costs of sending fiat. That includes banking charges, transfer fees and foreign exchange spreads. The seller must receive exactly the amount stated in the order details.", + "Be aware your fiat payment provider might charge extra fees. In any case, the buyer bears the costs of sending fiat. That includes banking charges, transfer fees and foreign exchange spreads. The seller must receive exactly the amount stated in the order details.": "Имейте в виду, что ваш поставщик фиатных платежей может взимать дополнительную комиссию. В любом случае расходы по отправке фиата несет покупатель. Сюда входят банковские сборы, комиссии за перевод и разница курсов валют. Продавец должен получить ровно ту сумму, которая указана в деталях ордера.", "Disclaimer": "Дисклеймер", "How does it work?": "Как это работает?", "How it works": "Как это работает", @@ -231,12 +231,12 @@ "Maximum single trade size is {{maxAmount}} Satoshis to minimize lightning routing failure. There is no limits to the number of trades per day. A robot can only have one order at a time. However, you can use multiple robots simultaneously in different browsers (remember to back up your robot tokens!).": "Максимальный размер одной сделки составляет {{maxAmount}} Сатоши, чтобы свести к минимуму сбои Lightning раутинга. Количество сделок в день не ограничено. Робот может иметь только один ордер за раз. Однако Вы можете использовать несколько роботов одновременно в разных браузерах (не забудьте сделать резервную копию токенов робота!).", "Project source code": "Исходный код проекта", "RoboSats is an open source project ": "RoboSats — это проект с открытым исходным кодом.", - "RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee.": "RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee.", + "RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee.": "Общая комиссия RoboSats за заказ составляет {{tradeFee}}%. Эта комиссия делится между: и создателем ордера ({{makerFee}}%), и получателем ордера ({{takerFee}}%). В случае, если для получения Сатох используется ончейн-адрес, взимается переменная комиссия за своп. Проверьте детали обмена, нажав на значок нижней панели, чтобы увидеть текущую комиссию за своп.", "RoboSats will never ask you for your name, country or ID. RoboSats does not custody your funds and does not care who you are. RoboSats does not collect or custody any personal data. For best anonymity use Tor Browser and access the .onion hidden service.": "RoboSats никогда не спросит Ваше имя, страну или идентификацию личности. RoboSats не хранит Ваши средства и не заботится о том, кто Вы. RoboSats не собирает и не хранит никаких личных данных. Для максимальной анонимности используйте браузер Tor и доступ к скрытому сервису .onion.", "The seller faces the same charge-back risk as with any other peer-to-peer service. Paypal or credit cards are not recommended.": "Продавец сталкивается с тем же риском возврата платежа, что и в случае с любым другим P2P сервисом. Paypal или кредитные карты не рекомендуются.", "This is an experimental application, things could go wrong. Trade small amounts!": "Это экспериментальное приложение, что-то может пойти не так. Торгуйте небольшими суммами!", "This lightning application is provided as is. It is in active development: trade with the utmost caution. There is no private support. Support is only offered via public channels ": "Это приложение Lightning предоставляется как есть. Оно находится в активной разработке: торгуйте с максимальной осторожностью. Частной поддержки нет. Поддержка предлагается только по публичным каналам ", - "What are the fees?": "What are the fees?", + "What are the fees?": "Какова кописсия?", "What are the risks?": "Каковы риски?", "What happens if RoboSats suddenly disappears?": "Что произойдёт, если RoboSats внезапно исчезнет?", "What is RoboSats?": "Что такое RoboSats?", @@ -252,14 +252,14 @@ "You are about to visit Learn RoboSats. It hosts tutorials and documentation to help you learn how to use RoboSats and understand how it works.": "Вы собираетесь посетить Learn RoboSats. На нём размещены учебные пособия и документация, которые помогут Вам научиться использовать RoboSats и понять, как он работает.", "#26": "Phrases in components/Dialogs/NoRobot.tsx", "Generate Robot": "Создать Робота", - "Generate a robot avatar first. Then create your own order.": "Generate a robot avatar first. Then create your own order.", + "Generate a robot avatar first. Then create your own order.": "Сначала создайте аватар робота. Затем создайте свой ордер.", "You do not have a robot avatar": "У Вас нет аватара робота", "#27": "Phrases in components/Dialogs/Notice.tsx", - "Coordinator Notice": "Coordinator Notice", + "Coordinator Notice": "Уведомление координатора", "#28": "Phrases in components/Dialogs/Profile.tsx", "Claim": "Запросить", "Enable Telegram Notifications": "Включить уведомления Telegram", - "Generate with Webln": "Generate with Webln", + "Generate with Webln": "Генерировать с помощью Webln", "Inactive order": "Неактивный ордер", "Invoice for {{amountSats}} Sats": "Инвойс на {{amountSats}} Сатоши", "No active orders": "Нет активных ордеров", @@ -269,7 +269,7 @@ "There it goes, thank you!🥇": "Вот так вот, спасибо!🥇", "Use stealth invoices": "Использовать стелс инвойсы", "You do not have previous orders": "У Вас нет предыдущих ордеров", - "Your Robot": "Your Robot", + "Your Robot": "Ваш Robot", "Your current order": "Ваш текущий ордер", "Your earned rewards": "Ваши заработанные награды", "Your last order #{{orderID}}": "Ваш последний ордер #{{orderID}}", @@ -277,15 +277,15 @@ "#29": "Phrases in components/Dialogs/Stats.tsx", "... somewhere on Earth!": "... где-то на земле!", "24h contracted volume": "Объём контрактов за 24 часа", - "CLN version": "CLN version", - "Client": "Client", - "Coordinator": "Coordinator", - "Coordinator commit hash": "Coordinator commit hash", - "LN Node": "LN Node", + "CLN version": "CLN верися", + "Client": "Клиент", + "Coordinator": "Координатор", + "Coordinator commit hash": "Хеш коммита координатора", + "LN Node": "LN Нода", "LND version": "LND версия", "Lifetime contracted volume": "Объём контрактов за всё время", "Made with": "Сделано с", - "RoboSats version": "RoboSats version", + "RoboSats version": "Версия RoboSats", "Stats For Nerds": "Cтатистика для умников", "and": "и", "#30": "Phrases in components/Dialogs/StoreToken.tsx", @@ -294,17 +294,17 @@ "Store your robot token": "Сохранить токен робота", "You might need to recover your robot avatar in the future: store it safely. You can simply copy it into another application.": "В будущем Вам может понадобиться восстановить аватар робота: сохраните его в безопасном месте. Вы можете просто скопировать его в другое приложение.", "#31": "Phrases in components/Dialogs/UpdateClient.tsx", - "Download RoboSats {{coordinatorVersion}} APK from Github releases": "Download RoboSats {{coordinatorVersion}} APK from Github releases", - "Go away!": "Go away!", - "On Android RoboSats app ": "On Android RoboSats app ", - "On Tor Browser client simply refresh your tab (click here or press Ctrl+Shift+R)": "On Tor Browser client simply refresh your tab (click here or press Ctrl+Shift+R)", - "On remotely served browser client": "On remotely served browser client", - "On your own soverign node": "On your own soverign node", - "The RoboSats coordinator is on version {{coordinatorVersion}}, but your client app is {{clientVersion}}. This version mismatch might lead to a bad user experience.": "The RoboSats coordinator is on version {{coordinatorVersion}}, but your client app is {{clientVersion}}. This version mismatch might lead to a bad user experience.", - "Update your RoboSats client": "Update your RoboSats client", + "Download RoboSats {{coordinatorVersion}} APK from Github releases": "Скачать RoboSats {{coordinatorVersion}} APK из Github releases", + "Go away!": "Уходите!", + "On Android RoboSats app ": "На Android RoboSats апликации ", + "On Tor Browser client simply refresh your tab (click here or press Ctrl+Shift+R)": "В клиенте Tor Browser просто обновите вкладку (нажмите здесь или нажмите Ctrl+Shift+R).", + "On remotely served browser client": "На удаленно обслуживаемом клиенте браузера", + "On your own soverign node": "На вашем собственном суверенном ноде", + "The RoboSats coordinator is on version {{coordinatorVersion}}, but your client app is {{clientVersion}}. This version mismatch might lead to a bad user experience.": "Версия координатора RoboSats {{coordinatorVersion}}, но ваше клиентское приложение — {{clientVersion}}. Это несоответствие версий может привести к ухудшению пользовательского опыта.", + "Update your RoboSats client": "Обновите свой клиент RoboSats", "#32": "Phrases in components/HostAlert/SelfhostedAlert.tsx", - "RoboSats client is served from your own node granting you the strongest security and privacy.": "RoboSats client is served from your own node granting you the strongest security and privacy.", - "You are self-hosting RoboSats": "You are self-hosting RoboSats", + "RoboSats client is served from your own node granting you the strongest security and privacy.": "Клиент RoboSats обслуживается с вашего собственного нода, что обеспечивает максимальную безопасность и конфиденциальность.", + "You are self-hosting RoboSats": "Вы самостоятельно размещаете RoboSats", "#33": "Phrases in components/HostAlert/UnsafeAlert.tsx", "You are not using RoboSats privately": "Вы не используете RoboSats приватно", "#34": "Phrases in components/MakerForm/AmountRange.tsx", @@ -313,103 +313,103 @@ "#35": "Phrases in components/MakerForm/MakerForm.tsx", " at a {{discount}}% discount": " со скидкой {{discount}}%", " at a {{premium}}% premium": " с наценкой {{premium}}%", - " at market price": " at market price", + " at market price": " по рыночной цене", " of {{satoshis}} Satoshis": " {{satoshis}} Сатоши", "Add New": "Добавить новый", - "Add geolocation for a face to face trade": "Add geolocation for a face to face trade", - "Amount Range": "Amount Range", - "Amount of BTC to swap for LN Sats": "Amount of BTC to swap for LN Sats", + "Add geolocation for a face to face trade": "Добавьте геолокацию для торговли лицом к лицу", + "Amount Range": "Диапазон сумм", + "Amount of BTC to swap for LN Sats": "Сумма BTC для обмена на LN Сатоши", "Amount of fiat to exchange for bitcoin": "Количество фиата для обмена на Биткойн", - "Buy BTC for ": "Buy BTC for ", + "Buy BTC for ": "Купить BTC за ", "Buy or Sell Bitcoin?": "Купить или Продать Биткойн?", "Choose a Pricing Method": "Выберите метод расчёта цен", - "Clear form": "Clear form", - "Edit order": "Edit order", - "Enable advanced options": "Enable advanced options", - "Enter the destination of the Lightning swap": "Enter the destination of the Lightning swap", - "Escrow/Invoice Timer (HH:mm)": "Escrow/Invoice Timer (HH:mm)", - "Escrow/invoice step length": "Escrow/invoice step length", - "Exact": "Exact", - "Exact Amount": "Exact Amount", - "Face to Face Location": "Face to Face Location", + "Clear form": "Очистить форму", + "Edit order": "Изменить ордер", + "Enable advanced options": "Включить дополнительные параметры", + "Enter the destination of the Lightning swap": "Введите пункт назначения обмена Lightning", + "Escrow/Invoice Timer (HH:mm)": "Таймер эскроу/инвойса (ЧЧ:мм)", + "Escrow/invoice step length": "Длина шага эскроу/инвойса", + "Exact": "Точно", + "Exact Amount": "Точное количество", + "Face to Face Location": "Место встречи лицом к лицу", "Fiat Payment Method(s)": "Способ(ы) оплаты", "Fidelity Bond Size": "Размер залога", - "In or Out of Lightning?": "In or Out of Lightning?", + "In or Out of Lightning?": "В или из Lightning?", "Let the price move with the market": "Пусть цена движется вместе с рынком", - "Must be less than {{maxAmount}}": "Must be less than {{maxAmount}}", - "Must be less than {{maxSats}": "Должно быть меньше чем {{maxSats}}", - "Must be less than {{max}}%": "Должно быть меньше чем {{max}}%", - "Must be more than {{minAmount}}": "Must be more than {{minAmount}}", - "Must be more than {{minSats}}": "Должно быть больше чем {{minSats}}", - "Must be more than {{min}}%": "Должно быть больше чем {{min}}%", + "Must be less than {{maxAmount}}": "Должна быть меньше чем {{maxAmount}}", + "Must be less than {{maxSats}": "Должна быть меньше чем {{maxSats}}", + "Must be less than {{max}}%": "Должна быть меньше чем {{max}}%", + "Must be more than {{minAmount}}": "Должна быть больше чем {{minAmount}}", + "Must be more than {{minSats}}": "Должна быть больше чем {{minSats}}", + "Must be more than {{min}}%": "Должна быть больше чем {{min}}%", "Must be shorter than 65 characters": "Должно быть короче 65и символов", - "Onchain amount to receive (BTC)": "Onchain amount to receive (BTC)", - "Onchain amount to send (BTC)": "Onchain amount to send (BTC)", + "Onchain amount to receive (BTC)": "Сумма для получения на ончейн (BTC)", + "Onchain amount to send (BTC)": "Сумма для отправки на ончейн (BTC)", "Order current rate:": "Текущий курс ордера:", - "Order for ": "Order for ", - "Order rate:": "Order rate:", + "Order for ": "Ордер на ", + "Order rate:": "Ставка ордера:", "Premium over Market (%)": "Наценка по сравнению с рынком (%)", "Public Duration (HH:mm)": "Публичная продолжительность (ЧЧ: мм)", - "Public order length": "Public order length", + "Public order length": "Длина общественного ордера", "Relative": "Относительный", "Satoshis": "Сатоши", - "Sell BTC for ": "Sell BTC for ", + "Sell BTC for ": "Продать BTC за ", "Set a fix amount of satoshis": "Установить фиксированное количество Сатоши", "Set the skin-in-the-game, increase for higher safety assurance": "Установите залог, увеличьте для большей безопасности.", "Swap Destination(s)": "Поменять место(а) назначения", - "Swap into LN ": "Swap into LN ", - "Swap of ": "Swap of ", - "Swap out of LN ": "Swap out of LN ", - "Swap?": "Swap?", - "To protect your privacy, the exact location you pin will be slightly randomized.": "To protect your privacy, the exact location you pin will be slightly randomized.", - "You can add new methods": "You can add new methods", - "You must fill the form correctly": "You must fill the form correctly", - "You receive approx {{swapSats}} LN Sats (fees might vary)": "You receive approx {{swapSats}} LN Sats (fees might vary)", - "You send approx {{swapSats}} LN Sats (fees might vary)": "You send approx {{swapSats}} LN Sats (fees might vary)", + "Swap into LN ": "Обмен на LN ", + "Swap of ": "Обмен ", + "Swap out of LN ": "Обмен из LN ", + "Swap?": "Менять?", + "To protect your privacy, the exact location you pin will be slightly randomized.": "Чтобы защитить вашу конфиденциальность, точное местоположение, которое вы закрепите, будет слегка рандомизировано.", + "You can add new methods": "Вы можете добавить новые методы", + "You must fill the form correctly": "Вы должны правильно заполнить форму", + "You receive approx {{swapSats}} LN Sats (fees might vary)": "Вы получаете примерно {{swapSats}} LN Sats (комиссия может различаться)", + "You send approx {{swapSats}} LN Sats (fees might vary)": "Вы отправляете примерно {{swapSats}} спутников LN (комиссия может различаться)", "Your order fixed exchange rate": "Фиксированный курс обмена Вашего ордера", "#36": "Phrases in components/Notifications/index.tsx", - "Lightning routing failed": "Lightning routing failed", - "New chat message": "New chat message", - "Order chat is open": "Order chat is open", - "Order has been disputed": "Order has been disputed", - "Order has been taken!": "Order has been taken!", - "Order has expired": "Order has expired", - "RoboSats - Simple and Private Bitcoin Exchange": "RoboSats - Simple and Private Bitcoin Exchange", - "Trade finished successfully!": "Trade finished successfully!", - "You can claim Sats!": "You can claim Sats!", - "You lost the dispute": "You lost the dispute", - "You won the dispute": "You won the dispute", - "₿ Rewards!": "₿ Rewards!", - "⚖️ Disputed!": "⚖️ Disputed!", - "✅ Bond!": "✅ Bond!", - "✅ Escrow!": "✅ Escrow!", - "❗⚡ Routing Failed": "❗⚡ Routing Failed", - "👍 dispute": "👍 dispute", - "👎 dispute": "👎 dispute", - "💬 Chat!": "💬 Chat!", - "💬 message!": "💬 message!", - "😪 Expired!": "😪 Expired!", - "🙌 Funished!": "🙌 Funished!", - "🥳 Taken!": "🥳 Taken!", + "Lightning routing failed": "Маршрутизация Lightning не удалась", + "New chat message": "Новое сообщение в чате", + "Order chat is open": "Чат ордера открыт", + "Order has been disputed": "Ордер оспорен", + "Order has been taken!": "Ордер был взят!", + "Order has expired": "Ордер истёк", + "RoboSats - Simple and Private Bitcoin Exchange": "RoboSats — простая и приватная биржа биткойнов", + "Trade finished successfully!": "Торговля завершилась успешно!", + "You can claim Sats!": "Вы можете заклеймить Сатоши!", + "You lost the dispute": "Вы проиграли диспут", + "You won the dispute": "Вы выиграли диспут", + "₿ Rewards!": "₿ Награды!", + "⚖️ Disputed!": "⚖️ Оспаривается!", + "✅ Bond!": "✅ Залог!", + "✅ Escrow!": "✅ Эскроу!", + "❗⚡ Routing Failed": "❗⚡ Маршрутизация не удалась", + "👍 dispute": "👍 диспут", + "👎 dispute": "👎 диспут", + "💬 Chat!": "💬 Чат!", + "💬 message!": "💬 сообщение!", + "😪 Expired!": "😪 Истёк!", + "🙌 Funished!": "🙌 Запершён!", + "🥳 Taken!": "🥳 Взят!", "#37": "Phrases in components/OrderDetails/TakeButton.tsx", "Amount {{currencyCode}}": "Сумма {{currencyCode}}", "By taking this order you risk wasting your time. If the maker does not proceed in time, you will be compensated in satoshis for 50% of the maker bond.": "Взяв этот ордер, Вы рискуете потратить своё время впустую. Если мейкер не появится вовремя, Вы получите компенсацию в Сатоши в размере 50% от залога мейкера", "Enter amount of fiat to exchange for bitcoin": "Введите количество фиата для обмена на Биткойн", - "Sounds fine": "Sounds fine", + "Sounds fine": "Звучит неплохо", "Take Order": "Взять ордер", "The maker is away": "Мейкера нет на месте", "Too high": "Слишком много", "Too low": "Слишком мало", "Wait until you can take an order": "Подождите, пока Вы сможете взять ордер", "You must specify an amount first": "Сначала необходимо указать сумму", - "You will receive {{satoshis}} Sats (Approx)": "You will receive {{satoshis}} Sats (Approx)", - "You will send {{satoshis}} Sats (Approx)": "You will send {{satoshis}} Sats (Approx)", + "You will receive {{satoshis}} Sats (Approx)": "Вы получите {{satoshis}} Сатоши (приблизительно)", + "You will send {{satoshis}} Sats (Approx)": "Вы отправите {{satoshis}} Сатоши (приблизительно)", "#38": "Phrases in components/OrderDetails/index.tsx", "Accepted payment methods": "Способ(ы) оплаты", "Amount of Satoshis": "Количество Сатоши", "Deposit timer": "Таймер депозита", "Expires in": "Истекает через", - "F2F location": "F2F location", + "F2F location": "F2F локация", "Order Details": "Детали ордера", "Order ID": "ID ордера", "Order maker": "Мейкер ордера", @@ -420,25 +420,25 @@ "Price and Premium": "Цена и Наценка", "Swap destination": "Поменять место назначения", "The order has expired": "Срок действия ордера истёк", - "The pinned location is approximate. The exact location for the meeting place must be exchanged in the encrypted chat.": "The pinned location is approximate. The exact location for the meeting place must be exchanged in the encrypted chat.", + "The pinned location is approximate. The exact location for the meeting place must be exchanged in the encrypted chat.": "Закрепленное местоположение является приблизительным. Точное местоположение места встречи необходимо сообщить в зашифрованном чате.", "You cannot take an order yet! Wait {{timeMin}}m {{timeSec}}s": "Вы ещё не можете взять ордер! Подождите {{timeMin}}м {{timeSec}}с", - "You receive via Lightning {{amount}} Sats (Approx)": "You receive via Lightning {{amount}} Sats (Approx)", - "You receive via {{method}} {{amount}}": "You receive via {{method}} {{amount}}", - "You send via Lightning {{amount}} Sats (Approx)": "You send via Lightning {{amount}} Sats (Approx)", - "You send via {{method}} {{amount}}": "You send via {{method}} {{amount}}", + "You receive via Lightning {{amount}} Sats (Approx)": "Вы получаете через Lightning {{amount}} Сатоши (приблизительно)", + "You receive via {{method}} {{amount}}": "Вы получаете через {{method}} {{amount}}", + "You send via Lightning {{amount}} Sats (Approx)": "Вы отправляете через Lightning {{amount}} Сатоши (приблизительно)", + "You send via {{method}} {{amount}}": "Вы отправляете через {{method}} {{amount}}", "{{price}} {{currencyCode}}/BTC - Premium: {{premium}}%": "{{price}} {{currencyCode}}/BTC - Наценка: {{premium}}%", "#39": "Phrases in components/SettingsForm/index.tsx", - "Dark": "Dark", - "Fiat": "Fiat", - "Light": "Light", - "Mainnet": "Mainnet", - "Swaps": "Swaps", - "Testnet": "Testnet", + "Dark": "Темный", + "Fiat": "Фиат", + "Light": "Светлый", + "Mainnet": "Основная сеть", + "Swaps": "Обмен", + "Testnet": "Тестовая сеть", "#40": "Phrases in components/TradeBox/CancelButton.tsx", "Cancel": "Отменить", - "Cancel order and unlock bond instantly": "Cancel order and unlock bond instantly", + "Cancel order and unlock bond instantly": "Отменить ордер и мгновенно разблокировать залог", "Collaborative Cancel": "Совместная отмена", - "Unilateral cancelation (bond at risk!)": "Unilateral cancelation (bond at risk!)", + "Unilateral cancelation (bond at risk!)": "Одностороннее аннулирование (залог под угрозой!)", "#41": "Phrases in components/TradeBox/CollabCancelAlert.tsx", "You asked for a collaborative cancellation": "Вы запросили совместную отмену", "{{nickname}} is asking for a collaborative cancel": "{{nickname}} запрашивает совместную отмену", @@ -446,14 +446,14 @@ "Buyer": "Покупатель", "Completed in": "Завершено за", "Contract exchange rate": "Курс обмена контракта", - "Coordinator trade revenue": "Coordinator trade revenue", - "Export trade summary": "Export trade summary", + "Coordinator trade revenue": "Доход координатора сделки", + "Export trade summary": "Экспортировать сводку торговли", "Maker": "Мейкер", "Maker bond": "Залог мейкера", "Mining fee": "Комиссия майнерам", - "Onchain swap fee": "Комиссия за ончйн своп", + "Onchain swap fee": "Комиссия за ончйн обмен", "Received": "Получено", - "Routing budget": "Routing budget", + "Routing budget": "Бюджет маршрутизации", "Seller": "Продавец", "Sent": "Отправлено", "Taker": "Тейкер", @@ -475,11 +475,11 @@ "Confirm Cancel": "Подтвердить отмену", "If the order is cancelled now you will lose your bond.": "Если ордер будет отменён сейчас, Вы потеряете залог.", "#45": "Phrases in components/TradeBox/Dialogs/ConfirmCollabCancel.tsx", - "Accept Cancelation": "Accept Cancelation", + "Accept Cancelation": "Принять отмену", "Ask for Cancel": "Запросить отмену", "Collaborative cancel the order?": "Совместно отменить ордер?", "The trade escrow has been posted. The order can be cancelled only if both, maker and taker, agree to cancel.": "Эскроу сделки был опубликован. Ордер может быть отменен только в том случае, если оба, мейкер и тейкер, согласны на отмену.", - "Your peer has asked for cancellation": "Your peer has asked for cancellation", + "Your peer has asked for cancellation": "Ваш партнёр запросил отмену", "#46": "Phrases in components/TradeBox/Dialogs/ConfirmDispute.tsx", "Agree and open dispute": "Согласиться и открыть диспут", "Disagree": "Не согласиться", @@ -489,17 +489,17 @@ "#47": "Phrases in components/TradeBox/Dialogs/ConfirmFiatReceived.tsx", "Confirm": "Подтвердить", "Confirm you received {{amount}} {{currencyCode}}?": "Подтвердить получение {{amount}} {{currencyCode}}?", - "Confirming that you received {{amount}} {{currencyCode}} will finalize the trade. The satoshis in the escrow will be released to the buyer. Only confirm after {{amount}} {{currencyCode}} have arrived to your account. Note that if you have received the payment and do not click confirm, you risk losing your bond.": "Confirming that you received {{amount}} {{currencyCode}} will finalize the trade. The satoshis in the escrow will be released to the buyer. Only confirm after {{amount}} {{currencyCode}} have arrived to your account. Note that if you have received the payment and do not click confirm, you risk losing your bond.", + "Confirming that you received {{amount}} {{currencyCode}} will finalize the trade. The satoshis in the escrow will be released to the buyer. Only confirm after {{amount}} {{currencyCode}} have arrived to your account. Note that if you have received the payment and do not click confirm, you risk losing your bond.": "Подтвердив, что вы получили {{amount}} {{currencyCode}}, сделка будет завершена. Сатоши на эскроу будут переданы покупателю. Подтверждайте только после того, как {{amount}} {{currencyCode}} поступит на ваш счёт. Обратите внимание: если вы получили платеж и не нажали «Подтвердить», вы рискуете потерять залог.", "#48": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx", - "Confirm you sent {{amount}} {{currencyCode}}?": "Confirm you sent {{amount}} {{currencyCode}}?", - "Confirming that you sent {{amount}} {{currencyCode}} will allow your peer to finalize the trade. If you have not yet sent it and you still proceed to falsely confirm, you risk losing your bond.": "Confirming that you sent {{amount}} {{currencyCode}} will allow your peer to finalize the trade. If you have not yet sent it and you still proceed to falsely confirm, you risk losing your bond.", + "Confirm you sent {{amount}} {{currencyCode}}?": "Подтвердите, что отправили {{amount}} {{currencyCode}}?", + "Confirming that you sent {{amount}} {{currencyCode}} will allow your peer to finalize the trade. If you have not yet sent it and you still proceed to falsely confirm, you risk losing your bond.": "Подтверждение того, что вы отправили {{amount}} {{currencyCode}}, позволит вашему партнеру завершить сделку. Если вы ещё не отправили его и все равно продолжите ложное подтверждение, вы рискуете потерять залог.", "#49": "Phrases in components/TradeBox/Dialogs/ConfirmUndoFiatSent.tsx", - "READ. In case your payment to the seller has been blocked and it is absolutely impossible to finish the trade, you can revert your confirmation of \"Fiat sent\". Do so only if you and the seller have ALREADY AGREED in the chat to proceed to a collaborative cancellation. After confirming, the \"Collaborative cancel\" button will be visible again. Only click this button if you know what you are doing. First time users of RoboSats are highly discouraged from performing this action! Make 100% sure your payment has failed and the amount is in your account.": "READ. In case your payment to the seller has been blocked and it is absolutely impossible to finish the trade, you can revert your confirmation of \"Fiat sent\". Do so only if you and the seller have ALREADY AGREED in the chat to proceed to a collaborative cancellation. After confirming, the \"Collaborative cancel\" button will be visible again. Only click this button if you know what you are doing. First time users of RoboSats are highly discouraged from performing this action! Make 100% sure your payment has failed and the amount is in your account.", - "Revert the confirmation of fiat sent?": "Revert the confirmation of fiat sent?", - "Wait ({{time}})": "Wait ({{time}})", + "READ. In case your payment to the seller has been blocked and it is absolutely impossible to finish the trade, you can revert your confirmation of \"Fiat sent\". Do so only if you and the seller have ALREADY AGREED in the chat to proceed to a collaborative cancellation. After confirming, the \"Collaborative cancel\" button will be visible again. Only click this button if you know what you are doing. First time users of RoboSats are highly discouraged from performing this action! Make 100% sure your payment has failed and the amount is in your account.": "ЧИТАЙТЕ. В случае, если ваш платёж продавцу заблокирован и завершить сделку абсолютно невозможно, вы можете отменить подтверждение \"Fiat sent\". Делайте это только в том случае, если вы и продавец УЖЕ ДОГОВОРИЛИСЬ в чате о совместной отмене. После подтверждения кнопка \"Collaborative cancel\" снова станет видна. Нажимайте эту кнопку только в том случае, если вы знаете, что делаете. Пользователям впервые использующим RoboSats, крайне не рекомендуется выполнять это действие! Убедитесь на 100 %, что ваш платёж не прошел и сумма поступила на ваш счет.", + "Revert the confirmation of fiat sent?": "Отменить подтверждение отправленного распоряжения?", + "Wait ({{time}})": "Ждать ({{time}})", "#50": "Phrases in components/TradeBox/Dialogs/WebLN.tsx", - "Amount not yet locked, please check your WebLN wallet.": "Amount not yet locked, please check your WebLN wallet.", - "Invoice not received, please check your WebLN wallet.": "Платёж не получен. Пожалуйста, проверьте Ваш WebLN Кошелёк.", + "Amount not yet locked, please check your WebLN wallet.": "Сумма еще не заблокирована, проверьте свой кошелёк WebLN.", + "Invoice not received, please check your WebLN wallet.": "Платёж не получен. Пожалуйста, проверьте Ваш WebLN кошелёк.", "WebLN": "WebLN", "You can close now your WebLN wallet popup.": "Вы можете закрыть всплывающее окно WebLN Кошелька", "#51": "Phrases in components/TradeBox/EncryptedChat/ChatBottom/index.tsx", @@ -508,8 +508,8 @@ "Save full log as a JSON file (messages and credentials)": "Сохранить все логи в виде JSON файла (сообщения и учётные данные)", "Verify your privacy": "Проверьте свою конфиденциальность", "#52": "Phrases in components/TradeBox/EncryptedChat/ChatHeader/index.tsx", - "...waiting": "...waiting", - "Activate slow mode (use it when the connection is slow)": "Activate slow mode (use it when the connection is slow)", + "...waiting": "...ожидание", + "Activate slow mode (use it when the connection is slow)": "Активировать медленный режим (используйте его, когда соединение медленное)", "Peer": "Партнёр", "You": "Вы", "connected": "подключен", @@ -518,38 +518,38 @@ "Connecting...": "Подключаем...", "Send": "Отправить", "Type a message": "Введите сообщение", - "Waiting for peer public key...": "Waiting for peer public key...", + "Waiting for peer public key...": "Ожидание публичного ключа партнёра...", "#54": "Phrases in components/TradeBox/EncryptedChat/EncryptedTurtleChat/index.tsx", "#55": "Phrases in components/TradeBox/EncryptedChat/MessageCard/index.tsx", "#56": "Phrases in components/TradeBox/Forms/Dispute.tsx", - "Attach chat logs": "Attach chat logs", - "Attaching chat logs helps the dispute resolution process and adds transparency. However, it might compromise your privacy.": "Attaching chat logs helps the dispute resolution process and adds transparency. However, it might compromise your privacy.", + "Attach chat logs": "Прикрепите журналы чата", + "Attaching chat logs helps the dispute resolution process and adds transparency. However, it might compromise your privacy.": "Прикрепление журналов чата помогает процессу разрешения споров и повышает прозрачность. Однако это может поставить под угрозу вашу конфиденциальность.", "Submit dispute statement": "Отправить заявление о диспуте", "#57": "Phrases in components/TradeBox/Forms/LightningPayout.tsx", - "Advanced options": "Advanced options", - "Invoice to wrap": "Invoice to wrap", + "Advanced options": "Расширенные настройки", + "Invoice to wrap": "Обернуть инвойс", "Payout Lightning Invoice": "Счет на выплату Лайтнинг", - "Proxy Budget": "Proxy Budget", - "Routing Budget": "Routing Budget", - "Server": "Server", - "Submit invoice for {{amountSats}} Sats": "Submit invoice for {{amountSats}} Sats", - "Use Lnproxy": "Use Lnproxy", - "Wrap": "Wrap", - "Wrapped invoice": "Wrapped invoice", + "Proxy Budget": "Прокси-бюджет", + "Routing Budget": "Бюджет маршрутизации", + "Server": "Сервер", + "Submit invoice for {{amountSats}} Sats": "Отправьте счет на {{amountSats}} Сатоши", + "Use Lnproxy": "Использовать Lnproxy", + "Wrap": "Обернуть", + "Wrapped invoice": "Обернутый инвойс", "#58": "Phrases in components/TradeBox/Forms/OnchainPayout.tsx", "Bitcoin Address": "Биткойн Адрес", "Final amount you will receive": "Окончательная сумма, которую Вы получите", "Invalid": "Неверно", "Mining Fee": "Комиссия Майнерам", - "RoboSats coordinator will do a swap and send the Sats to your onchain address.": "RoboSats coordinator will do a swap and send the Sats to your onchain address.", - "Swap fee": "Комиссия за своп", + "RoboSats coordinator will do a swap and send the Sats to your onchain address.": "Координатор RoboSats выполнит своп и отправит Сатоши на ваш ончейн адрес.", + "Swap fee": "Комиссия за обмен", "#59": "Phrases in components/TradeBox/Prompts/Chat.tsx", "Confirm {{amount}} {{currencyCode}} received": "Подтвердить получение {{amount}} {{currencyCode}}", "Confirm {{amount}} {{currencyCode}} sent": "Подтвердить отправку {{amount}} {{currencyCode}}", "Open Dispute": "Открыть диспут", - "Payment failed?": "Payment failed?", + "Payment failed?": "Платеж не прошел?", "Say hi! Be helpful and concise. Let them know how to send you {{amount}} {{currencyCode}}.": "Скажите привет! Будьте доброжелательны и кратки. Сообщите, как отправить Вам {{amount}} {{currencyCode}}.", - "To open a dispute you need to wait": "To open a dispute you need to wait", + "To open a dispute you need to wait": "Чтобы открыть диспут нужно подождать", "Wait for the seller to confirm he has received the payment.": "Подождите, пока продавец подтвердит, что он получил платёж.", "#60": "Phrases in components/TradeBox/Prompts/Dispute.tsx", "Please, submit your statement. Be clear and specific about what happened and provide the necessary evidence. You MUST provide a contact method: burner email, XMPP or telegram username to follow up with the staff. Disputes are solved at the discretion of real robots (aka humans), so be as helpful as possible to ensure a fair outcome. Max 5000 chars.": "Пожалуйста, отправьте своё заявление. Ясно и конкретно опишите, что произошло, и предоставьте необходимые доказательства. Чтобы связаться с персоналом Вы ДОЛЖНЫ указать способ связи: одноразовая электронная почта, XMPP или имя пользователя в Telegram. Споры решаются на усмотрение настоящих роботов (также известных как люди), поэтому будьте как можно более конструктивны, чтобы обеспечить справедливый результат. Максимум 5000 символов.", @@ -598,49 +598,49 @@ "#74": "Phrases in components/TradeBox/Prompts/Successful.tsx", "Renew": "Renew", "RoboSats gets better with more liquidity and users. Tell a bitcoiner friend about Robosats!": "RoboSats становится лучше с большей ликвидностью и пользователями. Расскажите другу-биткойнеру о Robosat!", - "Sending coins to": "Sending coins to", + "Sending coins to": "Отправка монет на", "Start Again": "Начать Снова", "Thank you for using Robosats!": "Спасибо за использование Robosats!", - "Thank you! RoboSats loves you too": "Thank you! RoboSats loves you too", + "Thank you! RoboSats loves you too": "Спасибо! RoboSats тоже Вас любит", "Your TXID": "Ваш TXID", "#75": "Phrases in components/TradeBox/Prompts/TakerFound.tsx", "Please wait for the taker to lock a bond. If the taker does not lock a bond in time, the order will be made public again.": "Пожалуйста, подождите, пока тейкер заблокирует залог. Если тейкер не заблокирует залог вовремя, ордер будет снова опубликован", "#76": "Phrases in pro/LandingDialog/index.tsx", - "A robot technician has arrived!": "A robot technician has arrived!", - "I bring my own robots, here they are. (Drag and drop workspace.json)": "I bring my own robots, here they are. (Drag and drop workspace.json)", - "My first time here. Generate a new Robot Garage and extended robot token (xToken).": "My first time here. Generate a new Robot Garage and extended robot token (xToken).", + "A robot technician has arrived!": "Прибыл робот-техник!", + "I bring my own robots, here they are. (Drag and drop workspace.json)": "Я привожу своих роботов, вот они. (Перетащите workspace.json)", + "My first time here. Generate a new Robot Garage and extended robot token (xToken).": "Я здесь впервые. Создайте новый гараж роботов и расширенный токен робота (xToken).", "#77": "Phrases in pro/ToolBar/index.tsx", - "Customize viewports": "Customize viewports", - "Freeze viewports": "Freeze viewports", + "Customize viewports": "Настройка видовых экранов", + "Freeze viewports": "Заморозить видовые экраны", "desktop_unsafe_alert": "Некоторые функции отключены для Вашей безопасности (чат) и без них у Вас не будет возможности завершить сделку. Чтобы защитить Вашу конфиденциальность и полностью включить RoboSats, используйте <1>Tor Browser и посетите <3>Onion сайт.", "phone_unsafe_alert": "У Вас не будет возможности завершить сделку. Используйте <1>Tor Browser и посетите <3>Onion сайт.", "rate_robosats": "Что Вы думаете о <1>RoboSats?", "let_us_know_hot_to_improve": "Сообщите нам, как можно улучшить платформу (<1>Telegram / <3>Github)", "open_dispute": "Для открытия диспута нужно подождать <1><1/>", - "Waiting for maker bond": "Waiting for maker bond", - "Public": "Public", - "Waiting for taker bond": "Waiting for taker bond", - "Cancelled": "Cancelled", - "Expired": "Expired", - "Waiting for trade collateral and buyer invoice": "Waiting for trade collateral and buyer invoice", - "Waiting only for seller trade collateral": "Waiting only for seller trade collateral", - "Waiting only for buyer invoice": "Waiting only for buyer invoice", - "Sending fiat - In chatroom": "Sending fiat - In chatroom", - "Fiat sent - In chatroom": "Fiat sent - In chatroom", - "In dispute": "In dispute", - "Collaboratively cancelled": "Collaboratively cancelled", - "Sending satoshis to buyer": "Sending satoshis to buyer", - "Sucessful trade": "Successful trade", - "Failed lightning network routing": "Failed lightning network routing", - "Wait for dispute resolution": "Wait for dispute resolution", - "Maker lost dispute": "Maker lost dispute", - "Taker lost dispute": "Taker lost dispute", - "Invoice expired. You did not confirm publishing the order in time. Make a new order.": "Invoice expired. You did not confirm publishing the order in time. Make a new order.", - "This order has been cancelled by the maker": "This order has been cancelled by the maker", - "Invoice expired. You did not confirm taking the order in time.": "Invoice expired. You did not confirm taking the order in time.", - "Invalid Order Id": "Invalid Order Id", - "You must have a robot avatar to see the order details": "You must have a robot avatar to see the order details", - "This order has been cancelled collaborativelly": "This order has been cancelled collaboratively", - "This order is not available": "This order is not available", - "The Robotic Satoshis working in the warehouse did not understand you. Please, fill a Bug Issue in Github https://github.com/RoboSats/robosats/issues": "The Robotic Satoshis working in the warehouse did not understand you. Please, fill a Bug Issue in Github https://github.com/RoboSats/robosats/issues" + "Waiting for maker bond": "Ожидание залога мейкера", + "Public": "Публичный", + "Waiting for taker bond": "Ожидание залога тейкера", + "Cancelled": "Отменён", + "Expired": "Истёк", + "Waiting for trade collateral and buyer invoice": "Ожидание залога и инвойса покупателя", + "Waiting only for seller trade collateral": "Ожидание только залога от продавца", + "Waiting only for buyer invoice": "Ожидание только залога от покупателя", + "Sending fiat - In chatroom": "Отправка фиата - В чат", + "Fiat sent - In chatroom": "Фиат отправлен - В чат", + "In dispute": "В диспуте", + "Collaboratively cancelled": "Совместно отменено", + "Sending satoshis to buyer": "Отправка Сатоши покупателю", + "Sucessful trade": "Успешная торговля", + "Failed lightning network routing": "Неудачная маршрутизация сети Lightning", + "Wait for dispute resolution": "Дождитесь разрешения диспута", + "Maker lost dispute": "Мейкер проиграл диспут", + "Taker lost dispute": "Тейкер проиграл диспут", + "Invoice expired. You did not confirm publishing the order in time. Make a new order.": "Срок действия инвойса истёк. Вы не подтвердили публикацию ордера вовремя. Сделайте новый ордер.", + "This order has been cancelled by the maker": "Этот ордер был отменён производителем", + "Invoice expired. You did not confirm taking the order in time.": "Срок действия инвойса истёк. Вы не подтвердили принятие ордера вовремя.", + "Invalid Order Id": "Неверный ID ордера", + "You must have a robot avatar to see the order details": "Чтобы увидеть детали ордера, у вас должен быть аватар-робот.", + "This order has been cancelled collaborativelly": "Этот ордер был отменен совместно.", + "This order is not available": "Этот ордер недоступен", + "The Robotic Satoshis working in the warehouse did not understand you. Please, fill a Bug Issue in Github https://github.com/RoboSats/robosats/issues": "Роботы-сатоши, работающие на складе, вас не поняли. Пожалуйста, заполните сообщение об ошибке в Github https://github.com/RoboSats/robosats/issues." } From c5b9818040b56a2e1d1c8208b22e742a6e7db0fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:15:35 +0000 Subject: [PATCH 14/33] Bump eslint-config-prettier from 9.0.0 to 9.1.0 in /frontend (#988) Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 9.0.0 to 9.1.0. - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v9.0.0...v9.1.0) --- updated-dependencies: - dependency-name: eslint-config-prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e5635861..1a7f6fe3 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -68,7 +68,7 @@ "babel-loader": "^9.1.3", "copy-webpack-plugin": "^11.0.0", "eslint": "^8.45.0", - "eslint-config-prettier": "^9.0.0", + "eslint-config-prettier": "^9.1.0", "eslint-config-standard-with-typescript": "^36.1.0", "eslint-import-resolver-typescript": "^3.6.0", "eslint-plugin-import": "^2.27.5", @@ -6598,9 +6598,9 @@ } }, "node_modules/eslint-config-prettier": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", - "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", + "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", "dev": true, "bin": { "eslint-config-prettier": "bin/cli.js" diff --git a/frontend/package.json b/frontend/package.json index 23295a6d..ebf8ed7c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -31,7 +31,7 @@ "babel-loader": "^9.1.3", "copy-webpack-plugin": "^11.0.0", "eslint": "^8.45.0", - "eslint-config-prettier": "^9.0.0", + "eslint-config-prettier": "^9.1.0", "eslint-config-standard-with-typescript": "^36.1.0", "eslint-import-resolver-typescript": "^3.6.0", "eslint-plugin-import": "^2.27.5", From 025f95184aed144188fcb2f81cc51c9f118e0a0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:15:42 +0000 Subject: [PATCH 15/33] Bump typescript from 5.3.2 to 5.3.3 in /frontend (#987) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.3.2 to 5.3.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.2...v5.3.3) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 1a7f6fe3..7de45eb0 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -80,7 +80,7 @@ "jest": "^29.6.1", "prettier": "^3.1.0", "ts-node": "^10.9.1", - "typescript": "^5.3.2", + "typescript": "^5.3.3", "webpack": "^5.89.0", "webpack-cli": "^5.1.4" } @@ -15227,9 +15227,9 @@ } }, "node_modules/typescript": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", - "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/frontend/package.json b/frontend/package.json index ebf8ed7c..9b4c5d56 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -43,7 +43,7 @@ "jest": "^29.6.1", "prettier": "^3.1.0", "ts-node": "^10.9.1", - "typescript": "^5.3.2", + "typescript": "^5.3.3", "webpack": "^5.89.0", "webpack-cli": "^5.1.4" }, From f12ce5d84d6fd655e9beb38418f5c6f539feedfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:16:00 +0000 Subject: [PATCH 16/33] Bump npm from 10.2.4 to 10.2.5 in /frontend (#985) Bumps [npm](https://github.com/npm/cli) from 10.2.4 to 10.2.5. - [Release notes](https://github.com/npm/cli/releases) - [Changelog](https://github.com/npm/cli/blob/latest/CHANGELOG.md) - [Commits](https://github.com/npm/cli/compare/v10.2.4...v10.2.5) --- updated-dependencies: - dependency-name: npm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 76 ++++++++++++++++---------------------- frontend/package.json | 2 +- 2 files changed, 32 insertions(+), 46 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 7de45eb0..16bc51e0 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -33,7 +33,7 @@ "js-sha256": "^0.10.1", "leaflet": "^1.9.4", "light-bolt11-decoder": "^3.0.0", - "npm": "^10.2.4", + "npm": "^10.2.5", "openpgp": "^5.11.0", "react": "^18.2.0", "react-countdown": "^2.3.5", @@ -10467,9 +10467,9 @@ } }, "node_modules/npm": { - "version": "10.2.4", - "resolved": "https://registry.npmjs.org/npm/-/npm-10.2.4.tgz", - "integrity": "sha512-umEuYneVEYO9KoEEI8n2sSGmNQeqco/3BSeacRlqIkCzw4E7XGtYSWMeJobxzr6hZ2n9cM+u5TsMTcC5bAgoWA==", + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/npm/-/npm-10.2.5.tgz", + "integrity": "sha512-lXdZ7titEN8CH5YJk9C/aYRU9JeDxQ4d8rwIIDsvH3SMjLjHTukB2CFstMiB30zXs4vCrPN2WH6cDq1yHBeJAw==", "bundleDependencies": [ "@isaacs/string-locale-compare", "@npmcli/arborist", @@ -10555,7 +10555,7 @@ "@sigstore/tuf": "^2.2.0", "abbrev": "^2.0.0", "archy": "~1.0.0", - "cacache": "^18.0.0", + "cacache": "^18.0.1", "chalk": "^5.3.0", "ci-info": "^4.0.0", "cli-columns": "^4.0.0", @@ -10569,7 +10569,7 @@ "ini": "^4.1.1", "init-package-json": "^6.0.0", "is-cidr": "^5.0.3", - "json-parse-even-better-errors": "^3.0.0", + "json-parse-even-better-errors": "^3.0.1", "libnpmaccess": "^8.0.1", "libnpmdiff": "^6.0.3", "libnpmexec": "^7.0.4", @@ -10598,7 +10598,7 @@ "npm-user-validate": "^2.0.0", "npmlog": "^7.0.1", "p-map": "^4.0.0", - "pacote": "^17.0.4", + "pacote": "^17.0.5", "parse-conflict-json": "^3.0.1", "proc-log": "^3.0.0", "qrcode-terminal": "^0.12.0", @@ -10703,7 +10703,7 @@ } }, "node_modules/npm/node_modules/@npmcli/arborist": { - "version": "7.2.1", + "version": "7.2.2", "inBundle": true, "license": "ISC", "dependencies": { @@ -10749,7 +10749,7 @@ } }, "node_modules/npm/node_modules/@npmcli/config": { - "version": "8.0.2", + "version": "8.0.3", "inBundle": true, "license": "ISC", "dependencies": { @@ -11178,7 +11178,7 @@ } }, "node_modules/npm/node_modules/cacache": { - "version": "18.0.0", + "version": "18.0.1", "inBundle": true, "license": "ISC", "dependencies": { @@ -11187,7 +11187,7 @@ "glob": "^10.2.2", "lru-cache": "^10.0.1", "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", + "minipass-collect": "^2.0.1", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "p-map": "^4.0.0", @@ -11706,7 +11706,7 @@ "license": "BSD-3-Clause" }, "node_modules/npm/node_modules/ignore-walk": { - "version": "6.0.3", + "version": "6.0.4", "inBundle": true, "license": "ISC", "dependencies": { @@ -11831,7 +11831,7 @@ } }, "node_modules/npm/node_modules/json-parse-even-better-errors": { - "version": "3.0.0", + "version": "3.0.1", "inBundle": true, "license": "MIT", "engines": { @@ -11865,7 +11865,7 @@ "license": "MIT" }, "node_modules/npm/node_modules/libnpmaccess": { - "version": "8.0.1", + "version": "8.0.2", "inBundle": true, "license": "ISC", "dependencies": { @@ -11877,7 +11877,7 @@ } }, "node_modules/npm/node_modules/libnpmdiff": { - "version": "6.0.3", + "version": "6.0.4", "inBundle": true, "license": "ISC", "dependencies": { @@ -11896,7 +11896,7 @@ } }, "node_modules/npm/node_modules/libnpmexec": { - "version": "7.0.4", + "version": "7.0.5", "inBundle": true, "license": "ISC", "dependencies": { @@ -11917,7 +11917,7 @@ } }, "node_modules/npm/node_modules/libnpmfund": { - "version": "5.0.1", + "version": "5.0.2", "inBundle": true, "license": "ISC", "dependencies": { @@ -11928,7 +11928,7 @@ } }, "node_modules/npm/node_modules/libnpmhook": { - "version": "10.0.0", + "version": "10.0.1", "inBundle": true, "license": "ISC", "dependencies": { @@ -11940,7 +11940,7 @@ } }, "node_modules/npm/node_modules/libnpmorg": { - "version": "6.0.1", + "version": "6.0.2", "inBundle": true, "license": "ISC", "dependencies": { @@ -11952,7 +11952,7 @@ } }, "node_modules/npm/node_modules/libnpmpack": { - "version": "6.0.3", + "version": "6.0.4", "inBundle": true, "license": "ISC", "dependencies": { @@ -11966,7 +11966,7 @@ } }, "node_modules/npm/node_modules/libnpmpublish": { - "version": "9.0.2", + "version": "9.0.3", "inBundle": true, "license": "ISC", "dependencies": { @@ -11984,7 +11984,7 @@ } }, "node_modules/npm/node_modules/libnpmsearch": { - "version": "7.0.0", + "version": "7.0.1", "inBundle": true, "license": "ISC", "dependencies": { @@ -11995,7 +11995,7 @@ } }, "node_modules/npm/node_modules/libnpmteam": { - "version": "6.0.0", + "version": "6.0.1", "inBundle": true, "license": "ISC", "dependencies": { @@ -12007,7 +12007,7 @@ } }, "node_modules/npm/node_modules/libnpmversion": { - "version": "5.0.1", + "version": "5.0.2", "inBundle": true, "license": "ISC", "dependencies": { @@ -12022,12 +12022,9 @@ } }, "node_modules/npm/node_modules/lru-cache": { - "version": "10.0.2", + "version": "10.1.0", "inBundle": true, "license": "ISC", - "dependencies": { - "semver": "^7.3.5" - }, "engines": { "node": "14 || >=16.14" } @@ -12076,25 +12073,14 @@ } }, "node_modules/npm/node_modules/minipass-collect": { - "version": "1.0.2", + "version": "2.0.1", "inBundle": true, "license": "ISC", "dependencies": { - "minipass": "^3.0.0" + "minipass": "^7.0.3" }, "engines": { - "node": ">= 8" - } - }, - "node_modules/npm/node_modules/minipass-collect/node_modules/minipass": { - "version": "3.3.6", - "inBundle": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" } }, "node_modules/npm/node_modules/minipass-fetch": { @@ -12358,11 +12344,11 @@ } }, "node_modules/npm/node_modules/npm-packlist": { - "version": "8.0.0", + "version": "8.0.1", "inBundle": true, "license": "ISC", "dependencies": { - "ignore-walk": "^6.0.0" + "ignore-walk": "^6.0.4" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -12448,7 +12434,7 @@ } }, "node_modules/npm/node_modules/pacote": { - "version": "17.0.4", + "version": "17.0.5", "inBundle": true, "license": "ISC", "dependencies": { diff --git a/frontend/package.json b/frontend/package.json index 9b4c5d56..590aaca2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -72,7 +72,7 @@ "js-sha256": "^0.10.1", "leaflet": "^1.9.4", "light-bolt11-decoder": "^3.0.0", - "npm": "^10.2.4", + "npm": "^10.2.5", "openpgp": "^5.11.0", "react": "^18.2.0", "react-countdown": "^2.3.5", From dafdbf3b2dbbaf96efdb673588ae6da4c18ea6a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:16:13 +0000 Subject: [PATCH 17/33] Bump actions/setup-python from 4 to 5 (#984) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/py-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/py-linter.yml b/.github/workflows/py-linter.yml index 984af4fa..b1754897 100644 --- a/.github/workflows/py-linter.yml +++ b/.github/workflows/py-linter.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.12' cache: pip From ba920776c78987d989264fe56d83d2a122ff2d75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Dec 2023 07:58:44 +0000 Subject: [PATCH 18/33] Bump python-gnupg from 0.5.1 to 0.5.2 Bumps [python-gnupg](https://github.com/vsajip/python-gnupg) from 0.5.1 to 0.5.2. - [Release notes](https://github.com/vsajip/python-gnupg/releases) - [Changelog](https://github.com/vsajip/python-gnupg/blob/master/release) - [Commits](https://github.com/vsajip/python-gnupg/compare/0.5.1...0.5.2) --- updated-dependencies: - dependency-name: python-gnupg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0260f689..16f5f06b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ psycopg2==2.9.9 SQLAlchemy==2.0.16 django-import-export==3.3.3 requests[socks] -python-gnupg==0.5.1 +python-gnupg==0.5.2 daphne==4.0.0 drf-spectacular==0.26.2 drf-spectacular-sidecar==2023.5.1 From 232f58749b1db445d2050ca65e2c553573732ef9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 07:09:17 +0000 Subject: [PATCH 19/33] Bump react-router-dom from 6.21.0 to 6.21.1 in /frontend Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.21.0 to 6.21.1. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.21.1/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 26 +++++++++++++------------- frontend/package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 16bc51e0..7196fada 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -43,7 +43,7 @@ "react-image": "^4.1.0", "react-leaflet": "^4.2.1", "react-qr-code": "^2.0.11", - "react-router-dom": "^6.21.0", + "react-router-dom": "^6.21.1", "react-smooth-image": "^1.1.0", "react-world-flags": "^1.6.0", "reconnecting-websocket": "^4.4.0", @@ -3839,9 +3839,9 @@ } }, "node_modules/@remix-run/router": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.0.tgz", - "integrity": "sha512-WOHih+ClN7N8oHk9N4JUiMxQJmRVaOxcg8w7F/oHUXzJt920ekASLI/7cYX8XkntDWRhLZtsk6LbGrkgOAvi5A==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.1.tgz", + "integrity": "sha512-Qg4DMQsfPNAs88rb2xkdk03N3bjK4jgX5fR24eHCTR9q6PrhZQZ4UJBPzCHJkIpTRN1UKxx2DzjZmnC+7Lj0Ow==", "engines": { "node": ">=14.0.0" } @@ -13980,11 +13980,11 @@ } }, "node_modules/react-router": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.0.tgz", - "integrity": "sha512-hGZ0HXbwz3zw52pLZV3j3+ec+m/PQ9cTpBvqjFQmy2XVUWGn5MD+31oXHb6dVTxYzmAeaiUBYjkoNz66n3RGCg==", + "version": "6.21.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.1.tgz", + "integrity": "sha512-W0l13YlMTm1YrpVIOpjCADJqEUpz1vm+CMo47RuFX4Ftegwm6KOYsL5G3eiE52jnJpKvzm6uB/vTKTPKM8dmkA==", "dependencies": { - "@remix-run/router": "1.14.0" + "@remix-run/router": "1.14.1" }, "engines": { "node": ">=14.0.0" @@ -13994,12 +13994,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.0.tgz", - "integrity": "sha512-1dUdVj3cwc1npzJaf23gulB562ESNvxf7E4x8upNJycqyUm5BRRZ6dd3LrlzhtLaMrwOCO8R0zoiYxdaJx4LlQ==", + "version": "6.21.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.1.tgz", + "integrity": "sha512-QCNrtjtDPwHDO+AO21MJd7yIcr41UetYt5jzaB9Y1UYaPTCnVuJq6S748g1dE11OQlCFIQg+RtAA1SEZIyiBeA==", "dependencies": { - "@remix-run/router": "1.14.0", - "react-router": "6.21.0" + "@remix-run/router": "1.14.1", + "react-router": "6.21.1" }, "engines": { "node": ">=14.0.0" diff --git a/frontend/package.json b/frontend/package.json index 590aaca2..11ebcab8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -82,7 +82,7 @@ "react-image": "^4.1.0", "react-leaflet": "^4.2.1", "react-qr-code": "^2.0.11", - "react-router-dom": "^6.21.0", + "react-router-dom": "^6.21.1", "react-smooth-image": "^1.1.0", "react-world-flags": "^1.6.0", "reconnecting-websocket": "^4.4.0", From e18e81abef5ce2b6a46738c3003253b265603f51 Mon Sep 17 00:00:00 2001 From: alanStocco Date: Fri, 22 Dec 2023 09:50:58 +0100 Subject: [PATCH 20/33] Wallets compatibility page fix typo icon Breez --- docs/_pages/docs/03-understand/07-wallets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_pages/docs/03-understand/07-wallets.md b/docs/_pages/docs/03-understand/07-wallets.md index b59e0fc6..0d6f1b8f 100644 --- a/docs/_pages/docs/03-understand/07-wallets.md +++ b/docs/_pages/docs/03-understand/07-wallets.md @@ -31,7 +31,7 @@ This is a non-exhaustive compilation based on past experience of users. We have |[Blink](#blink-mobile-former-bitcoin-beach-wallet)|[2.2.73](https://www.blink.sv/)|{{page.phone}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}} |{{page.thumbsup}}| |[Blixt](#blixt-androidios-lnd-light-backend-on-device)|[v0.4.1](https://github.com/hsjoberg/blixt-wallet)|{{page.phone}}|{{page.soso}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.thumbsup}}| |[Blue](#bluewallet-mobile)|[1.4.4](https://bluewallet.io/)|{{page.phone}}|{{page.good}}|{{page.unclear}}|{{page.unclear}}|{{page.good}}|{{page.unclear}}| -|[Breez](#breez-mobile)|[0.16](https://breez.technology/mobile/)|{{page.phone}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}}| +|[Breez](#breez-mobile)|[0.16](https://breez.technology/mobile/)|{{page.phone}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.thumbsup}}| |[Cash App](#cash-app-mobile)|[4.7](https://cash.app/)|{{page.phone}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}} |{{page.thumbsup}}| |[Core Lightning](#core-lightning--cln-cli-interface)|[v0.11.1](https://github.com/ElementsProject/lightning)|{{page.cli}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.thumbsup}}| |[Electrum](#electrum-desktop)|[4.1.4](https://github.com/spesmilo/electrum)|{{page.laptop}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.good}}|{{page.thumbsup}}|| From 10e76142597060aa07bda32c9ad4223168f2a079 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Dec 2023 07:32:33 +0000 Subject: [PATCH 21/33] Bump eslint-plugin-prettier from 4.2.1 to 5.1.1 in /mobile Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 4.2.1 to 5.1.1. - [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases) - [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v4.2.1...v5.1.1) --- updated-dependencies: - dependency-name: eslint-plugin-prettier dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- mobile/package-lock.json | 392 ++++++++++++++++++++++++++++++++++++++- mobile/package.json | 2 +- 2 files changed, 384 insertions(+), 10 deletions(-) diff --git a/mobile/package-lock.json b/mobile/package-lock.json index b3d55091..850f8aa2 100644 --- a/mobile/package-lock.json +++ b/mobile/package-lock.json @@ -32,7 +32,7 @@ "eslint-import-resolver-typescript": "^3.6.0", "eslint-plugin-import": "^2.27.5", "eslint-plugin-n": "^15.7.0", - "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-prettier": "^5.1.1", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-react": "^7.32.2", "eslint-plugin-react-hooks": "^4.6.0", @@ -2588,6 +2588,71 @@ "node": ">= 8" } }, + "node_modules/@pkgr/utils": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", + "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "fast-glob": "^3.3.0", + "is-glob": "^4.0.3", + "open": "^9.1.0", + "picocolors": "^1.0.0", + "tslib": "^2.6.0" + }, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, + "node_modules/@pkgr/utils/node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "dev": true, + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@pkgr/utils/node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dev": true, + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@pkgr/utils/node_modules/open": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", + "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", + "dev": true, + "dependencies": { + "default-browser": "^4.0.0", + "define-lazy-prop": "^3.0.0", + "is-inside-container": "^1.0.0", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@react-native-clipboard/clipboard": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@react-native-clipboard/clipboard/-/clipboard-1.12.1.tgz", @@ -4090,6 +4155,27 @@ "eslint": ">=7.0.0" } }, + "node_modules/@react-native-community/eslint-config/node_modules/eslint-plugin-prettier": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", + "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", + "dev": true, + "dependencies": { + "prettier-linter-helpers": "^1.0.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": ">=7.28.0", + "prettier": ">=2.0.0" + }, + "peerDependenciesMeta": { + "eslint-config-prettier": { + "optional": true + } + } + }, "node_modules/@react-native-community/eslint-plugin": { "version": "1.3.0", "dev": true, @@ -5184,6 +5270,15 @@ ], "license": "MIT" }, + "node_modules/big-integer": { + "version": "1.6.52", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", + "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, "node_modules/bl": { "version": "4.1.0", "license": "MIT", @@ -5193,6 +5288,18 @@ "readable-stream": "^3.4.0" } }, + "node_modules/bplist-parser": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", + "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", + "dev": true, + "dependencies": { + "big-integer": "^1.6.44" + }, + "engines": { + "node": ">= 5.10.0" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "license": "MIT", @@ -5308,6 +5415,21 @@ "dev": true, "license": "ISC" }, + "node_modules/bundle-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", + "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", + "dev": true, + "dependencies": { + "run-applescript": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/bytes": { "version": "3.0.0", "license": "MIT", @@ -5837,6 +5959,150 @@ "node": ">=0.10.0" } }, + "node_modules/default-browser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", + "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", + "dev": true, + "dependencies": { + "bundle-name": "^3.0.0", + "default-browser-id": "^3.0.0", + "execa": "^7.1.1", + "titleize": "^3.0.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser-id": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", + "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", + "dev": true, + "dependencies": { + "bplist-parser": "^0.2.0", + "untildify": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/execa": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.1", + "human-signals": "^4.3.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^3.0.7", + "strip-final-newline": "^3.0.0" + }, + "engines": { + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/default-browser/node_modules/human-signals": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "dev": true, + "engines": { + "node": ">=14.18.0" + } + }, + "node_modules/default-browser/node_modules/is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/npm-run-path": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", + "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", + "dev": true, + "dependencies": { + "path-key": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/defaults": { "version": "1.0.4", "license": "MIT", @@ -5847,6 +6113,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/define-lazy-prop": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", + "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/define-properties": { "version": "1.2.0", "dev": true, @@ -6500,20 +6778,30 @@ "license": "ISC" }, "node_modules/eslint-plugin-prettier": { - "version": "4.2.1", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.1.tgz", + "integrity": "sha512-WQpV3mSmIobb77s4qiCZu3dBrZZ0rj8ckSfBtRrgNK9Wnh2s3eiaxNTWloz1LJ1WtvqZES/PAI7PLvsrGt/CEA==", "dev": true, - "license": "MIT", "dependencies": { - "prettier-linter-helpers": "^1.0.0" + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.8.5" }, "engines": { - "node": ">=12.0.0" + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/prettier" }, "peerDependencies": { - "eslint": ">=7.28.0", - "prettier": ">=2.0.0" + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "eslint-config-prettier": "*", + "prettier": ">=3.0.0" }, "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, "eslint-config-prettier": { "optional": true } @@ -8090,6 +8378,21 @@ "node": ">=0.10.0" } }, + "node_modules/is-docker": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", + "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", + "dev": true, + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-extendable": { "version": "1.0.1", "license": "MIT", @@ -8134,6 +8437,24 @@ "node": ">=0.10.0" } }, + "node_modules/is-inside-container": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", + "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", + "dev": true, + "dependencies": { + "is-docker": "^3.0.0" + }, + "bin": { + "is-inside-container": "cli.js" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-interactive": { "version": "1.0.0", "license": "MIT", @@ -12693,6 +13014,21 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/run-applescript": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", + "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", + "dev": true, + "dependencies": { + "execa": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "dev": true, @@ -13477,6 +13813,22 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/synckit": { + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.6.tgz", + "integrity": "sha512-laHF2savN6sMeHCjLRkheIU4wo3Zg9Ln5YOjOo7sZ5dVQW8yF5pPE5SIw1dsPhq3TRp1jisKRCdPhfs/1WMqDA==", + "dev": true, + "dependencies": { + "@pkgr/utils": "^2.4.2", + "tslib": "^2.6.2" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/tapable": { "version": "2.2.1", "dev": true, @@ -13581,6 +13933,18 @@ "safe-buffer": "~5.1.0" } }, + "node_modules/titleize": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", + "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/tmpl": { "version": "1.0.5", "license": "BSD-3-Clause" @@ -13677,8 +14041,9 @@ } }, "node_modules/tslib": { - "version": "2.5.2", - "license": "0BSD" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -13892,6 +14257,15 @@ "node": ">=0.10.0" } }, + "node_modules/untildify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", + "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/update-browserslist-db": { "version": "1.0.11", "funding": [ diff --git a/mobile/package.json b/mobile/package.json index 8e398086..ea4fe4cd 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -36,7 +36,7 @@ "eslint-import-resolver-typescript": "^3.6.0", "eslint-plugin-import": "^2.27.5", "eslint-plugin-n": "^15.7.0", - "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-prettier": "^5.1.1", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-react": "^7.32.2", "eslint-plugin-react-hooks": "^4.6.0", From 74222b86b2aaf0fb06fd95a85a77f377e4e81022 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Dec 2023 07:32:51 +0000 Subject: [PATCH 22/33] Bump @react-native-clipboard/clipboard from 1.12.1 to 1.13.2 in /mobile Bumps [@react-native-clipboard/clipboard](https://github.com/react-native-clipboard/clipboard) from 1.12.1 to 1.13.2. - [Release notes](https://github.com/react-native-clipboard/clipboard/releases) - [Changelog](https://github.com/react-native-clipboard/clipboard/blob/master/.releaserc) - [Commits](https://github.com/react-native-clipboard/clipboard/compare/v1.12.1...v1.13.2) --- updated-dependencies: - dependency-name: "@react-native-clipboard/clipboard" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- mobile/package-lock.json | 8 ++++---- mobile/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mobile/package-lock.json b/mobile/package-lock.json index b3d55091..aa4819cf 100644 --- a/mobile/package-lock.json +++ b/mobile/package-lock.json @@ -8,7 +8,7 @@ "name": "robosats", "version": "0.5.3", "dependencies": { - "@react-native-clipboard/clipboard": "^1.12.1", + "@react-native-clipboard/clipboard": "^1.13.2", "@react-native-community/netinfo": "^11.2.0", "react": "18.2.0", "react-native": "^0.71.8", @@ -2589,9 +2589,9 @@ } }, "node_modules/@react-native-clipboard/clipboard": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@react-native-clipboard/clipboard/-/clipboard-1.12.1.tgz", - "integrity": "sha512-+PNk8kflpGte0W1Nz61/Dp8gHTxyuRjkVyRYBawymSIGTDHCC/zOJSbig6kGIkD8MeaGHC2vGYQJyUyCrgVPBQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@react-native-clipboard/clipboard/-/clipboard-1.13.2.tgz", + "integrity": "sha512-uVM55oEGc6a6ZmSATDeTcMm55A/C1km5X47g0xaoF0Zagv7N/8RGvLceA5L/izPwflIy78t7XQeJUcnGSib0nA==", "peerDependencies": { "react": ">=16.0", "react-native": ">=0.57.0" diff --git a/mobile/package.json b/mobile/package.json index 8e398086..da668c52 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -12,7 +12,7 @@ "format": "prettier --write '**/**/*.{js,jsx,ts,tsx,css,md,json}' --config ./.prettierrc" }, "dependencies": { - "@react-native-clipboard/clipboard": "^1.12.1", + "@react-native-clipboard/clipboard": "^1.13.2", "@react-native-community/netinfo": "^11.2.0", "react": "18.2.0", "react-native": "^0.71.8", From a77779fb7d15fd2a3a37cdf8a3e40e3c4e6e9a72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:15:24 +0000 Subject: [PATCH 23/33] Bump drf-spectacular from 0.26.2 to 0.27.0 (#1010) Bumps [drf-spectacular](https://github.com/tfranzel/drf-spectacular) from 0.26.2 to 0.27.0. - [Release notes](https://github.com/tfranzel/drf-spectacular/releases) - [Changelog](https://github.com/tfranzel/drf-spectacular/blob/master/CHANGELOG.rst) - [Commits](https://github.com/tfranzel/drf-spectacular/compare/0.26.2...0.27.0) --- updated-dependencies: - dependency-name: drf-spectacular dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 16f5f06b..953cb8a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ django-import-export==3.3.3 requests[socks] python-gnupg==0.5.2 daphne==4.0.0 -drf-spectacular==0.26.2 +drf-spectacular==0.27.0 drf-spectacular-sidecar==2023.5.1 django-cors-headers==4.3.1 base91==1.0.1 From 3216ced41ce426ee1eaef5c443536be2e2366bf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:15:39 +0000 Subject: [PATCH 24/33] Bump @mui/material from 5.14.0 to 5.15.1 in /frontend (#1015) Bumps [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) from 5.14.0 to 5.15.1. - [Release notes](https://github.com/mui/material-ui/releases) - [Changelog](https://github.com/mui/material-ui/blob/master/CHANGELOG.md) - [Commits](https://github.com/mui/material-ui/commits/v5.15.1/packages/mui-material) --- updated-dependencies: - dependency-name: "@mui/material" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 161 ++++++++++++++++++++++++------------- frontend/package.json | 2 +- 2 files changed, 105 insertions(+), 58 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 7196fada..c9907500 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -16,7 +16,7 @@ "@mui/base": "^5.0.0-beta.7", "@mui/icons-material": "^5.15.0", "@mui/lab": "^5.0.0-alpha.136", - "@mui/material": "^5.14.0", + "@mui/material": "^5.15.1", "@mui/system": "^5.14.0", "@mui/x-data-grid": "^6.17.0", "@mui/x-date-pickers": "^6.17.0", @@ -2223,9 +2223,9 @@ } }, "node_modules/@floating-ui/react-dom": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.2.tgz", - "integrity": "sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.4.tgz", + "integrity": "sha512-CF8k2rgKeh/49UrnIBs4BdxPUV6vize/Db1d/YbCLyp9GiVZ0BEwf5AiDSxJRCr6yOkGqTFHtmrULxkEfYZ7dQ==", "dependencies": { "@floating-ui/dom": "^1.5.1" }, @@ -3105,12 +3105,12 @@ } }, "node_modules/@mui/core-downloads-tracker": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.14.0.tgz", - "integrity": "sha512-SYBOVCatVDUf/lbrLGah09bHhX5WfUXg7kSskfLILr6SvKRni0NLp0aonxQ0SMALVVK3Qwa6cW4CdWuwS0gC1w==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.1.tgz", + "integrity": "sha512-y/nUEsWHyBzaKYp9zLtqJKrLod/zMNEWpMj488FuQY9QTmqBiyUhI2uh7PVaLqLewXRtdmG6JV0b6T5exyuYRw==", "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" } }, "node_modules/@mui/icons-material": { @@ -3180,18 +3180,18 @@ } }, "node_modules/@mui/material": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.14.0.tgz", - "integrity": "sha512-HP7CP71NhMkui2HUIEKl2/JfuHMuoarSUWAKlNw6s17bl/Num9rN61EM6uUzc2A2zHjj/00A66GnvDnmixEJEw==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.15.1.tgz", + "integrity": "sha512-WA5DVyvacxDakVyAhNqu/rRT28ppuuUFFw1bLpmRzrCJ4uw/zLTATcd4WB3YbB+7MdZNEGG/SJNWTDLEIyn3xQ==", "dependencies": { - "@babel/runtime": "^7.22.5", - "@mui/base": "5.0.0-beta.7", - "@mui/core-downloads-tracker": "^5.14.0", - "@mui/system": "^5.14.0", - "@mui/types": "^7.2.4", - "@mui/utils": "^5.13.7", - "@types/react-transition-group": "^4.4.6", - "clsx": "^1.2.1", + "@babel/runtime": "^7.23.5", + "@mui/base": "5.0.0-beta.28", + "@mui/core-downloads-tracker": "^5.15.1", + "@mui/system": "^5.15.1", + "@mui/types": "^7.2.11", + "@mui/utils": "^5.15.1", + "@types/react-transition-group": "^4.4.10", + "clsx": "^2.0.0", "csstype": "^3.1.2", "prop-types": "^15.8.1", "react-is": "^18.2.0", @@ -3202,7 +3202,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@emotion/react": "^11.5.0", @@ -3223,13 +3223,17 @@ } } }, - "node_modules/@mui/private-theming": { - "version": "5.13.7", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.13.7.tgz", - "integrity": "sha512-qbSr+udcij5F9dKhGX7fEdx2drXchq7htLNr2Qg2Ma+WJ6q0ERlEqGSBiPiVDJkptcjeVL4DGmcf1wl5+vD4EA==", + "node_modules/@mui/material/node_modules/@mui/base": { + "version": "5.0.0-beta.28", + "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.28.tgz", + "integrity": "sha512-KIoSc5sUFceeCaZTq5MQBapFzhHqMo4kj+4azWaCAjorduhcRQtN+BCgVHmo+gvEjix74bUfxwTqGifnu2fNTg==", "dependencies": { - "@babel/runtime": "^7.22.5", - "@mui/utils": "^5.13.7", + "@babel/runtime": "^7.23.5", + "@floating-ui/react-dom": "^2.0.4", + "@mui/types": "^7.2.11", + "@mui/utils": "^5.15.1", + "@popperjs/core": "^2.11.8", + "clsx": "^2.0.0", "prop-types": "^15.8.1" }, "engines": { @@ -3237,7 +3241,42 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0", + "react": "^17.0.0 || ^18.0.0", + "react-dom": "^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/material/node_modules/clsx": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", + "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==", + "engines": { + "node": ">=6" + } + }, + "node_modules/@mui/private-theming": { + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.15.1.tgz", + "integrity": "sha512-wTbzuy5KjSvCPE9UVJktWHJ0b/tD5biavY9wvF+OpYDLPpdXK52vc1hTDxSbdkHIFMkJExzrwO9GvpVAHZBnFQ==", + "dependencies": { + "@babel/runtime": "^7.23.5", + "@mui/utils": "^5.15.1", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@types/react": "^17.0.0 || ^18.0.0", @@ -3250,11 +3289,11 @@ } }, "node_modules/@mui/styled-engine": { - "version": "5.13.2", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.13.2.tgz", - "integrity": "sha512-VCYCU6xVtXOrIN8lcbuPmoG+u7FYuOERG++fpY74hPpEWkyFQG97F+/XfTQVYzlR2m7nPjnwVUgATcTCMEaMvw==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.15.1.tgz", + "integrity": "sha512-7WDZTJLqGexWDjqE9oAgjU8ak6hEtUw2yQU7SIYID5kLVO2Nj/Wi/KicbLsXnTsJNvSqePIlUIWTBSXwWJCPZw==", "dependencies": { - "@babel/runtime": "^7.21.0", + "@babel/runtime": "^7.23.5", "@emotion/cache": "^11.11.0", "csstype": "^3.1.2", "prop-types": "^15.8.1" @@ -3264,7 +3303,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@emotion/react": "^11.4.1", @@ -3281,16 +3320,16 @@ } }, "node_modules/@mui/system": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.14.0.tgz", - "integrity": "sha512-0HZGkX8miJbiNw+rjlZ9l0Cfkz1bSqfSHQH0EH9J+nx0aAm5cBleg9piOlLdCNIWGgecCqsw4x62erGrGjjcJg==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.15.1.tgz", + "integrity": "sha512-LAnP0ls69rqW9eBgI29phIx/lppv+WDGI7b3EJN7VZIqw0RezA0GD7NRpV12BgEYJABEii6z5Q9B5tg7dsX0Iw==", "dependencies": { - "@babel/runtime": "^7.22.5", - "@mui/private-theming": "^5.13.7", - "@mui/styled-engine": "^5.13.2", - "@mui/types": "^7.2.4", - "@mui/utils": "^5.13.7", - "clsx": "^1.2.1", + "@babel/runtime": "^7.23.5", + "@mui/private-theming": "^5.15.1", + "@mui/styled-engine": "^5.15.1", + "@mui/types": "^7.2.11", + "@mui/utils": "^5.15.1", + "clsx": "^2.0.0", "csstype": "^3.1.2", "prop-types": "^15.8.1" }, @@ -3299,7 +3338,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@emotion/react": "^11.5.0", @@ -3319,10 +3358,18 @@ } } }, + "node_modules/@mui/system/node_modules/clsx": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", + "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==", + "engines": { + "node": ">=6" + } + }, "node_modules/@mui/types": { - "version": "7.2.7", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.7.tgz", - "integrity": "sha512-sofpWmcBqOlTzRbr1cLQuUDKaUYVZTw8ENQrtL39TECRNENEzwgnNPh6WMfqMZlMvf1Aj9DLg74XPjnLr0izUQ==", + "version": "7.2.11", + "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.11.tgz", + "integrity": "sha512-KWe/QTEsFFlFSH+qRYf3zoFEj3z67s+qAuSnMMg+gFwbxG7P96Hm6g300inQL1Wy///gSRb8juX7Wafvp93m3w==", "peerDependencies": { "@types/react": "^17.0.0 || ^18.0.0" }, @@ -3333,12 +3380,12 @@ } }, "node_modules/@mui/utils": { - "version": "5.14.15", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.14.15.tgz", - "integrity": "sha512-QBfHovAvTa0J1jXuYDaXGk+Yyp7+Fm8GSqx6nK2JbezGqzCFfirNdop/+bL9Flh/OQ/64PeXcW4HGDdOge+n3A==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.15.1.tgz", + "integrity": "sha512-V1/d0E3Bju5YdB59HJf2G0tnHrFEvWLN+f8hAXp9+JSNy/LC2zKyqUfPPahflR6qsI681P8G9r4mEZte/SrrYA==", "dependencies": { - "@babel/runtime": "^7.23.2", - "@types/prop-types": "^15.7.8", + "@babel/runtime": "^7.23.5", + "@types/prop-types": "^15.7.11", "prop-types": "^15.8.1", "react-is": "^18.2.0" }, @@ -3347,7 +3394,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@types/react": "^17.0.0 || ^18.0.0", @@ -4144,9 +4191,9 @@ "dev": true }, "node_modules/@types/prop-types": { - "version": "15.7.8", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz", - "integrity": "sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ==" + "version": "15.7.11", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", + "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" }, "node_modules/@types/react": { "version": "18.2.21", @@ -4176,9 +4223,9 @@ } }, "node_modules/@types/react-transition-group": { - "version": "4.4.8", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.8.tgz", - "integrity": "sha512-QmQ22q+Pb+HQSn04NL3HtrqHwYMf4h3QKArOy5F8U5nEVMaihBs3SR10WiOM1iwPz5jIo8x/u11al+iEGZZrvg==", + "version": "4.4.10", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", + "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==", "dependencies": { "@types/react": "*" } diff --git a/frontend/package.json b/frontend/package.json index 11ebcab8..0dccd8e3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -55,7 +55,7 @@ "@mui/base": "^5.0.0-beta.7", "@mui/icons-material": "^5.15.0", "@mui/lab": "^5.0.0-alpha.136", - "@mui/material": "^5.14.0", + "@mui/material": "^5.15.1", "@mui/system": "^5.14.0", "@mui/x-data-grid": "^6.17.0", "@mui/x-date-pickers": "^6.17.0", From 5356508d7b70dce949077b9182bd6136b6ffec99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:15:54 +0000 Subject: [PATCH 25/33] Bump prettier from 3.1.0 to 3.1.1 in /frontend (#1013) Bumps [prettier](https://github.com/prettier/prettier) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.1.0...3.1.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c9907500..ebf2c7ce 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -78,7 +78,7 @@ "eslint-plugin-react": "^7.32.2", "eslint-plugin-react-hooks": "^4.6.0", "jest": "^29.6.1", - "prettier": "^3.1.0", + "prettier": "^3.1.1", "ts-node": "^10.9.1", "typescript": "^5.3.3", "webpack": "^5.89.0", @@ -13731,9 +13731,9 @@ } }, "node_modules/prettier": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", - "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", + "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" diff --git a/frontend/package.json b/frontend/package.json index 0dccd8e3..ecda0538 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -41,7 +41,7 @@ "eslint-plugin-react": "^7.32.2", "eslint-plugin-react-hooks": "^4.6.0", "jest": "^29.6.1", - "prettier": "^3.1.0", + "prettier": "^3.1.1", "ts-node": "^10.9.1", "typescript": "^5.3.3", "webpack": "^5.89.0", From baf318d98e2893fcdc013ca89c68b6dea40d68fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:16:37 +0000 Subject: [PATCH 26/33] Bump actions/download-artifact from 3 to 4 (#1011) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/android-build.yml | 2 +- .github/workflows/client-image.yml | 4 ++-- .github/workflows/coordinator-image.yml | 4 ++-- .github/workflows/release.yml | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 0f7fd3f6..853f3b0e 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -32,7 +32,7 @@ jobs: - name: 'Download main.js Artifact for a release' if: inputs.semver != '' # Only if fired as job in release.yml - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: mobile-web.bundle path: mobile/html/Web.bundle diff --git a/.github/workflows/client-image.yml b/.github/workflows/client-image.yml index 2071b050..1f0f6376 100644 --- a/.github/workflows/client-image.yml +++ b/.github/workflows/client-image.yml @@ -35,7 +35,7 @@ jobs: - name: 'Download main.js Artifact for a release' if: inputs.semver != '' # Only if fired as job in release.yml - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: web-basic-selfhosted-js path: nodeapp/static/frontend/ @@ -51,7 +51,7 @@ jobs: - name: 'Download pro.js Artifact for a release' if: inputs.semver != '' # Only if fired as job in release.yml - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: web-pro-selfhosted-js path: nodeapp/static/frontend/ diff --git a/.github/workflows/coordinator-image.yml b/.github/workflows/coordinator-image.yml index e4a3cb84..4b65f63b 100644 --- a/.github/workflows/coordinator-image.yml +++ b/.github/workflows/coordinator-image.yml @@ -26,7 +26,7 @@ jobs: - name: 'Download Basic main.js Artifact for a release' if: inputs.semver != '' # Only if fired as job in release.yml - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: web-main-js path: frontend/static/frontend/ @@ -42,7 +42,7 @@ jobs: - name: 'Download pro.js Artifact for a release' if: inputs.semver != '' # Only if fired as job in release.yml - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: web-pro-js path: frontend/static/frontend/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d2159cd..6b58063a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -83,7 +83,7 @@ jobs: # Upload app-universal-release APK artifact asset - name: 'Download universal APK Artifact' - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: robosats-${{ needs.check-versions.outputs.semver }}-universal.apk path: . @@ -100,7 +100,7 @@ jobs: # Upload app-arm64-v8a-release APK artifact asset - name: 'Download arm64-v8a APK Artifact' - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: robosats-${{ needs.check-versions.outputs.semver }}-arm64-v8a.apk path: . @@ -117,7 +117,7 @@ jobs: # Upload app-armeabi-v7a-release APK artifact asset - name: 'Download armeabi-v7a APK Artifact' - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: robosats-${{ needs.check-versions.outputs.semver }}-armeabi-v7a.apk path: . @@ -134,7 +134,7 @@ jobs: # Upload app-x86_64-release APK artifact asset - name: 'Download x86_64 APK Artifact' - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: robosats-${{ needs.check-versions.outputs.semver }}-x86_64.apk path: . @@ -151,7 +151,7 @@ jobs: # Upload app-x86-release APK artifact asset - name: 'Download x86 APK Artifact' - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: robosats-${{ needs.check-versions.outputs.semver }}-x86.apk path: . From 9693ed0fed03ab3334321a42042299000dd9d3a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:16:48 +0000 Subject: [PATCH 27/33] Bump ts-node from 10.9.1 to 10.9.2 in /frontend (#1016) Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 10.9.1 to 10.9.2. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Changelog](https://github.com/TypeStrong/ts-node/blob/main/development-docs/release-template.md) - [Commits](https://github.com/TypeStrong/ts-node/compare/v10.9.1...v10.9.2) --- updated-dependencies: - dependency-name: ts-node dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index ebf2c7ce..ec719f54 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -79,7 +79,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "jest": "^29.6.1", "prettier": "^3.1.1", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.3.3", "webpack": "^5.89.0", "webpack-cli": "^5.1.4" @@ -15046,9 +15046,9 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", diff --git a/frontend/package.json b/frontend/package.json index ecda0538..68ecbf6e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -42,7 +42,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "jest": "^29.6.1", "prettier": "^3.1.1", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.3.3", "webpack": "^5.89.0", "webpack-cli": "^5.1.4" From 6c5073239850166d5efb3c23d0bddac8c3cc92c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:17:08 +0000 Subject: [PATCH 28/33] Bump prettier from 3.1.0 to 3.1.1 in /mobile (#1006) Bumps [prettier](https://github.com/prettier/prettier) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.1.0...3.1.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- mobile/package-lock.json | 8 ++++---- mobile/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mobile/package-lock.json b/mobile/package-lock.json index b3ec46ca..fae98e06 100644 --- a/mobile/package-lock.json +++ b/mobile/package-lock.json @@ -38,7 +38,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "jest": "^29.5.0", "metro-react-native-babel-preset": "^0.75.1", - "prettier": "^3.1.0", + "prettier": "^3.1.1", "react-test-renderer": "18.2.0", "typescript": "^5.3.3" } @@ -12369,9 +12369,9 @@ } }, "node_modules/prettier": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", - "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", + "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" diff --git a/mobile/package.json b/mobile/package.json index 2baa33c3..af40d706 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -42,7 +42,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "jest": "^29.5.0", "metro-react-native-babel-preset": "^0.75.1", - "prettier": "^3.1.0", + "prettier": "^3.1.1", "react-test-renderer": "18.2.0", "typescript": "^5.3.3" }, From 3d8d518aaf736fe97512bd0578ae3cb559bc47a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:17:49 +0000 Subject: [PATCH 29/33] Bump django-import-export from 3.3.3 to 3.3.5 (#1023) Bumps [django-import-export](https://github.com/django-import-export/django-import-export) from 3.3.3 to 3.3.5. - [Release notes](https://github.com/django-import-export/django-import-export/releases) - [Changelog](https://github.com/django-import-export/django-import-export/blob/main/docs/changelog.rst) - [Commits](https://github.com/django-import-export/django-import-export/compare/3.3.3...3.3.5) --- updated-dependencies: - dependency-name: django-import-export dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 953cb8a2..20b572bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ git+https://github.com/RoboSats/Robohash.git gunicorn==21.2.0 psycopg2==2.9.9 SQLAlchemy==2.0.16 -django-import-export==3.3.3 +django-import-export==3.3.5 requests[socks] python-gnupg==0.5.2 daphne==4.0.0 From 4b1c4ccf03dbd2fa3e246e32a817278129134305 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:18:00 +0000 Subject: [PATCH 30/33] Bump isort from 5.13.0 to 5.13.2 (#1009) Bumps [isort](https://github.com/pycqa/isort) from 5.13.0 to 5.13.2. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](https://github.com/pycqa/isort/compare/5.13.0...5.13.2) --- updated-dependencies: - dependency-name: isort dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index b37d6d5c..2d8f659b 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,6 +1,6 @@ coverage==7.3.2 black==23.3.0 -isort==5.13.0 +isort==5.13.2 flake8==6.1.0 pyflakes==3.1.0 drf-openapi-tester==2.3.3 From 8c516eb60523d82351650182d80a400303dcae18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:18:11 +0000 Subject: [PATCH 31/33] Bump @react-native-community/netinfo from 11.2.0 to 11.2.1 in /mobile (#1005) Bumps [@react-native-community/netinfo](https://github.com/react-native-netinfo/react-native-netinfo) from 11.2.0 to 11.2.1. - [Release notes](https://github.com/react-native-netinfo/react-native-netinfo/releases) - [Changelog](https://github.com/react-native-netinfo/react-native-netinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-native-netinfo/react-native-netinfo/compare/v11.2.0...v11.2.1) --- updated-dependencies: - dependency-name: "@react-native-community/netinfo" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- mobile/package-lock.json | 8 ++++---- mobile/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mobile/package-lock.json b/mobile/package-lock.json index fae98e06..2e46e65f 100644 --- a/mobile/package-lock.json +++ b/mobile/package-lock.json @@ -9,7 +9,7 @@ "version": "0.5.3", "dependencies": { "@react-native-clipboard/clipboard": "^1.13.2", - "@react-native-community/netinfo": "^11.2.0", + "@react-native-community/netinfo": "^11.2.1", "react": "18.2.0", "react-native": "^0.71.8", "react-native-encrypted-storage": "^4.0.3", @@ -4182,9 +4182,9 @@ "license": "MIT" }, "node_modules/@react-native-community/netinfo": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-11.2.0.tgz", - "integrity": "sha512-Zpq8/BTBUUI4kito41VUtn/dGQZU1/SCNHvPZkjlUo41Mec38z13ntxeaIC+2LP5Dw0xKpZ/Lql47BZeXk+Ocg==", + "version": "11.2.1", + "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-11.2.1.tgz", + "integrity": "sha512-n9kgmH7vLaU7Cdo8vGfJGGwhrlgppaOSq5zKj9I7H4k5iRM3aNtwURw83mgrc22Ip7nSye2afZV2xDiIyvHttQ==", "peerDependencies": { "react-native": ">=0.59" } diff --git a/mobile/package.json b/mobile/package.json index af40d706..fab4864c 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@react-native-clipboard/clipboard": "^1.13.2", - "@react-native-community/netinfo": "^11.2.0", + "@react-native-community/netinfo": "^11.2.1", "react": "18.2.0", "react-native": "^0.71.8", "react-native-encrypted-storage": "^4.0.3", From 88cd6d25b6403c7a738f5ca6ab3da45b8e61003e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:20:19 +0000 Subject: [PATCH 32/33] Bump actions/upload-artifact from 3 to 4 (#1012) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/android-build.yml | 10 +++++----- .github/workflows/frontend-build.yml | 10 +++++----- .github/workflows/integration-tests.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 853f3b0e..03eef0db 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -66,7 +66,7 @@ jobs: # Create artifacts (only for Release) # Create app-universal-release APK artifact asset for Release - name: 'Upload universal .apk Release Artifact (for Release)' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: inputs.semver != '' # If this workflow is called from release.yml with: name: robosats-${{ inputs.semver }}-universal.apk @@ -74,7 +74,7 @@ jobs: # Create app-arm64-v8a-release APK artifact asset for Release - name: 'Upload arm64-v8a .apk Release Artifact (for Release)' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: inputs.semver != '' # If this workflow is called from release.yml with: name: robosats-${{ inputs.semver }}-arm64-v8a.apk @@ -82,7 +82,7 @@ jobs: # Create app-armeabi-v7a-release APK artifact asset for Release - name: 'Upload armeabi-v7a .apk Release Artifact (for Release)' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: inputs.semver != '' # If this workflow is called from release.yml with: name: robosats-${{ inputs.semver }}-armeabi-v7a.apk @@ -90,7 +90,7 @@ jobs: # Create app-x86_64-release APK artifact asset for Release - name: 'Upload x86_64 .apk Release Artifact (for Release)' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: inputs.semver != '' # If this workflow is called from release.yml with: name: robosats-${{ inputs.semver }}-x86_64.apk @@ -98,7 +98,7 @@ jobs: # Create app-x86-release APK artifact asset for Release - name: 'Upload x86 .apk Release Artifact (for Release)' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: inputs.semver != '' # If this workflow is called from release.yml with: name: robosats-${{ inputs.semver }}-x86.apk diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml index cfb78e56..f98ba367 100644 --- a/.github/workflows/frontend-build.yml +++ b/.github/workflows/frontend-build.yml @@ -50,27 +50,27 @@ jobs: cd frontend npm run build - name: 'Archive Web Basic Build Results' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: web-main-js path: frontend/static/frontend/main.js - name: 'Archive Web Basic SelfhostedBuild Results' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: web-basic-selfhosted-js path: frontend/static/frontend/basic.selfhosted.js - name: 'Archive Web PRO Build Results' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: web-pro-js path: frontend/static/frontend/pro.js - name: 'Archive Web PRO SelhostedBuild Results' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: web-pro-selfhosted-js path: frontend/static/frontend/pro.selfhosted.js - name: 'Archive Mobile Build Results' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: mobile-web.bundle path: mobile/html/Web.bundle diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 96d3b3f5..0c619b5d 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -77,7 +77,7 @@ jobs: USE_TOR: False - name: 'Upload coverage report' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: coverage-report-${{ matrix.python-tag }}-${{ matrix.ln-vendor }} path: htmlcov/ \ No newline at end of file From 82e4be8084359f6a57334e5c4b406b9e01b0274f Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Mon, 25 Dec 2023 13:44:27 +0000 Subject: [PATCH 33/33] Fix missing maker/taker in chatroom when first peers is WS and second is REST --- chat/consumers.py | 4 ++++ chat/views.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chat/consumers.py b/chat/consumers.py index 5d4914ab..c2443e66 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -36,6 +36,8 @@ class ChatRoomConsumer(AsyncWebsocketConsumer): defaults={ "maker": self.user, "maker_connected": True, + "taker": order.taker, + "taker_connected": True, }, ) @@ -47,6 +49,8 @@ class ChatRoomConsumer(AsyncWebsocketConsumer): defaults={ "taker": self.user, "taker_connected": True, + "maker": order.maker, + "maker_connected": False, }, ) diff --git a/chat/views.py b/chat/views.py index 42012d69..ab288169 100644 --- a/chat/views.py +++ b/chat/views.py @@ -77,7 +77,7 @@ class ChatView(viewsets.ViewSet): }, ) - # Poor idea: is_peer_connected() mockup. Update connection status based on last time a GET request was sent + # is_peer_connected() mockup. Update connection status based on last time a GET request was sent if chatroom.maker == request.user: chatroom.taker_connected = order.taker.last_login > ( timezone.now() - timedelta(minutes=1)