Merge branch 'master' into rn738

components/TooltipMenu.ios.js

@@ -6,7 +6,7 @@ import { TouchableOpacity } from 'react-native';
 const BaseToolTipMenu = (props, ref) => {
   const menuItemMapped = ({ action, menuOptions }) => {
     const item = {
-      actionKey: action.id,
+      actionKey: action.id.toString(),
       actionTitle: action.text,
       icon: action.icon,
       menuOptions,

screen/send/details.js

@@ -334,7 +334,7 @@ const SendDetails = () => {
   // we need to re-calculate fees if user opens-closes coin control
   useFocusEffect(
     useCallback(() => {
-      LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
+      setIsLoading(false);
       setDumb(v => !v);
     }, []),
   );

screen/settings/electrumSettings.js

@@ -31,11 +31,12 @@ import { BlueCurrentTheme } from '../../components/themes';
 import { reloadAllTimelines } from '../../components/WidgetCommunication';
 import { BlueStorageContext } from '../../blue_modules/storage-context';
 import presentAlert from '../../components/Alert';
-import { requestCameraAuthorization } from '../../helpers/scan-qr';
+import { scanQrHelper } from '../../helpers/scan-qr';
 import Button from '../../components/Button';
 import ListItem from '../../components/ListItem';
 import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback';
 import * as BlueElectrum from '../../blue_modules/BlueElectrum';
+import { navigationRef } from '../../NavigationService';
 
 export default class ElectrumSettings extends Component {
   static contextType = BlueStorageContext;
@@ -225,17 +226,9 @@ export default class ElectrumSettings extends Component {
     });
   };
 
-  importScan = () => {
-    requestCameraAuthorization().then(() =>
-      this.props.navigation.navigate('ScanQRCodeRoot', {
-        screen: 'ScanQRCode',
-        params: {
-          launchedBy: this.props.route.name,
-          onBarScanned: this.onBarScanned,
-          showFileImportButton: true,
-        },
-      }),
-    );
+  importScan = async () => {
+    const scanned = await scanQrHelper(navigationRef.navigate, 'ElectrumSettings', true);
+    this.onBarScanned(scanned);
   };
 
   useSSLPortToggled = value => {

screen/wallets/PaymentCodesList.tsx

@@ -107,7 +107,7 @@ export default function PaymentCodesList() {
   };
 
   const onToolTipPress = async (id: any, pc: string) => {
-    if (id === Actions.copyToClipboard) {
+    if (String(id) === String(Actions.copyToClipboard)) {
       Clipboard.setString(pc);
       presentAlert({ message: loc.bip47.copied });
     }
@@ -256,12 +256,12 @@ const styles = StyleSheet.create({
   },
   sectionListContainer: { flex: 1, width: '100%' },
   circle: {
-    width: 42,
-    height: 42,
+    width: 35,
+    height: 35,
     borderRadius: 25,
   },
   contactRowBody: { flex: 6, justifyContent: 'center', top: -3 },
-  contactRowNameText: { marginLeft: 10, fontSize: 20, fontWeight: 'bold' },
+  contactRowNameText: { marginLeft: 10, fontSize: 16 },
   contactRowContainer: { flexDirection: 'row', padding: 15 },
   stick: { borderStyle: 'solid', borderWidth: 0.5, borderColor: 'gray', opacity: 0.5, top: 0, left: -10, width: '110%' },
 });