Browse Source

Merge pull request #994 from BlueWallet/localtrader-highlight

New Local Trader area on Main view
master
Overtorment 5 years ago
committed by GitHub
parent
commit
47c0d04d60
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 43
      BlueComponents.js
  2. 1
      loc/ZAR_Afr.js
  3. 1
      loc/ZAR_Xho.js
  4. 3
      loc/cs_CZ.js
  5. 3
      loc/da_DK.js
  6. 1
      loc/de_DE.js
  7. 3
      loc/el.js
  8. 9
      loc/en.js
  9. 3
      loc/es.js
  10. 3
      loc/fi_FI.js
  11. 3
      loc/fr_FR.js
  12. 1
      loc/hr_HR.js
  13. 1
      loc/hu_HU.js
  14. 3
      loc/id_ID.js
  15. 3
      loc/it.js
  16. 3
      loc/jp_JP.js
  17. 3
      loc/nb_NO.js
  18. 1
      loc/nl_NL.js
  19. 1
      loc/pt_BR.js
  20. 1
      loc/pt_PT.js
  21. 3
      loc/ru.js
  22. 1
      loc/sv_SE.js
  23. 1
      loc/th_TH.js
  24. 1
      loc/tr_TR.js
  25. 3
      loc/ua.js
  26. 3
      loc/vi_VN.js
  27. 3
      loc/zh_cn.js
  28. 1
      loc/zh_tw.js
  29. 14
      screen/wallets/buyBitcoin.js
  30. 44
      screen/wallets/details.js
  31. 34
      screen/wallets/list.js
  32. 99
      screen/wallets/transactions.js

43
BlueComponents.js

