From 8c014d083729ac88e1b126e986e430d3d71735e9 Mon Sep 17 00:00:00 2001 From: marcosrdz Date: Tue, 23 Mar 2021 21:46:59 -0400 Subject: [PATCH] WIP --- components/WalletsCarousel.js | 13 +++++-------- ios/Podfile.lock | 16 ++++++++-------- screen/wallets/reorderWallets.js | 10 +++++----- screen/wallets/selectWallet.js | 10 +++++----- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/components/WalletsCarousel.js b/components/WalletsCarousel.js index b5489f4d4..24b6b1306 100644 --- a/components/WalletsCarousel.js +++ b/components/WalletsCarousel.js @@ -92,7 +92,7 @@ const iStyles = StyleSheet.create({ height: 94, position: 'absolute', bottom: 0, - right: 0, + ...(I18nManager.isRTL ? { left: 0 } : { right: 0 }), }, br: { backgroundColor: 'transparent', @@ -174,10 +174,7 @@ const WalletCarouselItem = ({ item, index, onPress, handleLongPress, isSelectedW }} > - + {item.getIsFailure() ? loc.wallets.import_placeholder_fail : loc.wallets.import_placeholder_inprogress} @@ -199,13 +196,13 @@ const WalletCarouselItem = ({ item, index, onPress, handleLongPress, isSelectedW let image; switch (item.type) { case LightningCustodianWallet.type: - image = I18nManager.isRTL ? require('../img/lnd-shape-rtl.png') : require('../img/lnd-shape.png'); + image = require('../img/lnd-shape.png'); break; case MultisigHDWallet.type: - image = I18nManager.isRTL ? require('../img/vault-shape-rtl.png') : require('../img/vault-shape.png'); + image = require('../img/vault-shape.png'); break; default: - image = I18nManager.isRTL ? require('../img/btc-shape-rtl.png') : require('../img/btc-shape.png'); + image = require('../img/btc-shape.png'); } const latestTransactionText = diff --git a/ios/Podfile.lock b/ios/Podfile.lock index fcc3c0b0f..460aa41ab 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -355,11 +355,11 @@ PODS: - React-Core - RNDefaultPreference (1.4.3): - React - - RNDeviceInfo (8.0.1): + - RNDeviceInfo (8.0.2): - React-Core - RNFS (2.16.6): - React - - RNGestureHandler (1.10.2): + - RNGestureHandler (1.10.3): - React-Core - RNHandoff (0.0.3): - React @@ -377,14 +377,14 @@ PODS: - React-Core - RNReanimated (1.13.2): - React-Core - - RNScreens (2.17.1): + - RNScreens (2.18.0): - React-Core - RNSecureKeyStore (1.0.0): - React - RNSentry (1.9.0): - React-Core - Sentry (~> 5.2.0) - - RNShare (5.1.3): + - RNShare (5.1.4): - React-Core - RNSVG (12.1.0): - React @@ -726,9 +726,9 @@ SPEC CHECKSUMS: RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459 RNCPushNotificationIOS: 5b1cf9ad2aaa107ecb92d5d2d7005ba521b2b97a RNDefaultPreference: 21816c0a6f61a2829ccc0cef034392e9b509ee5f - RNDeviceInfo: 54401b60514387f9120ab8265be5ed9103d842b9 + RNDeviceInfo: 71696ed3282a5058d08378a17d78d7367d9496e5 RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df - RNGestureHandler: e66feb0fda7da74ea6a3094656b3c1efe05f5c07 + RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 RNHandoff: d3b0754cca3a6bcd9b25f544f733f7f033ccf5fa RNInAppBrowser: 3733c1aa6699983a1c9b4963e85d5e5a48ad297e RNLocalize: 47e22ef8c36df1d572e42a87c8ae22e3fcf551dd @@ -737,10 +737,10 @@ SPEC CHECKSUMS: RNRate: 2b31dad120cd1b78e33c6034808561c386a3dddf RNReactNativeHapticFeedback: 653a8c126a0f5e88ce15ffe280b3ff37e1fbb285 RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad - RNScreens: b6c9607e6fe47c1b6e2f1910d2acd46dd7ecea3a + RNScreens: f0d7a2a440a8ba9f4574ca1ddb3368f473891be4 RNSecureKeyStore: f1ad870e53806453039f650720d2845c678d89c8 RNSentry: 1adaa43b01c6a3ab5091d4d1add66b7c58558898 - RNShare: d98667ee0277d9cd068041e5f316a5fe67aa8536 + RNShare: 8af5349f05fc042d230674dd650d19789187ff9c RNSVG: ce9d996113475209013317e48b05c21ee988d42e RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59 RNWatch: e4c5d19506c94506860032fb68aedd5991beb985 diff --git a/screen/wallets/reorderWallets.js b/screen/wallets/reorderWallets.js index b33c52b7f..fedd4f7b3 100644 --- a/screen/wallets/reorderWallets.js +++ b/screen/wallets/reorderWallets.js @@ -1,5 +1,5 @@ import React, { useEffect, useState, useRef, useContext } from 'react'; -import { View, ActivityIndicator, Image, Text, I18nManager, StyleSheet, StatusBar, ScrollView } from 'react-native'; +import { View, ActivityIndicator, Image, Text, StyleSheet, StatusBar, ScrollView, I18nManager } from 'react-native'; import { BluePrivateBalance } from '../../BlueComponents'; import SortableList from 'react-native-sortable-list'; import LinearGradient from 'react-native-linear-gradient'; @@ -36,7 +36,7 @@ const styles = StyleSheet.create({ height: 94, position: 'absolute', bottom: 0, - right: 0, + ...(I18nManager.isRTL ? { left: 0 } : { right: 0 }), }, transparentText: { backgroundColor: 'transparent', @@ -123,11 +123,11 @@ const ReorderWallets = () => { source={(() => { switch (item.type) { case LightningCustodianWallet.type: - return I18nManager.isRTL ? require('../../img/lnd-shape-rtl.png') : require('../../img/lnd-shape.png'); + return require('../../img/lnd-shape.png'); case MultisigHDWallet.type: - return I18nManager.isRTL ? require('../../img/vault-shape-rtl.png') : require('../../img/vault-shape.png'); + return require('../../img/vault-shape.png'); default: - return I18nManager.isRTL ? require('../../img/btc-shape-rtl.png') : require('../../img/btc-shape.png'); + return require('../../img/btc-shape.png'); } })()} style={styles.image} diff --git a/screen/wallets/selectWallet.js b/screen/wallets/selectWallet.js index 1bd694a4f..c421a1591 100644 --- a/screen/wallets/selectWallet.js +++ b/screen/wallets/selectWallet.js @@ -1,6 +1,6 @@ /* eslint-disable react/prop-types */ import React, { useContext, useEffect, useState } from 'react'; -import { View, ActivityIndicator, Image, Text, TouchableOpacity, FlatList, StyleSheet, StatusBar, I18nManager } from 'react-native'; +import { View, ActivityIndicator, Image, Text, TouchableOpacity, I18nManager, FlatList, StyleSheet, StatusBar } from 'react-native'; import LinearGradient from 'react-native-linear-gradient'; import ReactNativeHapticFeedback from 'react-native-haptic-feedback'; import { useRoute, useTheme } from '@react-navigation/native'; @@ -50,7 +50,7 @@ const SelectWallet = () => { height: 94, position: 'absolute', bottom: 0, - right: 0, + ...(I18nManager.isRTL ? { left: 0 } : { right: 0 }), }, transparentText: { backgroundColor: 'transparent', @@ -106,11 +106,11 @@ const SelectWallet = () => { source={(() => { switch (item.type) { case LightningCustodianWallet.type: - return I18nManager.isRTL ? require('../../img/lnd-shape-rtl.png') : require('../../img/lnd-shape.png'); + return require('../../img/lnd-shape.png'); case MultisigHDWallet.type: - return I18nManager.isRTL ? require('../../img/vault-shape-rtl.png') : require('../../img/vault-shape.png'); + return require('../../img/vault-shape.png'); default: - return I18nManager.isRTL ? require('../../img/btc-shape-rtl.png') : require('../../img/btc-shape.png'); + return require('../../img/btc-shape.png'); } })()} style={styles.image}