From ba96aaaf2402283ed30d71d66cab1e44d37fca3c Mon Sep 17 00:00:00 2001 From: marcosrdz Date: Tue, 23 Mar 2021 18:39:19 -0400 Subject: [PATCH] WIP --- BlueComponents.js | 8 ++++---- components/WalletsCarousel.js | 11 +++++++---- screen/wallets/reorderWallets.js | 8 ++++---- screen/wallets/selectWallet.js | 8 ++++---- tests/integration/hd-segwit-p2sh-wallet.test.js | 3 +-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/BlueComponents.js b/BlueComponents.js index 9bc094b8e..da97420da 100644 --- a/BlueComponents.js +++ b/BlueComponents.js @@ -330,11 +330,11 @@ export class BlueWalletNavigationHeader extends Component { source={(() => { switch (this.state.wallet.type) { case LightningCustodianWallet.type: - return require('./img/lnd-shape.png'); + return I18nManager.isRTL ? require('./img/lnd-shape-rtl.png') : require('./img/lnd-shape.png'); case MultisigHDWallet.type: - return require('./img/vault-shape.png'); + return I18nManager.isRTL ? require('./img/vault-shape-rtl.png') : require('./img/vault-shape.png'); default: - return require('./img/btc-shape.png'); + return I18nManager.isRTL ? require('./img/btc-shape-rtl.png') : require('./img/btc-shape.png'); } })()} style={{ @@ -580,7 +580,7 @@ const styleCopyTextToClipboard = StyleSheet.create({ export const SafeBlueArea = props => { const { style, ...nonStyleProps } = props; const { colors } = useTheme(); - const baseStyle = { flex: 1, backgroundColor: colors.background } + const baseStyle = { flex: 1, backgroundColor: colors.background }; return ; }; diff --git a/components/WalletsCarousel.js b/components/WalletsCarousel.js index 90e263d17..b5489f4d4 100644 --- a/components/WalletsCarousel.js +++ b/components/WalletsCarousel.js @@ -174,7 +174,10 @@ const WalletCarouselItem = ({ item, index, onPress, handleLongPress, isSelectedW }} > - + {item.getIsFailure() ? loc.wallets.import_placeholder_fail : loc.wallets.import_placeholder_inprogress} @@ -196,13 +199,13 @@ const WalletCarouselItem = ({ item, index, onPress, handleLongPress, isSelectedW let image; switch (item.type) { case LightningCustodianWallet.type: - image = require('../img/lnd-shape.png'); + image = I18nManager.isRTL ? require('../img/lnd-shape-rtl.png') : require('../img/lnd-shape.png'); break; case MultisigHDWallet.type: - image = require('../img/vault-shape.png'); + image = I18nManager.isRTL ? require('../img/vault-shape-rtl.png') : require('../img/vault-shape.png'); break; default: - image = require('../img/btc-shape.png'); + image = I18nManager.isRTL ? require('../img/btc-shape-rtl.png') : require('../img/btc-shape.png'); } const latestTransactionText = diff --git a/screen/wallets/reorderWallets.js b/screen/wallets/reorderWallets.js index f0588384e..b33c52b7f 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, StyleSheet, StatusBar, ScrollView } from 'react-native'; +import { View, ActivityIndicator, Image, Text, I18nManager, StyleSheet, StatusBar, ScrollView } from 'react-native'; import { BluePrivateBalance } from '../../BlueComponents'; import SortableList from 'react-native-sortable-list'; import LinearGradient from 'react-native-linear-gradient'; @@ -123,11 +123,11 @@ const ReorderWallets = () => { source={(() => { switch (item.type) { case LightningCustodianWallet.type: - return require('../../img/lnd-shape.png'); + return I18nManager.isRTL ? require('../../img/lnd-shape-rtl.png') : require('../../img/lnd-shape.png'); case MultisigHDWallet.type: - return require('../../img/vault-shape.png'); + return I18nManager.isRTL ? require('../../img/vault-shape-rtl.png') : require('../../img/vault-shape.png'); default: - return require('../../img/btc-shape.png'); + return I18nManager.isRTL ? require('../../img/btc-shape-rtl.png') : require('../../img/btc-shape.png'); } })()} style={styles.image} diff --git a/screen/wallets/selectWallet.js b/screen/wallets/selectWallet.js index 283426a75..1bd694a4f 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 } from 'react-native'; +import { View, ActivityIndicator, Image, Text, TouchableOpacity, FlatList, StyleSheet, StatusBar, I18nManager } from 'react-native'; import LinearGradient from 'react-native-linear-gradient'; import ReactNativeHapticFeedback from 'react-native-haptic-feedback'; import { useRoute, useTheme } from '@react-navigation/native'; @@ -106,11 +106,11 @@ const SelectWallet = () => { source={(() => { switch (item.type) { case LightningCustodianWallet.type: - return require('../../img/lnd-shape.png'); + return I18nManager.isRTL ? require('../../img/lnd-shape-rtl.png') : require('../../img/lnd-shape.png'); case MultisigHDWallet.type: - return require('../../img/vault-shape.png'); + return I18nManager.isRTL ? require('../../img/vault-shape-rtl.png') : require('../../img/vault-shape.png'); default: - return require('../../img/btc-shape.png'); + return I18nManager.isRTL ? require('../../img/btc-shape-rtl.png') : require('../../img/btc-shape.png'); } })()} style={styles.image} diff --git a/tests/integration/hd-segwit-p2sh-wallet.test.js b/tests/integration/hd-segwit-p2sh-wallet.test.js index 7641ca206..a85026053 100644 --- a/tests/integration/hd-segwit-p2sh-wallet.test.js +++ b/tests/integration/hd-segwit-p2sh-wallet.test.js @@ -155,8 +155,7 @@ it('HD (BIP49) can create TX', async () => { tx = bitcoin.Transaction.fromHex(txNew.tx.toHex()); assert.strictEqual(tx.outs.length, 2); assert.ok(tx.outs[0].value > 50000); - assert.strictEqual(tx.outs[1].value, 25000 - ); + assert.strictEqual(tx.outs[1].value, 25000); }); it('Segwit HD (BIP49) can fetch balance with many used addresses in hierarchy', async function () {