FIX: FilePicker oncancel was not removing load indicator

This commit is contained in:
Marcos Rodriguez Vélez 2021-12-27 15:08:06 -06:00
parent 59efd882ec
commit 5184e3aec9
No known key found for this signature in database
GPG Key ID: 0D64671698D11C5C
4 changed files with 23 additions and 19 deletions

View File

@ -275,8 +275,8 @@ PODS:
- React-Core
- react-native-camera/RN (4.2.1):
- React-Core
- react-native-document-picker (3.5.4):
- React
- react-native-document-picker (7.1.3):
- React-Core
- react-native-fingerprint-scanner (6.0.0):
- React
- react-native-idle-timer (2.1.6):
@ -362,7 +362,7 @@ PODS:
- React-cxxreact (= 0.64.2)
- React-jsi (= 0.64.2)
- React-perflogger (= 0.64.2)
- RealmJS (10.10.1):
- RealmJS (10.11.0):
- GCDWebServer
- React
- RemobileReactNativeQrcodeLocalImage (1.0.4):
@ -387,7 +387,7 @@ PODS:
- React
- RNKeychain (8.0.0):
- React-Core
- RNLocalize (2.1.6):
- RNLocalize (2.1.7):
- React-Core
- RNPrivacySnapshot (1.0.0):
- React
@ -740,7 +740,7 @@ SPEC CHECKSUMS:
React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae
react-native-blue-crypto: 23f1558ad3d38d7a2edb7e2f6ed1bc520ed93e56
react-native-camera: 210a872c84d3aa0982a9223047ef9e743ed694fa
react-native-document-picker: c5752781fbc0c126c627c1549b037c139444a4cf
react-native-document-picker: 644b4c5658f9d781a2ac4c4625ef414c8f797083
react-native-fingerprint-scanner: c68136ca57e3704d7bdf5faa554ea535ce15b1d0
react-native-idle-timer: 97b8283237d45146a7a5c25bdebe9e1e85f3687b
react-native-image-picker: 66c0f718c18edab67b6c7b2c63c6566060066127
@ -763,7 +763,7 @@ SPEC CHECKSUMS:
React-RCTVibration: 24600e3b1aaa77126989bc58b6747509a1ba14f3
React-runtimeexecutor: a9904c6d0218fb9f8b19d6dd88607225927668f9
ReactCommon: 149906e01aa51142707a10665185db879898e966
RealmJS: 2925b36a86fc179b0b58ad48386e43eb95188e9a
RealmJS: de65cc7c3ea041750d66beaa28b30585222c3d94
RemobileReactNativeQrcodeLocalImage: 57aadc12896b148fb5e04bc7c6805f3565f5c3fa
rn-ldk: 226ee19483257c6eef96dc243483c0908cb54e8f
RNCAsyncStorage: 4b6538222ce3f01f61011f512226ba3aaa0dc336
@ -775,7 +775,7 @@ SPEC CHECKSUMS:
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
RNHandoff: d3b0754cca3a6bcd9b25f544f733f7f033ccf5fa
RNKeychain: 4f63aada75ebafd26f4bc2c670199461eab85d94
RNLocalize: 1eef69bd5381453aba05acadc26dc7c5bd450091
RNLocalize: b8980509fc4db6895953aa95b90c8d81cb984603
RNPrivacySnapshot: 71919dde3c6a29dd332115409c2aec564afee8f4
RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
RNRate: 622db602051b6abf6ec467cdcc3c5e3112076745

13
package-lock.json generated
View File

