From 8649e5172c3b125a86fee10b0683a709026620bd Mon Sep 17 00:00:00 2001 From: Nuno Coelho Date: Sat, 2 Nov 2019 21:58:55 +0100 Subject: [PATCH] REF: mnemonic backup screen --- ios/fastlane/metadata/en-US/release_notes.txt | 37 +- loc/ZAR_Afr.js | 2 +- loc/ZAR_Xho.js | 2 +- loc/cs_CZ.js | 2 +- loc/da_DK.js | 2 +- loc/de_DE.js | 2 +- loc/el.js | 2 +- loc/en.js | 2 +- loc/es.js | 2 +- loc/fi_FI.js | 2 +- loc/fr_FR.js | 2 +- loc/hr_HR.js | 2 +- loc/hu_HU.js | 3 +- loc/id_ID.js | 2 +- loc/it.js | 2 +- loc/nb_NO.js | 2 +- loc/nl_NL.js | 2 +- loc/pt_BR.js | 3 +- loc/pt_PT.js | 2 +- loc/ru.js | 2 +- loc/sv_SE.js | 2 +- loc/th_TH.js | 2 +- loc/tr_TR.js | 2 +- loc/ua.js | 2 +- loc/vi_VN.js | 2 +- loc/zh_cn.js | 2 +- loc/zh_tw.js | 2 +- screen/receive/details.js | 3 +- screen/wallets/pleaseBackup.js | 523 ++++++++++++------ screen/wallets/transactions.js | 2 +- 30 files changed, 397 insertions(+), 222 deletions(-) diff --git a/ios/fastlane/metadata/en-US/release_notes.txt b/ios/fastlane/metadata/en-US/release_notes.txt index 821ccfbe1..00f6a6829 100644 --- a/ios/fastlane/metadata/en-US/release_notes.txt +++ b/ios/fastlane/metadata/en-US/release_notes.txt @@ -1,3 +1,11 @@ +v4.7.1 +====== + +* ADD: Lapp browser +* FIX: White screen on boot +* FIX: Lightning wallet was not shown on Watch app +* DEL: Auto brightenss + v4.7.0 ====== @@ -27,31 +35,4 @@ v4.5.2 ====== * FIX: NaN when sending onchain -* FIX: RBF tx memo porting - -v4.5.0 -====== - -* ADD: Batch send TX -* ADD: handle lnurl clicks -* ADD: Afrikaans and Xhosa Translation -* ADD: Chinese traditional language -* ADD: Go straight to camera for scan. -* ADD: Vietnamise -* ADD: Splash screen animation -* ADD: Auto adjust screen brightness on screens with QRCode. -* ADD: Provide fee bump suggestions. -* REF: Use PSBT for segwit wallets -* FIX: Allow custom lndhub http calls -* FIX: Marketplace App Store Guidelines -* FIX: Remove launch screen icon -* FIX: Fix Send Max -* FIX: Don't display send modal if address belongs to self -* FIX: Select fastest fee by default -* FIX: Fixed BIP70 processing -* FIX: pt_PT translation -* FIX: Varios UI fixes to accomodate additional screen sizes -* FIX: Add warning to or restrict delete wallet option when it has balance -* FIX: Seed phrase import issues -* FIX: Increased speed for wallet unit change -* FIX: Fixed UI for transaction status +* FIX: RBF tx memo porting \ No newline at end of file diff --git a/loc/ZAR_Afr.js b/loc/ZAR_Afr.js index 6e906e647..7b18a3b62 100644 --- a/loc/ZAR_Afr.js +++ b/loc/ZAR_Afr.js @@ -221,7 +221,7 @@ pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/ZAR_Xho.js b/loc/ZAR_Xho.js index 8359421ec..b31c1deb6 100644 --- a/loc/ZAR_Xho.js +++ b/loc/ZAR_Xho.js @@ -224,7 +224,7 @@ pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/cs_CZ.js b/loc/cs_CZ.js index 55380caea..bb7a41b88 100644 --- a/loc/cs_CZ.js +++ b/loc/cs_CZ.js @@ -228,7 +228,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/da_DK.js b/loc/da_DK.js index efd91e478..1fb863e2c 100644 --- a/loc/da_DK.js +++ b/loc/da_DK.js @@ -227,7 +227,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/de_DE.js b/loc/de_DE.js index 058b8d7fb..a330646b3 100644 --- a/loc/de_DE.js +++ b/loc/de_DE.js @@ -232,7 +232,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/el.js b/loc/el.js index a93c1f1a5..1036bd760 100644 --- a/loc/el.js +++ b/loc/el.js @@ -231,7 +231,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/en.js b/loc/en.js index 7d9218ca1..92ecfdb81 100644 --- a/loc/en.js +++ b/loc/en.js @@ -229,7 +229,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/es.js b/loc/es.js index 74801327c..edaa2bde3 100644 --- a/loc/es.js +++ b/loc/es.js @@ -232,7 +232,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/fi_FI.js b/loc/fi_FI.js index 2d500a998..e1d4c2157 100644 --- a/loc/fi_FI.js +++ b/loc/fi_FI.js @@ -231,7 +231,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/fr_FR.js b/loc/fr_FR.js index a66c590a8..9084827bd 100644 --- a/loc/fr_FR.js +++ b/loc/fr_FR.js @@ -231,7 +231,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/hr_HR.js b/loc/hr_HR.js index e30f55b61..e3aa5e47c 100644 --- a/loc/hr_HR.js +++ b/loc/hr_HR.js @@ -226,7 +226,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/hu_HU.js b/loc/hu_HU.js index 262baef47..e2b668977 100644 --- a/loc/hu_HU.js +++ b/loc/hu_HU.js @@ -228,8 +228,7 @@ module.exports = { title: 'A tárcád elkészült...', text: 'Kérlek írd le az alábbi emlékeztető szavakat egy papírlapra, és tedd el egy biztonságos helyre. ' + - 'Ez egy biztonsági mentés, amellyel helyreállíthatod a tárcádat egy másik eszközön. Helyreállításhoz ' + - 'használhatod az Electrum tárcát (https://electrum.org/) az asztali számítógépeden.', + 'Ez egy biztonsági mentés, amellyel helyreállíthatod a tárcádat egy másik eszközön.', ok: 'Rendben, leírtam!', }, lndViewInvoice: { diff --git a/loc/id_ID.js b/loc/id_ID.js index 5edb33eb6..3aaa9df68 100644 --- a/loc/id_ID.js +++ b/loc/id_ID.js @@ -228,7 +228,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/it.js b/loc/it.js index ec8dbd1fb..5f7ffc16d 100644 --- a/loc/it.js +++ b/loc/it.js @@ -231,7 +231,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/nb_NO.js b/loc/nb_NO.js index e77bf1dff..8eee04842 100644 --- a/loc/nb_NO.js +++ b/loc/nb_NO.js @@ -229,7 +229,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/nl_NL.js b/loc/nl_NL.js index a9e43255f..fdf83afef 100644 --- a/loc/nl_NL.js +++ b/loc/nl_NL.js @@ -232,7 +232,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/pt_BR.js b/loc/pt_BR.js index ef2aca917..428f01c63 100644 --- a/loc/pt_BR.js +++ b/loc/pt_BR.js @@ -235,8 +235,7 @@ module.exports = { title: 'Sua carteira foi criada...', text: 'Por favor anote num pedaço de papel essa seqüência de palavras, elas serão o seu backup e você as pode usar para' + - ' recuperar a sua carteira em outros dispositivos. Por exemplo, você pode usar o programa Electrum para desktops' + - ' (https://electrum.org/) para acessar esta mesma carteira.', + ' recuperar a sua carteira em outros dispositivos.', ok: 'Certo, já anotei!', }, lndViewInvoice: { diff --git a/loc/pt_PT.js b/loc/pt_PT.js index 44e41013f..6784539b5 100644 --- a/loc/pt_PT.js +++ b/loc/pt_PT.js @@ -233,7 +233,7 @@ module.exports = { pleasebackup: { title: 'A sua wallet foi criada...', text: - 'Por favor escreva esta frase mnemónica numa folha de papel. É o seu backup e pode usá-lo para restaurar a sua wallet noutro device. Pode usar o Electrum wallet em desktop (https://electrum.org/) para restaurar a sua wallet.', + 'Por favor escreva esta frase mnemónica numa folha de papel. É o seu backup e pode usá-lo para restaurar a sua wallet noutro device.', ok: 'OK, eu escrevi-a num papel!', }, lndViewInvoice: { diff --git a/loc/ru.js b/loc/ru.js index e57590cc6..17b0a9b0f 100644 --- a/loc/ru.js +++ b/loc/ru.js @@ -233,7 +233,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/sv_SE.js b/loc/sv_SE.js index 451a64545..35b855dda 100644 --- a/loc/sv_SE.js +++ b/loc/sv_SE.js @@ -229,7 +229,7 @@ module.exports = { pleasebackup: { title: 'Din plånbok har skapats...', text: - 'Innan du går vidare, var snäll och skriv ned dessa ord på ett papper och förvara på ett säkert ställe. De är din backup och säkerställer att du kan återställa din plånbok igen om något händer. Den går att återställa även i andra plånböcker såsom t.ex. Electrum (https://electrum.org/).', + 'Innan du går vidare, var snäll och skriv ned dessa ord på ett papper och förvara på ett säkert ställe. De är din backup och säkerställer att du kan återställa din plånbok igen om något händer.', ok: 'OK, jag har skrivit ned orden!', }, lndViewInvoice: { diff --git a/loc/th_TH.js b/loc/th_TH.js index 82d577e18..3869a4631 100644 --- a/loc/th_TH.js +++ b/loc/th_TH.js @@ -228,7 +228,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/tr_TR.js b/loc/tr_TR.js index ebb8e87a9..b536c91ae 100644 --- a/loc/tr_TR.js +++ b/loc/tr_TR.js @@ -229,7 +229,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/ua.js b/loc/ua.js index 4b86e6c94..cbce9b9f8 100644 --- a/loc/ua.js +++ b/loc/ua.js @@ -233,7 +233,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/vi_VN.js b/loc/vi_VN.js index 466056cad..a27162b10 100644 --- a/loc/vi_VN.js +++ b/loc/vi_VN.js @@ -229,7 +229,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/zh_cn.js b/loc/zh_cn.js index f6b2e4156..956754b2e 100755 --- a/loc/zh_cn.js +++ b/loc/zh_cn.js @@ -223,7 +223,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/loc/zh_tw.js b/loc/zh_tw.js index 2d045ac40..cc16163c2 100644 --- a/loc/zh_tw.js +++ b/loc/zh_tw.js @@ -220,7 +220,7 @@ module.exports = { pleasebackup: { title: 'Your wallet is created...', text: - "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device. You can use Electrum wallet on desktop (https://electrum.org/) to restore the same wallet.", + "Please take a moment to write down this mnemonic phrase on a piece of paper. It's your backup you can use to restore the wallet on other device.", ok: 'OK, I wrote this down!', }, lndViewInvoice: { diff --git a/screen/receive/details.js b/screen/receive/details.js index 6fac6fbe9..eda7c6e0c 100644 --- a/screen/receive/details.js +++ b/screen/receive/details.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { View, InteractionManager } from 'react-native'; +import { View, InteractionManager, ScrollView } from 'react-native'; import QRCode from 'react-native-qrcode-svg'; import bip21 from 'bip21'; import { @@ -14,7 +14,6 @@ import { import PropTypes from 'prop-types'; import Privacy from '../../Privacy'; import Share from 'react-native-share'; -import { ScrollView } from 'react-native-gesture-handler'; import { Chain } from '../../models/bitcoinUnits'; /** @type {AppStorage} */ let BlueApp = require('../../BlueApp'); diff --git a/screen/wallets/pleaseBackup.js b/screen/wallets/pleaseBackup.js index d7788b10a..a45be68c1 100644 --- a/screen/wallets/pleaseBackup.js +++ b/screen/wallets/pleaseBackup.js @@ -1,8 +1,10 @@ import React, { Component } from 'react'; import { ActivityIndicator, View, BackHandler, Text } from 'react-native'; import { BlueSpacing20, SafeBlueArea, BlueNavigationStyle, BlueText, BlueButton } from '../../BlueComponents'; +import { Badge } from 'react-native-elements'; import PropTypes from 'prop-types'; import Privacy from '../../Privacy'; +import { ScrollView } from 'react-native-gesture-handler'; let loc = require('../../loc'); export default class PleaseBackup extends Component { @@ -50,172 +52,367 @@ export default class PleaseBackup extends Component { } return ( - - {loc.pleasebackup.text} - - - - - 1. - {this.state.words[0]} - + + + + {loc.pleasebackup.success} + {loc.pleasebackup.text} + + + + + 1. {this.state.words[0]} + + + + + 2. {this.state.words[1]} + + + + + 3. {this.state.words[2]} + + + + + 4. {this.state.words[3]} + + + + + 5. {this.state.words[4]} + + + + + 6. {this.state.words[5]} + + + + + 7. {this.state.words[6]} + + + + + 8. {this.state.words[7]} + + + + + 9. {this.state.words[8]} + + + + + 10. {this.state.words[9]} + + + + + 11. {this.state.words[10]} + + + + + 12. {this.state.words[11]} + + + + + 13. {this.state.words[12]} + + + + + 14. {this.state.words[13]} + + + + + 15. {this.state.words[14]} + + + + + 16. {this.state.words[15]} + + + + + 17. {this.state.words[16]} + + + + + 18. {this.state.words[17]} + + + + + 19. {this.state.words[18]} + + + + + 20. {this.state.words[19]} + + + + + 21. {this.state.words[20]} + + + + + 22. {this.state.words[21]} + + + + + 23. {this.state.words[22]} + + + + + 24. {this.state.words[23]} + + - - - 2. - {this.state.words[1]} - - - - - 3. - {this.state.words[2]} - - - - - 4. - {this.state.words[3]} - + + + + + this.props.navigation.dismiss()} title={loc.pleasebackup.ok} /> + - - - - 5. - {this.state.words[4]} - - - - - 6. - {this.state.words[5]} - - - - - 7. - {this.state.words[6]} - - - - - 8. - {this.state.words[7]} - - - - - - - 9. - {this.state.words[8]} - - - - - 10. - {this.state.words[9]} - - - - - 11. - {this.state.words[10]} - - - - - 12. - {this.state.words[11]} - - - - - - - 13. - {this.state.words[12]} - - - - - 14. - {this.state.words[13]} - - - - - 15. - {this.state.words[14]} - - - - - 16. - {this.state.words[15]} - - - - - - - 17. - {this.state.words[16]} - - - - - 18. - {this.state.words[17]} - - - - - 19. - {this.state.words[18]} - - - - - 20. - {this.state.words[19]} - - - - - - - 21. - {this.state.words[20]} - - - - - 22. - {this.state.words[21]} - - - - - 23. - {this.state.words[22]} - - - - - 24. - {this.state.words[23]} - - - - - - - this.props.navigation.dismiss()} title={loc.pleasebackup.ok} /> - - - + ); } diff --git a/screen/wallets/transactions.js b/screen/wallets/transactions.js index 478c775b3..6ddcbcedb 100644 --- a/screen/wallets/transactions.js +++ b/screen/wallets/transactions.js @@ -10,6 +10,7 @@ import { ActivityIndicator, InteractionManager, FlatList, + ScrollView, RefreshControl, TouchableOpacity, StatusBar, @@ -28,7 +29,6 @@ import { import { Icon } from 'react-native-elements'; import { LightningCustodianWallet } from '../../class'; import Handoff from 'react-native-handoff'; -import { ScrollView } from 'react-native-gesture-handler'; import Modal from 'react-native-modal'; import NavigationService from '../../NavigationService'; /** @type {AppStorage} */