mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2025-02-21 14:34:55 +01:00
FIX: Electrum ports settings were missing keyboard type
This commit is contained in:
parent
bd64b3fe48
commit
cab798fc39
3 changed files with 72 additions and 14 deletions
|
@ -249,13 +249,13 @@ PODS:
|
|||
- React
|
||||
- react-native-blur (0.8.0):
|
||||
- React
|
||||
- react-native-camera (3.43.1):
|
||||
- react-native-camera (3.43.2):
|
||||
- React-Core
|
||||
- react-native-camera/RCT (= 3.43.1)
|
||||
- react-native-camera/RN (= 3.43.1)
|
||||
- react-native-camera/RCT (3.43.1):
|
||||
- react-native-camera/RCT (= 3.43.2)
|
||||
- react-native-camera/RN (= 3.43.2)
|
||||
- react-native-camera/RCT (3.43.2):
|
||||
- React-Core
|
||||
- react-native-camera/RN (3.43.1):
|
||||
- react-native-camera/RN (3.43.2):
|
||||
- React-Core
|
||||
- react-native-document-picker (3.5.4):
|
||||
- React
|
||||
|
@ -345,7 +345,7 @@ PODS:
|
|||
- React
|
||||
- RemobileReactNativeQrcodeLocalImage (1.0.4):
|
||||
- React
|
||||
- RNCAsyncStorage (1.14.1):
|
||||
- RNCAsyncStorage (1.15.1):
|
||||
- React-Core
|
||||
- RNCClipboard (1.7.0):
|
||||
- React-Core
|
||||
|
@ -375,8 +375,35 @@ PODS:
|
|||
- React
|
||||
- RNReactNativeHapticFeedback (1.11.0):
|
||||
- React-Core
|
||||
- RNReanimated (1.13.2):
|
||||
- RNReanimated (2.0.1):
|
||||
- DoubleConversion
|
||||
- FBLazyVector
|
||||
- FBReactNativeSpec
|
||||
- Folly
|
||||
- glog
|
||||
- RCTRequired
|
||||
- RCTTypeSafety
|
||||
- React
|
||||
- React-callinvoker
|
||||
- React-Core
|
||||
- React-Core/DevSupport
|
||||
- React-Core/RCTWebSocket
|
||||
- React-CoreModules
|
||||
- React-cxxreact
|
||||
- React-jsi
|
||||
- React-jsiexecutor
|
||||
- React-jsinspector
|
||||
- React-RCTActionSheet
|
||||
- React-RCTAnimation
|
||||
- React-RCTBlob
|
||||
- React-RCTImage
|
||||
- React-RCTLinking
|
||||
- React-RCTNetwork
|
||||
- React-RCTSettings
|
||||
- React-RCTText
|
||||
- React-RCTVibration
|
||||
- ReactCommon/turbomodule/core
|
||||
- Yoga
|
||||
- RNScreens (2.18.1):
|
||||
- React-Core
|
||||
- RNSecureKeyStore (1.0.0):
|
||||
|
@ -697,7 +724,7 @@ SPEC CHECKSUMS:
|
|||
React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
|
||||
react-native-blue-crypto: 23f1558ad3d38d7a2edb7e2f6ed1bc520ed93e56
|
||||
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
|
||||
react-native-camera: e3098d679484282acf95f7a346ede7dbfbe46393
|
||||
react-native-camera: 3333256bb222adc7592b4a8f153ee392b5b0ddf1
|
||||
react-native-document-picker: c5752781fbc0c126c627c1549b037c139444a4cf
|
||||
react-native-fingerprint-scanner: c68136ca57e3704d7bdf5faa554ea535ce15b1d0
|
||||
react-native-idle-timer: 97b8283237d45146a7a5c25bdebe9e1e85f3687b
|
||||
|
@ -721,7 +748,7 @@ SPEC CHECKSUMS:
|
|||
ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
|
||||
RealmJS: 5195064e9aeccf94ae3756bd9d0f2301b9074b07
|
||||
RemobileReactNativeQrcodeLocalImage: 57aadc12896b148fb5e04bc7c6805f3565f5c3fa
|
||||
RNCAsyncStorage: 1ab3f6ec0bc2c676dad4a00471d4c9d1a2cf68a2
|
||||
RNCAsyncStorage: 11080f1edfb382991959746b580a2dae29e75da0
|
||||
RNCClipboard: dac13db8b1ce9b998f1cbc7ca33440113602847f
|
||||
RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459
|
||||
RNCPushNotificationIOS: 5b1cf9ad2aaa107ecb92d5d2d7005ba521b2b97a
|
||||
|
@ -736,7 +763,7 @@ SPEC CHECKSUMS:
|
|||
RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
|
||||
RNRate: 2b31dad120cd1b78e33c6034808561c386a3dddf
|
||||
RNReactNativeHapticFeedback: 653a8c126a0f5e88ce15ffe280b3ff37e1fbb285
|
||||
RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad
|
||||
RNReanimated: c5e9d841d33ed7f83861462756cec7146e73afaa
|
||||
RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
|
||||
RNSecureKeyStore: f1ad870e53806453039f650720d2845c678d89c8
|
||||
RNSentry: b0d55027200c96f52e26b9bfb20296d47fc5051d
|
||||
|
|
4
package-lock.json
generated
4
package-lock.json
generated
|
@ -19708,6 +19708,10 @@
|
|||
"object-assign": "^4.1.1"
|
||||
}
|
||||
},
|
||||
"scryptsy": {
|
||||
"version": "file:blue_modules/scryptsy",
|
||||
"integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w=="
|
||||
},
|
||||
"secp256k1": {
|
||||
"version": "3.8.0",
|
||||
"resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
|
||||
|
|
|
@ -1,18 +1,28 @@
|
|||
/* global alert */
|
||||
import React, { Component } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { Alert, View, TextInput, TouchableOpacity, StyleSheet } from 'react-native';
|
||||
import { Alert, View, TextInput, TouchableOpacity, StyleSheet, ScrollView, Keyboard } from 'react-native';
|
||||
import DefaultPreference from 'react-native-default-preference';
|
||||
import RNWidgetCenter from 'react-native-widget-center';
|
||||
import AsyncStorage from '@react-native-async-storage/async-storage';
|
||||
import { ScrollView } from 'react-native-gesture-handler';
|
||||
|
||||
import loc from '../../loc';
|
||||
import { AppStorage } from '../../class';
|
||||
import DeeplinkSchemaMatch from '../../class/deeplink-schema-match';
|
||||
import navigationStyle from '../../components/navigationStyle';
|
||||
import { BlueButton, BlueButtonLink, BlueCard, BlueLoading, BlueSpacing20, BlueText, SafeBlueArea } from '../../BlueComponents';
|
||||
import {
|
||||
BlueButton,
|
||||
BlueButtonLink,
|
||||
BlueCard,
|
||||
BlueLoading,
|
||||
BlueSpacing20,
|
||||
BlueText,
|
||||
SafeBlueArea,
|
||||
BlueDoneAndDismissKeyboardInputAccessory,
|
||||
BlueDismissKeyboardInputAccessory,
|
||||
} from '../../BlueComponents';
|
||||
import { BlueCurrentTheme } from '../../components/themes';
|
||||
|
||||
const BlueElectrum = require('../../blue_modules/BlueElectrum');
|
||||
|
||||
export default class ElectrumSettings extends Component {
|
||||
|
@ -216,7 +226,7 @@ export default class ElectrumSettings extends Component {
|
|||
|
||||
return (
|
||||
<SafeBlueArea>
|
||||
<ScrollView>
|
||||
<ScrollView keyboardShouldPersistTaps="always">
|
||||
<BlueCard>
|
||||
<BlueText style={styles.status}>{loc.settings.electrum_status}</BlueText>
|
||||
<View style={styles.connectWrap}>
|
||||
|
@ -254,8 +264,19 @@ export default class ElectrumSettings extends Component {
|
|||
autoCorrect={false}
|
||||
autoCapitalize="none"
|
||||
underlineColorAndroid="transparent"
|
||||
inputAccessoryViewID={BlueDoneAndDismissKeyboardInputAccessory.InputAccessoryViewID}
|
||||
testID="HostInput"
|
||||
/>
|
||||
<BlueDoneAndDismissKeyboardInputAccessory
|
||||
onClearTapped={() => {
|
||||
this.setState({ host: '' });
|
||||
Keyboard.dismiss();
|
||||
}}
|
||||
onPasteTapped={text => {
|
||||
this.setState({ host: text.trim() });
|
||||
Keyboard.dismiss();
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
<BlueSpacing20 />
|
||||
<View style={styles.inputWrap}>
|
||||
|
@ -270,6 +291,8 @@ export default class ElectrumSettings extends Component {
|
|||
underlineColorAndroid="transparent"
|
||||
autoCorrect={false}
|
||||
autoCapitalize="none"
|
||||
keyboardType="number-pad"
|
||||
inputAccessoryViewID={BlueDismissKeyboardInputAccessory.InputAccessoryViewID}
|
||||
testID="PortInput"
|
||||
/>
|
||||
</View>
|
||||
|
@ -285,10 +308,14 @@ export default class ElectrumSettings extends Component {
|
|||
autoCorrect={false}
|
||||
placeholderTextColor="#81868e"
|
||||
autoCapitalize="none"
|
||||
keyboardType="number-pad"
|
||||
underlineColorAndroid="transparent"
|
||||
inputAccessoryViewID={BlueDismissKeyboardInputAccessory.InputAccessoryViewID}
|
||||
testID="SSLPortInput"
|
||||
/>
|
||||
<BlueDismissKeyboardInputAccessory />
|
||||
</View>
|
||||
<BlueSpacing20 />
|
||||
<BlueText style={styles.torSupported}>{loc.settings.tor_supported}</BlueText>
|
||||
<BlueSpacing20 />
|
||||
<BlueButtonLink title={loc.wallets.import_scan_qr} onPress={this.importScan} />
|
||||
|
|
Loading…
Add table
Reference in a new issue