mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2024-11-19 09:50:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into renovate/react-native-clipboard-clipboard-1.x

Browse Source
This commit is contained in:
Marcos Rodriguez Velez 2023-12-13 15:47:53 -04:00
commit b48f76f7e4
No known key found for this signature in database
GPG Key ID: 6030B2F48CCE86D7
6 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package-lock.json generated
View File

@ -65,7 +65,7 @@
"react-native-crypto": "2.2.0",
"react-native-default-preference": "1.4.4",
"react-native-device-info": "10.12.0",
"react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#b21978d601a9e780e3d563447577f2d5dedb3c9a",
"react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#0be5a70c3b456e35c2454aaf4dc8c2d40eb2ab47",
"react-native-draggable-flatlist": "github:BlueWallet/react-native-draggable-flatlist#ebfddc4",
"react-native-elements": "3.4.3",
"react-native-fingerprint-scanner": "https://github.com/BlueWallet/react-native-fingerprint-scanner#ce644673681716335d786727bab998f7e632ab5e",
@ -103,7 +103,7 @@
"react-native-webview": "13.6.3",
"react-native-widget-center": "https://github.com/BlueWallet/react-native-widget-center#a128c38",
"readable-stream": "3.6.2",
"realm": "12.3.1",
"realm": "12.4.0",
"rn-ldk": "github:BlueWallet/rn-ldk#v0.8.4",
"rn-nodeify": "10.3.0",
"scryptsy": "2.1.0",
@ -18227,9 +18227,9 @@
}
},
"node_modules/react-native-document-picker": {
"version": "9.0.1",
"resolved": "git+ssh://git@github.com/BlueWallet/react-native-document-picker.git#b21978d601a9e780e3d563447577f2d5dedb3c9a",
"integrity": "sha512-l2c2xChwsdjzZIV9QJc85buC3vXkM5ZuY4943yMDj3TiszJp1spmHNaRMZKYIh3yVwdD2jENm0DBU5AWa+jhLg==",
"version": "9.1.0",
"resolved": "git+ssh://git@github.com/BlueWallet/react-native-document-picker.git#0be5a70c3b456e35c2454aaf4dc8c2d40eb2ab47",
"integrity": "sha512-vZBCfM5XjxqnypU6tnCyxsI57Q3LaKPSyjk7r2TdQ4C4yiTObzHDPrTV1dM1wrz2iSFq5gCYOC5I38FJgCt1qw==",
"license": "MIT",
"dependencies": {
"invariant": "^2.2.4"
@ -18927,9 +18927,9 @@
"integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="
},
"node_modules/realm": {
"version": "12.3.1",
"resolved": "https://registry.npmjs.org/realm/-/realm-12.3.1.tgz",
"integrity": "sha512-SZOpIf5O9aJ8jwSmeDv9OFYRaTuIlH2EpsXLkONgehJ7KZNArsRUrK21p+YSKPovQHsGN7yAUW3e/kssq8T2XA==",
"version": "12.4.0",
"resolved": "https://registry.npmjs.org/realm/-/realm-12.4.0.tgz",
"integrity": "sha512-YdElmGA24DRU1FHBzw9KIyWIHXSjwHCO65GeGWjGiqO0Pth10hkgkYrBDKnfgR/OLwfX4zHsgsz3/3HxHi4dQQ==",
"hasInstallScript": true,
"dependencies": {
"bson": "^4.7.2",
@ -34334,9 +34334,9 @@
"integrity": "sha512-gnBkjyZNEqRd+5BNrdzuvmlraHTCH/to2x0Gp9rtDt0O9xWWW1MTYohUVWX9A0Ad2HVYcGanDCIvjWp4ngMZFg=="
},
"react-native-document-picker": {
"version": "git+ssh://git@github.com/BlueWallet/react-native-document-picker.git#b21978d601a9e780e3d563447577f2d5dedb3c9a",
"integrity": "sha512-l2c2xChwsdjzZIV9QJc85buC3vXkM5ZuY4943yMDj3TiszJp1spmHNaRMZKYIh3yVwdD2jENm0DBU5AWa+jhLg==",
"from": "react-native-document-picker@https://github.com/BlueWallet/react-native-document-picker#b21978d601a9e780e3d563447577f2d5dedb3c9a",
"version": "git+ssh://git@github.com/BlueWallet/react-native-document-picker.git#0be5a70c3b456e35c2454aaf4dc8c2d40eb2ab47",
"integrity": "sha512-vZBCfM5XjxqnypU6tnCyxsI57Q3LaKPSyjk7r2TdQ4C4yiTObzHDPrTV1dM1wrz2iSFq5gCYOC5I38FJgCt1qw==",
"from": "react-native-document-picker@https://github.com/BlueWallet/react-native-document-picker#0be5a70c3b456e35c2454aaf4dc8c2d40eb2ab47",
"requires": {
"invariant": "^2.2.4"
}
@ -34720,9 +34720,9 @@
"integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="
},
"realm": {
"version": "12.3.1",
"resolved": "https://registry.npmjs.org/realm/-/realm-12.3.1.tgz",
"integrity": "sha512-SZOpIf5O9aJ8jwSmeDv9OFYRaTuIlH2EpsXLkONgehJ7KZNArsRUrK21p+YSKPovQHsGN7yAUW3e/kssq8T2XA==",
"version": "12.4.0",
"resolved": "https://registry.npmjs.org/realm/-/realm-12.4.0.tgz",
"integrity": "sha512-YdElmGA24DRU1FHBzw9KIyWIHXSjwHCO65GeGWjGiqO0Pth10hkgkYrBDKnfgR/OLwfX4zHsgsz3/3HxHi4dQQ==",
"requires": {
"bson": "^4.7.2",
"debug": "^4.3.4",

4
package.json
View File

@ -149,7 +149,7 @@
"react-native-crypto": "2.2.0",
"react-native-default-preference": "1.4.4",
"react-native-device-info": "10.12.0",
"react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#b21978d601a9e780e3d563447577f2d5dedb3c9a",
"react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#0be5a70c3b456e35c2454aaf4dc8c2d40eb2ab47",
"react-native-draggable-flatlist": "github:BlueWallet/react-native-draggable-flatlist#ebfddc4",
"react-native-elements": "3.4.3",
"react-native-fingerprint-scanner": "https://github.com/BlueWallet/react-native-fingerprint-scanner#ce644673681716335d786727bab998f7e632ab5e",
@ -187,7 +187,7 @@
"react-native-webview": "13.6.3",
"react-native-widget-center": "https://github.com/BlueWallet/react-native-widget-center#a128c38",
"readable-stream": "3.6.2",
"realm": "12.3.1",
"realm": "12.4.0",
"rn-ldk": "github:BlueWallet/rn-ldk#v0.8.4",
"rn-nodeify": "10.3.0",
"scryptsy": "2.1.0",

2
screen/send/psbtMultisigQRCode.js
View File

@ -58,7 +58,7 @@ const PsbtMultisigQRCode = () => {
alert(loc.wallets.import_error);
} else {
// psbt base64?
navigate('PsbtMultisig', { receivedPSBTBase64: ret.data });
navigate({ name: 'PsbtMultisig', params: { receivedPSBTBase64: ret.data }, merge: true });
}
};

2
screen/send/psbtWithHardwareWallet.js
View File

@ -77,7 +77,7 @@ const PsbtWithHardwareWallet = () => {
if (launchedBy) {
// we must navigate back to the screen who requested psbt (instead of broadcasting it ourselves)
// most likely for LN channel opening
navigation.navigate(launchedBy, { psbt });
navigation.navigate({ name: launchedBy, params: { psbt }, merge: true });
// ^^^ we just use `psbt` variable sinse it was finalized in the above _combinePSBT()
// (passed by reference)
}

2
screen/wallets/details.js
View File

@ -704,6 +704,8 @@ const WalletDetails = () => {
<TouchableOpacity accessibilityRole="button" onPress={handleDeleteButtonTapped} testID="DeleteButton">
<Text textBreakStrategy="simple" style={styles.delete}>{`${loc.wallets.details_delete}${' '}`}</Text>
</TouchableOpacity>
<BlueSpacing20 />
<BlueSpacing20 />
</View>
</BlueCard>
</View>

1
screen/wallets/importCustomDerivationPath.js
View File

@ -163,6 +163,7 @@ const styles = StyleSheet.create({
center: {
marginHorizontal: 16,
alignItems: 'center',
top: -100,
},
buttonContainer: {
height: 45,