@ -19746,8 +19746,11 @@
"integrity": "sha512-92676ZWHZHsPM/EW1ulgb2MuVfjYfMWRTWMbLcrCsipkcMaZ9Traz5mpsnCS7KZpsOksnvUinzDIjsct2XGc6Q=="
},
"react-native-document-picker": {
"version": "git+ssh://git@github.com/BlueWallet/react-native-document-picker.git#3684d4fcc2bc0b47c32be39024e4796004c3e428",
"from": "react-native-document-picker@https://github.com/BlueWallet/react-native-document-picker#3684d4fcc2bc0b47c32be39024e4796004c3e428"
"version": "git+ssh://git@github.com/BlueWallet/react-native-document-picker.git#c52e7a6d2a08f5506c23de86c1401775419f772c",
"from": "react-native-document-picker@https://github.com/BlueWallet/react-native-document-picker#c52e7a6d2a08f5506c23de86c1401775419f772c",
"requires": {
"invariant": "^2.2.4"
}
},
"react-native-elements": {
"version": "3.4.2",
@ -19867,9 +19870,9 @@
"integrity": "sha512-HDwEaXcQIuXXCV70O+bK1rizFong3wj+5Q/jSyifKFLg0VWF95xh8XQgfzXwtq0NggL9vNjPKXa016KuFu+VFg=="
},
"react-native-localize": {
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/react-native-localize/-/react-native-localize-2.1.6.tgz",
"integrity": "sha512-3vwo+bx/jm4yPlXi3OORj4vWav9EQnU+e1aaG4EpfGt6v9goMn5CJSIfA4Vu1ohL3hfL8QUHj20TvKJsdMpfXQ=="
"version": "2.1.7",
"resolved": "https://registry.npmjs.org/react-native-localize/-/react-native-localize-2.1.7.tgz",
"integrity": "sha512-phimOUtDLiqY2ba7Rjk9KpuaVSo7iGMNnwr7rjBVqlhmtTF3ShQ1FPFPxOyUrzDU9jLtj1xMi7MXWYuiVg660Q=="
},
"react-native-modal": {
"version": "12.1.0",

View File

@ -148,7 +148,7 @@
"react-native-crypto": "2.2.0",
"react-native-default-preference": "1.4.3",
"react-native-device-info": "8.4.8",
"react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#3684d4fcc2bc0b47c32be39024e4796004c3e428",
"react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#c52e7a6d2a08f5506c23de86c1401775419f772c",
"react-native-elements": "3.4.2",
"react-native-fingerprint-scanner": "https://github.com/BlueWallet/react-native-fingerprint-scanner#ce644673681716335d786727bab998f7e632ab5e",
"react-native-fs": "2.18.0",

View File

@ -7,7 +7,6 @@ import { decodeUR, extractSingleWorkload, BlueURDecoder } from '../../blue_modul
import { useNavigation, useRoute, useIsFocused, useTheme } from '@react-navigation/native';
import loc from '../../loc';
import { BlueLoading, BlueText, BlueButton, BlueSpacing40 } from '../../BlueComponents';
import { BlueCurrentTheme } from '../../components/themes';
import { openPrivacyDesktopSettings } from '../../class/camera';
import alert from '../../components/Alert';
@ -77,12 +76,8 @@ const styles = StyleSheet.create({
height: '50%',
marginTop: 5,
marginHorizontal: 20,
borderColor: BlueCurrentTheme.colors.formBorder,
borderBottomColor: BlueCurrentTheme.colors.formBorder,
borderWidth: 1,
borderRadius: 4,
backgroundColor: BlueCurrentTheme.colors.inputBackgroundColor,
color: BlueCurrentTheme.colors.foregroundColor,
textAlignVertical: 'top',
},
});
@ -108,6 +103,12 @@ const ScanQRCode = () => {
backgroundColor: colors.brandingColor,
},
progressWrapper: { backgroundColor: colors.brandingColor, borderColor: colors.foregroundColor, borderWidth: 4 },
backdoorInput: {
borderColor: colors.formBorder,
borderBottomColor: colors.formBorder,
backgroundColor: colors.inputBackgroundColor,
color: colors.foregroundColor,
},
});
const HashIt = function (s) {
return createHash('sha256').update(s).digest().toString('hex');
@ -354,7 +355,7 @@ const ScanQRCode = () => {
testID="scanQrBackdoorInput"
multiline
underlineColorAndroid="transparent"
style={styles.backdoorInput}
style={[styles.backdoorInput, stylesHook.backdoorInput]}
autoCorrect={false}
autoCapitalize="none"
spellCheck={false}