@ -1336,30 +1336,6 @@ export class ManageFundsBigButton extends Component {
}
}
export class BluePlusIconDimmed extends Component {
render() {
return (
<View {...this.props} style={stylesBlueIcon.container}>
<View style={stylesBlueIcon.box1}>
<View style={stylesBlueIcon.ballDimmed}>
<Ionicons
{...this.props}
name={'ios-add'}
size={26}
style={{
color: 'white',
backgroundColor: 'transparent',
left: 8,
top: 1,
}}
/>
</View>
</View>
</View>
);
}
}
export class NewWalletPanel extends Component {
constructor(props) {
super(props);
@ -1383,28 +1359,26 @@ export class NewWalletPanel extends Component {
<LinearGradient
colors={WalletGradient.createWallet}
style={{
padding: 15,
paddingHorizontal: 24,
paddingVertical: 16,
borderRadius: 10,
minHeight: Platform.OS === 'ios' ? 164 : 181,
justifyContent: 'center',
alignItems: 'center',
alignItems: 'flex-start',
}}
>
<BluePlusIconDimmed />
<Text
style={{
backgroundColor: 'transparent',
fontWeight: 'bold',
fontSize: 20,
color: BlueApp.settings.alternativeTextColor,
fontWeight: '600',
fontSize: 24,
color: BlueApp.settings.foregroundColor,
marginBottom: 4,
}}
>
{loc.wallets.list.create_a_wallet}
</Text>
<Text style={{ backgroundColor: 'transparent' }} />
<Text
style={{
backgroundColor: 'transparent',
fontSize: 13,
color: BlueApp.settings.alternativeTextColor,
}}
@ -1420,6 +1394,9 @@ export class NewWalletPanel extends Component {
>
{loc.wallets.list.create_a_wallet2}
</Text>
<View style={{ marginTop: 12, backgroundColor: '#007AFF', paddingHorizontal: 32, paddingVertical: 12, borderRadius: 8 }}>
<Text style={{ color: BlueApp.settings.brandingColor, fontWeight: '500' }}>{loc.wallets.list.create_a_button}</Text>
</View>
</LinearGradient>
</TouchableOpacity>
);

1
loc/ZAR_Afr.js

@ -22,6 +22,7 @@
create_a_wallet: 'Skep ‘n beursie',
create_a_wallet1: 'Dit is gratis so skep',
create_a_wallet2: 'soveel as wat u benodig',
create_a_button: 'Add now',
latest_transaction: 'laaste transaksie',
empty_txs1: 'U transaksies is hier beskikbaar,',
empty_txs2: 'huidiglik geen transaksies',

1
loc/ZAR_Xho.js

@ -20,6 +20,7 @@
create_a_wallet: 'Yenza ingxowa',
create_a_wallet1: 'Ayihlawulelwa kwaye ungayenza',
create_a_wallet2: 'Ungenza zibeninzi indlela zokuhlawula',
create_a_button: 'Add now',
latest_transaction: 'Utshintsho olutsha',
empty_txs1: 'Intengiso yakho iya kubonakala apha,',
empty_txs2: 'akuho nanye okwangoku',

3
loc/cs_CZ.js

@ -16,9 +16,10 @@ module.exports = {
title: 'peněženky',
header: 'Peněženka reprezentuje pár tajného (privátního) klíče a adresy' + 'kterou můžete sdílet, abyste získali mince',
add: 'Přidat peněženku',
create_a_wallet: 'Vytvořit peněženku',
create_a_wallet: 'přidat peněženku',
create_a_wallet1: 'Je to zdarma a můžete vytvořit',
create_a_wallet2: 'tolik, kolik budete chtít',
create_a_button: 'přidat nyní',
latest_transaction: 'poslední transakce',
empty_txs1: 'Zde budou zobrazeny vaše transakce,',
empty_txs2: 'zatím žádné',

3
loc/da_DK.js

@ -16,9 +16,10 @@ module.exports = {
title: 'wallets',
header: 'En wallet består af par af hemmelige (private nøgler) og en adresse' + 'som du kan dele med andre for at modtage coins.',
add: 'Tilføj Wallet',
create_a_wallet: 'Opret en wallet',
create_a_wallet: 'Tilføj en tegnebog',
create_a_wallet1: 'Det er helt gratis og du kan oprette',
create_a_wallet2: 'lige så mange du vil',
create_a_button: 'Tilføj nu',
latest_transaction: 'seneste transaktion',
empty_txs1: 'Dine transaktioner vil blive vist her,',
empty_txs2: 'ingen endnu',

1
loc/de_DE.js

@ -21,6 +21,7 @@ module.exports = {
create_a_wallet: 'Wallet erstellen',
create_a_wallet1: 'Es ist kostenlos und du kannst',
create_a_wallet2: 'so viele Wallets erstellen, wie du möchtest',
create_a_button: 'Jetzt hinzufügen',
latest_transaction: 'Lezte Transaktion',
empty_txs1: 'Deine Transaktionen erscheinen hier',
empty_txs2: 'Noch keine Transaktionen',

3
loc/el.js

@ -19,9 +19,10 @@ module.exports = {
'Ένα πορτοφόλι αποτελείται από ένα μυστικό (το ιδιωτικό κλειδί) και μια διεύθυνση' +
'την οποία μπορείς να δώσεις σε άλλους για να σε πληρώσουν σε αυτήν.',
add: 'Πρόσθεσε Πορτοφόλι',
create_a_wallet: 'Δημιούργησε ένα πορτοφόλι',
create_a_wallet: 'Προσθέστε ένα πορτοφόλι',
create_a_wallet1: 'Είναι δωρεάν και μπορείς να',
create_a_wallet2: 'δημιουργήσεις όσα θέλεις',
create_a_button: 'Προσθήκη τώρα',
latest_transaction: 'τελευταία συναλλαγή',
empty_txs1: 'Οι συναλλαγές θα εμφανιστούν εδώ,',
empty_txs2: 'καμία συναλλαγή',

9
loc/en.js

@ -17,16 +17,17 @@ module.exports = {
title: 'wallets',
header: 'A wallet represents a pair of a secret (private key) and an address' + 'you can share to receive coins.',
add: 'Add Wallet',
create_a_wallet: 'Create a wallet',
create_a_wallet: 'Add a wallet',
create_a_wallet1: "It's free and you can create",
create_a_wallet2: 'as many as you like',
create_a_button: 'Add now',
latest_transaction: 'latest transaction',
empty_txs1: 'Your transactions will appear here,',
empty_txs2: 'none at the moment',
empty_txs1: 'Your transactions will appear here',
empty_txs2: 'Start with your wallet',
empty_txs1_lightning:
'Lightning wallet should be used for your daily transactions. Fees are unfairly cheap and speed is blazing fast.',
empty_txs2_lightning: '\nTo start using it tap on "manage funds" and topup your balance.',
tap_here_to_buy: 'Tap here to buy Bitcoin',
tap_here_to_buy: 'buy Bitcoin',
},
reorder: {
title: 'Reorder Wallets',

3
loc/es.js

@ -17,9 +17,10 @@ module.exports = {
title: 'billeteras',
header: 'Un Monedero esta representado con secreto (clave privada) y una dirección' + 'que puedes compartir para recibir monedas.',
add: 'Añadir Carterqa',
create_a_wallet: 'Crear una billetera',
create_a_wallet: 'Agrega una billetera',
create_a_wallet1: 'Es gratis y puedes crear',
create_a_wallet2: 'cuantas usted quiera',
create_a_button: 'Agrega ahora',
latest_transaction: 'última transacción',
empty_txs1: 'Sus transacciones aparecerán aquí,',
empty_txs2: 'ninguno por el momento.',

3
loc/fi_FI.js

@ -19,9 +19,10 @@ module.exports = {
'Lompakko koostuu salaisesta avaimesta (private key) sekä julkisesta osoitteesta' +
',jonka voit jakaa vastaanottaaksesi kolikoita.',
add: 'Lisää Lompakko',
create_a_wallet: 'Luo lompakko',
create_a_wallet: 'Lisää lompakko',
create_a_wallet1: 'Se on ilmaista ja voit luoda',
create_a_wallet2: 'niin monta kuin haluat',
create_a_button: 'Lisää nyt',
latest_transaction: 'viimeisin siirto',
empty_txs1: 'Siirtosi näkyvät tässä,',
empty_txs2: 'ei siirtoja',

3
loc/fr_FR.js

@ -18,9 +18,10 @@ module.exports = {
header:
'Un portefeuille represente une paire de clées (publique/privée) et une adresse que vous pouvez partager pour recevoir des transactions.',
add: 'Ajouter un portefeuille',
create_a_wallet: 'Créer un portefeuille',
create_a_wallet: 'Ajouter un portefeuille',
create_a_wallet1: "C'est gratuit et vous pouvez en créer",
create_a_wallet2: 'autant que vous souhaitez',
create_a_button: 'Ajouter maintenant',
latest_transaction: 'dernière transaction',
empty_txs1: 'Vos transactions apparaîtront ici,',
empty_txs2: 'Aucune pour le moment',

1
loc/hr_HR.js

@ -20,6 +20,7 @@ module.exports = {
create_a_wallet: 'Stvori novi volet',
create_a_wallet1: 'Ne košta ništa i možete',
create_a_wallet2: 'ih stvoriti moliko želite',
create_a_button: 'dodaj sada',
latest_transaction: 'posljednja transakcija',
empty_txs1: 'Vaše transakcije će se pojaviti ovdje',
empty_txs2: 'trenutno nema nijedne',

1
loc/hu_HU.js

@ -20,6 +20,7 @@ module.exports = {
create_a_wallet: 'Új tárca',
create_a_wallet1: 'Ingyenes, és annyit hozhatsz létre',
create_a_wallet2: 'amennyit szeretnél',
create_a_button: 'add hozzá',
latest_transaction: 'utolsó tranzakció',
empty_txs1: 'A tranzakcióid itt fognak megjelenni',
empty_txs2: 'de még nem volt tranzakciód!',

3
loc/id_ID.js

@ -17,9 +17,10 @@ module.exports = {
title: 'Dompet',
header: 'Sebuah dompet mewakili sepasang kunci rahasia dan sebuah alamat' + 'yang bisa dipilih untuk menerima koin.',
add: 'Tambah dompet',
create_a_wallet: 'Buat dompet',
create_a_wallet: 'Tambah dompet',
create_a_wallet1: 'Gratis dan bisa buat',
create_a_wallet2: 'sebanyak yang kamu mau',
create_a_button: 'tambah sekarang',
latest_transaction: 'transaksi terbaru',
empty_txs1: 'Transaksimu akan muncul di sini,',
empty_txs2: 'saat ini tidak ada transaksi',

3
loc/it.js

@ -19,9 +19,10 @@ module.exports = {
'Un portafoglio rappresenta la coppia fra un segreto (chiave privata) e un indirizzo' +
'che puoi condividere per ricevere Bitcoin.',
add: 'Aggiungi Portafoglio',
create_a_wallet: 'Crea un portafoglio',
create_a_wallet: 'Aggiungi un portafoglio',
create_a_wallet1: 'È gratuito e puoi crearne',
create_a_wallet2: 'quanti ne vuoi',
create_a_button: 'Aggiungi ora',
latest_transaction: 'Transazioni recenti',
empty_txs1: 'Le tue transazioni appariranno qui,',
empty_txs2: 'Nessuna transazione',

3
loc/jp_JP.js

@ -17,9 +17,10 @@ module.exports = {
title: 'ウォレット',
header: 'ウォレットは秘密鍵(プライベートキー)とウォレットアドレスのペアで構成されています。' + 'コインを受信するために共有できます。',
add: 'ウォレットの追加',
create_a_wallet: 'ウォレットの作成',
create_a_wallet: 'ウォレットを追加',
create_a_wallet1: 'ウォレット作成は無料で',
create_a_wallet2: '好きなだけ複数作成できます',
create_a_button: '今すぐ追加',
latest_transaction: '最新の取引',
empty_txs1: 'ここに取引が表示されます',
empty_txs2: '現在は何もありません',

3
loc/nb_NO.js

@ -17,9 +17,10 @@ module.exports = {
title: 'lommebøker',
header: 'En lommebok representerer en hemmelighet (privat nøkkel) og en adresse ' + ' du kan dele for å motta kryptovaluta.',
add: 'Legg til lommebok',
create_a_wallet: 'Lag en lommebok',
create_a_wallet: 'Legg til en lommebok',
create_a_wallet1: 'Det er gratis, og du kan lage',
create_a_wallet2: 'så mange du vil',
create_a_button: 'Legg til nå',
latest_transaction: 'siste transaksjonen',
empty_txs1: 'Dine transaksjoner vil vises her,',
empty_txs2: 'ingen for øyeblikket',

1
loc/nl_NL.js

@ -20,6 +20,7 @@ module.exports = {
create_a_wallet: 'Portemonnee aanmaken',
create_a_wallet1: 'Het is gratis en u kunt er',
create_a_wallet2: 'zoveel maken als u wilt',
create_a_button: 'Voeg nu toe',
latest_transaction: 'laatste transactie',
empty_txs1: 'Uw transacties verschijnen hier,',
empty_txs2: 'geen transacties op dit moment',

1
loc/pt_BR.js

@ -21,6 +21,7 @@ module.exports = {
create_a_wallet: 'Criar uma carteira',
create_a_wallet1: 'é grátis e você pode criar',
create_a_wallet2: 'quantas você quiser',
create_a_button: 'Criar agora',
latest_transaction: 'última transação',
empty_txs1: 'Suas transações aparecerão aqui,',
empty_txs2: 'nenhuma no momento',

1
loc/pt_PT.js

@ -20,6 +20,7 @@ module.exports = {
create_a_wallet: 'Adicionar uma wallet',
create_a_wallet1: 'É gratuito e pode',
create_a_wallet2: 'adicionar quantas quiser',
create_a_button: 'Adicionar agora',
latest_transaction: 'últimas transacções',
empty_txs1: 'As suas transacções aparecerão aqui,',
empty_txs2: 'nenhuma de momento',

3
loc/ru.js

@ -17,9 +17,10 @@ module.exports = {
title: 'Кошельки',
header: 'Кошелек - это секретный (приватный) ключ и соответствующий ему адрес на который можно получать Bitcoin',
add: 'Добавить Кошелек',
create_a_wallet: 'Создать кошелек',
create_a_wallet: 'добавить кошелек',
create_a_wallet1: 'Это бесплатно и ты можешь создать',
create_a_wallet2: 'неограниченное количество',
create_a_button: 'добавить сейчас',
latest_transaction: 'Последняя транзакция',
empty_txs1: 'Список транзакций пока пуст',
empty_txs2: ' ',

1
loc/sv_SE.js

@ -20,6 +20,7 @@ module.exports = {
create_a_wallet: 'Ny plånbok',
create_a_wallet1: 'Det är gratis och du kan skapa',
create_a_wallet2: 'hur många du vill',
create_a_button: 'Ny plånbok',
latest_transaction: 'senaste transaktion',
empty_txs1: 'Dina transaktioner kommer att visas här',
empty_txs2: 'men än så länge finns inga!',

1
loc/th_TH.js

@ -20,6 +20,7 @@ module.exports = {
create_a_wallet: 'สร้างกระเป๋าสตางค์',
create_a_wallet1: 'ไม่มีค่าใช้จ่าย และคุณสามารถสร้างกระเป๋าสตางค์',
create_a_wallet2: 'ได้มากเท่าที่ต้องการ',
create_a_button: 'เพิ่มตอนนี้',
latest_transaction: 'ธุรกรรมล่าสุด',
empty_txs1: 'ธุรกรรมจะปรากฏที่นี่,',
empty_txs2: 'ไม่มี ณ ขณะนี้',

1
loc/tr_TR.js

@ -20,6 +20,7 @@ module.exports = {
create_a_wallet: 'Cüzdan oluştur',
create_a_wallet1: 'Oluşturması bedava ve',
create_a_wallet2: 'istediğiniz kadar oluşturabilirsiniz',
create_a_button: 'şimdi ekle',
latest_transaction: 'en son işlem',
empty_txs1: 'İşlemleriniz burada görünür,',
empty_txs2: 'şu anda hiç yok',

3
loc/ua.js

@ -17,9 +17,10 @@ module.exports = {
title: 'гаманці',
header: 'Гаманець це секретний (приватний) ключ, і відповідна йому адреса на яку можна отримувати біткоїни',
add: 'Додати Гаманець',
create_a_wallet: 'Створити гаманець',
create_a_wallet: 'додати гаманець',
create_a_wallet1: 'Це безкоштовно і можно',
create_a_wallet2: 'створювати безліч',
create_a_button: 'додати зараз',
latest_transaction: 'остання транзакція',
empty_txs1: "Транзакціі з'являться тут,",
empty_txs2: 'поки що жодноі',

3
loc/vi_VN.js

@ -17,9 +17,10 @@ module.exports = {
title: 'wallets',
header: 'A wallet represents a pair of a secret (private key) and an address' + 'you can share to receive coins.',
add: 'Add Wallet',
create_a_wallet: 'Create a wallet',
create_a_wallet: 'Add a wallet',
create_a_wallet1: "It's free and you can create",
create_a_wallet2: 'as many as you like',
create_a_button: 'Add now',
latest_transaction: 'latest transaction',
empty_txs1: 'Your transactions will appear here,',
empty_txs2: 'none at the moment',

3
loc/zh_cn.js

@ -16,9 +16,10 @@ module.exports = {
title: '钱包',
header: '一个钱包代表一对的私钥和地址' + '你可以通过分享收款.',
add: '添加钱包',
create_a_wallet: '创建一个钱包',
create_a_wallet: '添加钱包',
create_a_wallet1: '创建钱包是免费的,你可以',
create_a_wallet2: '想创建多少就创建多少个',
create_a_button: '现在添加',
latest_transaction: '最近的转账',
empty_txs1: '你的转账信息将展示在这里',
empty_txs2: '当前无信息',

1
loc/zh_tw.js

@ -19,6 +19,7 @@ module.exports = {
create_a_wallet: '建立一個錢包',
create_a_wallet1: '建立錢包是免費的,你可以',
create_a_wallet2: '想建立多少就建立多少個',
create_a_button: '立即添加',
latest_transaction: '最近的轉賬',
empty_txs1: '你的轉賬資訊將展示在這裡',
empty_txs2: '當前無資訊',

14
screen/wallets/buyBitcoin.js

@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { BlueNavigationStyle, BlueLoading } from '../../BlueComponents';
import { BlueNavigationStyle, BlueLoading, SafeBlueArea } from '../../BlueComponents';
import PropTypes from 'prop-types';
import { WebView } from 'react-native-webview';
import { AppStorage, LightningCustodianWallet, WatchOnlyWallet } from '../../class';
@ -89,11 +89,13 @@ export default class BuyBitcoin extends Component {
}
return (
<WebView
source={{
uri,
}}
/>
<SafeBlueArea style={{ flex: 1 }}>
<WebView
source={{
uri,
}}
/>
</SafeBlueArea>
);
}
}

44
screen/wallets/details.js

@ -11,6 +11,8 @@ import {
Keyboard,
TouchableWithoutFeedback,
Switch,
Platform,
Linking,
} from 'react-native';
import { BlueButton, SafeBlueArea, BlueCard, BlueSpacing20, BlueNavigationStyle, BlueText } from '../../BlueComponents';
import PropTypes from 'prop-types';
@ -115,6 +117,30 @@ export default class WalletDetails extends Component {
});
}
renderMarketplaceButton = () => {
return Platform.select({
android: (
<BlueButton
onPress={() =>
this.props.navigation.navigate('Marketplace', {
fromWallet: this.state.wallet,
})
}
title="Marketplace"
/>
),
ios:
this.state.wallet.getBalance() > 0 ? (
<BlueButton
onPress={async () => {
Linking.openURL('https://bluewallet.io/marketplace-btc/');
}}
title="Marketplace"
/>
) : null,
});
};
render() {
if (this.state.isLoading) {
return (
@ -241,25 +267,9 @@ export default class WalletDetails extends Component {
/>
<BlueSpacing20 />
{this.renderMarketplaceButton()}
</React.Fragment>
)}
{this.state.wallet.type !== LightningCustodianWallet.type && (
<BlueButton
icon={{
name: 'shopping-cart',
type: 'font-awesome',
color: BlueApp.settings.buttonTextColor,
}}
onPress={() =>
this.props.navigation.navigate('BuyBitcoin', {
wallet: this.state.wallet,
})
}
title={loc.wallets.details.buy_bitcoin}
/>
)}
<BlueSpacing20 />
<BlueButton onPress={() => this.props.navigation.navigate('Broadcast')} title="Broadcast transaction" />
<BlueSpacing20 />
<TouchableOpacity

34
screen/wallets/list.js

@ -332,6 +332,36 @@ export default class WalletsList extends Component {
);
};
renderLocalTrader = () => {
if (BlueApp.getWallets().length > 0 && !BlueApp.getWallets().some(wallet => wallet.type === PlaceholderWallet.type)) {
return (
<TouchableOpacity
onPress={() => {
this.props.navigation.navigate('HodlHodl', { fromWallet: this.state.wallet });
}}
style={{
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginHorizontal: 16,
marginBottom: 16,
backgroundColor: '#eef0f4',
padding: 16,
borderRadius: 6,
}}
>
<View style={{ flexDirection: 'column' }}>
<Text style={{ fontSize: 16, fontWeight: '600', color: '#0C2550' }}>Local Trader</Text>
<Text style={{ fontSize: 13, fontWeight: '500', color: '#9AA0AA' }}>A p2p marketplace</Text>
</View>
<View style={{ flexDirection: 'column', backgroundColor: '#007AFF', borderRadius: 16 }}>
<Text style={{ paddingHorizontal: 16, paddingVertical: 8, fontSize: 13, color: '#fff', fontWeight: '600' }}>New</Text>
</View>
</TouchableOpacity>
);
}
};
render() {
if (this.state.isLoading) {
return <BlueLoading />;
@ -391,10 +421,11 @@ export default class WalletsList extends Component {
ref={c => (this.walletsCarousel = c)}
/>
<BlueList>
{this.renderLocalTrader()}
<FlatList
ListHeaderComponent={this.renderListHeaderComponent}
ListEmptyComponent={
<View style={{ top: 50, height: 100 }}>
<View style={{ top: 80, height: 160 }}>
<Text
style={{
fontSize: 18,
@ -409,6 +440,7 @@ export default class WalletsList extends Component {
fontSize: 18,
color: '#9aa0aa',
textAlign: 'center',
fontWeight: '600',
}}
>
{loc.wallets.list.empty_txs2}

99
screen/wallets/transactions.js

@ -218,19 +218,9 @@ export default class WalletTransactions extends Component {
return (
<View style={{ flex: 1 }}>
<View style={{ flexDirection: 'row', margin: 16, justifyContent: 'space-evenly' }}>
{/*
So the idea here, due to Apple banning native Lapp marketplace, is:
On Android everythins works as it worked before. Single "Marketplace" button that leads to LappBrowser that
opens /marketplace/ url of offchain wallet type, and /marketplace-btc/ for onchain.
On iOS its more complicated - we have one button that opens same page _externally_ (in Safari), and second
button that opens actual LappBrowser but with _blank_ page. This is important to not trigger Apple.
Blank page is also the way Trust Wallet does it with Dapp Browser.
For ONCHAIN wallet type no LappBrowser button should be displayed, its Lightning-network specific.
*/}
{this.renderMarketplaceButton()}
{this.state.wallet.getBalance() > 0 && this.renderSellFiat()}
{this.state.wallet.type === LightningCustodianWallet.type && this.renderMarketplaceButton()}
{this.state.wallet.type === LightningCustodianWallet.type && Platform.OS === 'ios' && this.renderLappBrowserButton()}
{this.state.wallet.allowHodlHodlTrading() && this.renderHodlHodlButton()}
</View>
<Text
style={{
@ -321,11 +311,7 @@ export default class WalletTransactions extends Component {
android: (
<TouchableOpacity
onPress={() => {
if (this.state.wallet.type === LightningCustodianWallet.type) {
this.props.navigation.navigate('LappBrowser', { fromSecret: this.state.wallet.getSecret(), fromWallet: this.state.wallet });
} else {
this.props.navigation.navigate('Marketplace', { fromWallet: this.state.wallet });
}
this.props.navigation.navigate('Marketplace', { fromWallet: this.state.wallet });
}}
style={{
backgroundColor: '#f2f2f2',
@ -345,12 +331,7 @@ export default class WalletTransactions extends Component {
this.state.wallet.getBalance() > 0 ? (
<TouchableOpacity
onPress={async () => {
if (this.state.wallet.type === LightningCustodianWallet.type) {
Linking.openURL('https://bluewallet.io/marketplace/');
} else {
let address = await this.state.wallet.getAddressAsync();
Linking.openURL('https://bluewallet.io/marketplace-btc/?address=' + address);
}
Linking.openURL('https://bluewallet.io/marketplace/');
}}
style={{
backgroundColor: '#f2f2f2',
@ -396,13 +377,15 @@ export default class WalletTransactions extends Component {
</TouchableOpacity>
);
};
renderHodlHodlButton = () => {
renderSellFiat = () => {
return (
<TouchableOpacity
onPress={() => {
this.props.navigation.navigate('HodlHodl', { fromWallet: this.state.wallet });
}}
onPress={() =>
this.props.navigation.navigate('BuyBitcoin', {
address: this.state.wallet.getAddress(),
secret: this.state.wallet.getSecret(),
})
}
style={{
marginLeft: 5,
backgroundColor: '#f2f2f2',
@ -415,7 +398,14 @@ export default class WalletTransactions extends Component {
alignItems: 'center',
}}
>
<Text style={{ color: '#062453', fontSize: 18 }}>local trader</Text>
<Text
style={{
color: '#062453',
fontSize: 18,
}}
>
{loc.wallets.list.tap_here_to_buy}
</Text>
</TouchableOpacity>
);
};
@ -629,46 +619,61 @@ export default class WalletTransactions extends Component {
}}
ListFooterComponent={this.renderListFooterComponent}
ListEmptyComponent={
<ScrollView style={{ minHeight: 100 }} contentContainerStyle={{ flex: 1, justifyContent: 'center', paddingHorizontal: 16 }}>
<ScrollView
style={{ flex: 1 }}
contentContainerStyle={{ flex: 1, justifyContent: 'center', paddingHorizontal: 16, paddingVertical: 40 }}
>
<Text
numberOfLines={0}
style={{
fontSize: 18,
color: '#9aa0aa',
textAlign: 'center',
marginVertical: 16,
}}
>
{(this.isLightning() && loc.wallets.list.empty_txs1_lightning) || loc.wallets.list.empty_txs1}
</Text>
<Text
style={{
fontSize: 18,
color: '#9aa0aa',
textAlign: 'center',
}}
>
{(this.isLightning() && loc.wallets.list.empty_txs2_lightning) || loc.wallets.list.empty_txs2}
</Text>
<Text />
<Text />
{!this.isLightning() && (
{this.isLightning() && (
<Text
style={{
fontSize: 18,
color: '#9aa0aa',
textAlign: 'center',
textDecorationLine: 'underline',
fontWeight: '600',
}}
>
{loc.wallets.list.empty_txs2_lightning}
</Text>
)}
{!this.isLightning() && (
<TouchableOpacity
onPress={() =>
this.props.navigation.navigate('BuyBitcoin', {
wallet: this.state.wallet,
})
}
style={{
backgroundColor: '#007AFF',
minWidth: 260,
borderRadius: 8,
alignSelf: 'center',
paddingVertical: 14,
paddingHorizontal: 32,
}}
>
{loc.wallets.list.tap_here_to_buy}
</Text>
<Text
style={{
fontSize: 15,
color: '#fff',
textAlign: 'center',
fontWeight: '600',
}}
>
{loc.wallets.list.tap_here_to_buy}
</Text>
</TouchableOpacity>
)}
</ScrollView>
}

Loading…
Cancel
Save