mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2024-11-19 09:50:15 +01:00
resolved conflict
This commit is contained in:
overtorment
commit
9a7f14418f
@ -603,6 +603,7 @@
|
||||
"payment_code": "支払コード",
|
||||
"payment_codes_list": "支払コードリスト",
|
||||
"who_can_pay_me": "あなたに支払いできる人：",
|
||||
"purpose": "再利用・共有可能なコード (BIP47)"
|
||||
"purpose": "再利用・共有可能なコード (BIP47)",
|
||||
"not_found": "支払コードが見つかりません"
|
||||
}
|
||||
}
|
||||
|
||||
@ -603,6 +603,7 @@
|
||||
"payment_code": "Kod płatności",
|
||||
"payment_codes_list": "Lista kodów płatności",
|
||||
"who_can_pay_me": "Kto może mi płacić:",
|
||||
"purpose": "Kod wielokrotnego użytku możliwy do udostępnienia (BIP47)"
|
||||
"purpose": "Kod wielokrotnego użytku możliwy do udostępnienia (BIP47)",
|
||||
"not_found": "Kod płatności nie znaleziony"
|
||||
}
|
||||
}
|
||||
|
||||
153
package-lock.json
generated
153
package-lock.json
generated
@ -41,8 +41,8 @@
|
||||
"coinselect": "3.1.13",
|
||||
"crypto-js": "4.1.1",
|
||||
"dayjs": "1.11.7",
|
||||
"detox": "20.6.0",
|
||||
"ecpair": "^2.0.1",
|
||||
"detox": "20.7.0",
|
||||
"ecpair": "2.0.1",
|
||||
"ecurve": "1.0.6",
|
||||
"electrum-client": "https://github.com/BlueWallet/rn-electrum-client#76c0ea35e1a50c47f3a7f818d529ebd100161496",
|
||||
"electrum-mnemonic": "2.0.0",
|
||||
@ -100,7 +100,7 @@
|
||||
"react-native-watch-connectivity": "1.1.0",
|
||||
"react-native-webview": "11.26.1",
|
||||
"react-native-widget-center": "https://github.com/BlueWallet/react-native-widget-center#a128c38",
|
||||
"react-native-windows": "0.71.4",
|
||||
"react-native-windows": "0.71.5",
|
||||
"readable-stream": "3.6.2",
|
||||
"realm": "11.7.0",
|
||||
"rn-ldk": "github:BlueWallet/rn-ldk#v0.8.4",
|
||||
@ -9584,16 +9584,16 @@
|
||||
}
|
||||
},
|
||||
"node_modules/detox": {
|
||||
"version": "20.6.0",
|
||||
"resolved": "https://registry.npmjs.org/detox/-/detox-20.6.0.tgz",
|
||||
"integrity": "sha512-89YxptnkvyQazN2I8EDRkH8tWqiOvqsGXZCZwUKP5lsulBSTJka7SS5Fd8AnQGUd5vPs+tTqO+zb0FgCRcV/Tg==",
|
||||
"version": "20.7.0",
|
||||
"resolved": "https://registry.npmjs.org/detox/-/detox-20.7.0.tgz",
|
||||
"integrity": "sha512-lBS//hl8NbusNx4E2Bucb8UciNPS9HhW1ejUIiEDgYuGQnuM33GcyQ6I4wXi4YUdrDYO2obpwxe/qLUg9DkVng==",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"ajv": "^8.6.3",
|
||||
"bunyan": "^1.8.12",
|
||||
"bunyan-debug-stream": "^3.1.0",
|
||||
"caf": "^15.0.1",
|
||||
"chalk": "^2.4.2",
|
||||
"chalk": "^4.0.0",
|
||||
"child-process-promise": "^2.2.0",
|
||||
"execa": "^5.1.1",
|
||||
"find-up": "^4.1.0",
|
||||
@ -9639,6 +9639,20 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/detox/node_modules/ansi-styles": {
|
||||
"version": "4.3.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
|
||||
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
||||
"dependencies": {
|
||||
"color-convert": "^2.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
|
||||
}
|
||||
},
|
||||
"node_modules/detox/node_modules/brace-expansion": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
|
||||
@ -9647,6 +9661,37 @@
|
||||
"balanced-match": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/detox/node_modules/chalk": {
|
||||
"version": "4.1.2",
|
||||
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
|
||||
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
|
||||
"dependencies": {
|
||||
"ansi-styles": "^4.1.0",
|
||||
"supports-color": "^7.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/chalk/chalk?sponsor=1"
|
||||
}
|
||||
},
|
||||
"node_modules/detox/node_modules/color-convert": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
|
||||
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
|
||||
"dependencies": {
|
||||
"color-name": "~1.1.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=7.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/detox/node_modules/color-name": {
|
||||
"version": "1.1.4",
|
||||
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
|
||||
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
|
||||
},
|
||||
"node_modules/detox/node_modules/glob": {
|
||||
"version": "8.1.0",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
|
||||
@ -9665,6 +9710,14 @@
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/detox/node_modules/has-flag": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
|
||||
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/detox/node_modules/lru-cache": {
|
||||
"version": "6.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
|
||||
@ -9688,9 +9741,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/detox/node_modules/semver": {
|
||||
"version": "7.3.8",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
|
||||
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
|
||||
"version": "7.4.0",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
|
||||
"integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
|
||||
"dependencies": {
|
||||
"lru-cache": "^6.0.0"
|
||||
},
|
||||
@ -9701,6 +9754,17 @@
|
||||
"node": ">=10"
|
||||
}
|
||||
},
|
||||
"node_modules/detox/node_modules/supports-color": {
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
|
||||
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
|
||||
"dependencies": {
|
||||
"has-flag": "^4.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/detox/node_modules/yallist": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
|
||||
@ -20756,9 +20820,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/react-native-windows": {
|
||||
"version": "0.71.4",
|
||||
"resolved": "https://registry.npmjs.org/react-native-windows/-/react-native-windows-0.71.4.tgz",
|
||||
"integrity": "sha512-JTiA+mxmVEZ5Rd1mcoH2FpSyv5Ii/MFPaI87Yke4HxgYxbSLzPjcUZ8jFAghfcN9hazSfEt+2LG33h9PiB8u9w==",
|
||||
"version": "0.71.5",
|
||||
"resolved": "https://registry.npmjs.org/react-native-windows/-/react-native-windows-0.71.5.tgz",
|
||||
"integrity": "sha512-dF0e3dM6AyAIhf0MzcXVkeYauIbpEJ+SFbmLB2hnJ4R4GR73FJbGvvPfPOzRAA5nQsoTxXQu5sIILYSTtSwcng==",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.0.0",
|
||||
"@jest/create-cache-key-function": "^29.2.1",
|
||||
@ -31762,15 +31826,15 @@
|
||||
"dev": true
|
||||
},
|
||||
"detox": {
|
||||
"version": "20.6.0",
|
||||
"resolved": "https://registry.npmjs.org/detox/-/detox-20.6.0.tgz",
|
||||
"integrity": "sha512-89YxptnkvyQazN2I8EDRkH8tWqiOvqsGXZCZwUKP5lsulBSTJka7SS5Fd8AnQGUd5vPs+tTqO+zb0FgCRcV/Tg==",
|
||||
"version": "20.7.0",
|
||||
"resolved": "https://registry.npmjs.org/detox/-/detox-20.7.0.tgz",
|
||||
"integrity": "sha512-lBS//hl8NbusNx4E2Bucb8UciNPS9HhW1ejUIiEDgYuGQnuM33GcyQ6I4wXi4YUdrDYO2obpwxe/qLUg9DkVng==",
|
||||
"requires": {
|
||||
"ajv": "^8.6.3",
|
||||
"bunyan": "^1.8.12",
|
||||
"bunyan-debug-stream": "^3.1.0",
|
||||
"caf": "^15.0.1",
|
||||
"chalk": "^2.4.2",
|
||||
"chalk": "^4.0.0",
|
||||
"child-process-promise": "^2.2.0",
|
||||
"execa": "^5.1.1",
|
||||
"find-up": "^4.1.0",
|
||||
@ -31802,6 +31866,14 @@
|
||||
"yargs-unparser": "^2.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"ansi-styles": {
|
||||
"version": "4.3.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
|
||||
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
||||
"requires": {
|
||||
"color-convert": "^2.0.1"
|
||||
}
|
||||
},
|
||||
"brace-expansion": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
|
||||
@ -31810,6 +31882,28 @@
|
||||
"balanced-match": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"chalk": {
|
||||
"version": "4.1.2",
|
||||
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
|
||||
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
|
||||
"requires": {
|
||||
"ansi-styles": "^4.1.0",
|
||||
"supports-color": "^7.1.0"
|
||||
}
|
||||
},
|
||||
"color-convert": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
|
||||
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
|
||||
"requires": {
|
||||
"color-name": "~1.1.4"
|
||||
}
|
||||
},
|
||||
"color-name": {
|
||||
"version": "1.1.4",
|
||||
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
|
||||
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
|
||||
},
|
||||
"glob": {
|
||||
"version": "8.1.0",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
|
||||
@ -31822,6 +31916,11 @@
|
||||
"once": "^1.3.0"
|
||||
}
|
||||
},
|
||||
"has-flag": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
|
||||
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
|
||||
},
|
||||
"lru-cache": {
|
||||
"version": "6.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
|
||||
@ -31839,13 +31938,21 @@
|
||||
}
|
||||
},
|
||||
"semver": {
|
||||
"version": "7.3.8",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
|
||||
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
|
||||
"version": "7.4.0",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
|
||||
"integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
|
||||
"requires": {
|
||||
"lru-cache": "^6.0.0"
|
||||
}
|
||||
},
|
||||
"supports-color": {
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
|
||||
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
|
||||
"requires": {
|
||||
"has-flag": "^4.0.0"
|
||||
}
|
||||
},
|
||||
"yallist": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
|
||||
@ -40304,9 +40411,9 @@
|
||||
"from": "react-native-widget-center@https://github.com/BlueWallet/react-native-widget-center#a128c38"
|
||||
},
|
||||
"react-native-windows": {
|
||||
"version": "0.71.4",
|
||||
"resolved": "https://registry.npmjs.org/react-native-windows/-/react-native-windows-0.71.4.tgz",
|
||||
"integrity": "sha512-JTiA+mxmVEZ5Rd1mcoH2FpSyv5Ii/MFPaI87Yke4HxgYxbSLzPjcUZ8jFAghfcN9hazSfEt+2LG33h9PiB8u9w==",
|
||||
"version": "0.71.5",
|
||||
"resolved": "https://registry.npmjs.org/react-native-windows/-/react-native-windows-0.71.5.tgz",
|
||||
"integrity": "sha512-dF0e3dM6AyAIhf0MzcXVkeYauIbpEJ+SFbmLB2hnJ4R4GR73FJbGvvPfPOzRAA5nQsoTxXQu5sIILYSTtSwcng==",
|
||||
"requires": {
|
||||
"@babel/runtime": "^7.0.0",
|
||||
"@jest/create-cache-key-function": "^29.2.1",
|
||||
|
||||
@ -130,8 +130,8 @@
|
||||
"coinselect": "3.1.13",
|
||||
"crypto-js": "4.1.1",
|
||||
"dayjs": "1.11.7",
|
||||
"detox": "20.6.0",
|
||||
"ecpair": "^2.0.1",
|
||||
"detox": "20.7.0",
|
||||
"ecpair": "2.0.1",
|
||||
"ecurve": "1.0.6",
|
||||
"electrum-client": "https://github.com/BlueWallet/rn-electrum-client#76c0ea35e1a50c47f3a7f818d529ebd100161496",
|
||||
"electrum-mnemonic": "2.0.0",
|
||||
@ -189,7 +189,7 @@
|
||||
"react-native-watch-connectivity": "1.1.0",
|
||||
"react-native-webview": "11.26.1",
|
||||
"react-native-widget-center": "https://github.com/BlueWallet/react-native-widget-center#a128c38",
|
||||
"react-native-windows": "0.71.4",
|
||||
"react-native-windows": "0.71.5",
|
||||
"readable-stream": "3.6.2",
|
||||
"realm": "11.7.0",
|
||||
"rn-ldk": "github:BlueWallet/rn-ldk#v0.8.4",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user