From e1df1b3ca22b7d6e1095435e4b1fca9cb100ff34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Rodriguez=20V=C3=A9lez?= Date: Tue, 30 Oct 2018 05:35:24 -0400 Subject: [PATCH 1/2] FIX: Replaced Close asset. Removed bounce animation glitch (#112) FIX: Replaced Close asset FIX: Removed bounce animation glitch --- BlueComponents.js | 2 +- MainBottomTabs.js | 6 +- img/close.png | Bin 0 -> 294 bytes img/close@2x.png | Bin 0 -> 511 bytes img/close@3x.png | Bin 0 -> 667 bytes loc/en.js | 4 +- loc/es.js | 2 + loc/pt_BR.js | 2 + loc/pt_PT.js | 2 + loc/ru.js | 2 + loc/ua.js | 2 + screen/settings/settings.js | 2 +- screen/wallets/details.js | 241 ++++++++++++++++----------------- screen/wallets/list.js | 26 +--- screen/wallets/transactions.js | 34 ++--- 15 files changed, 153 insertions(+), 172 deletions(-) create mode 100755 img/close.png create mode 100755 img/close@2x.png create mode 100755 img/close@3x.png diff --git a/BlueComponents.js b/BlueComponents.js index 7cc04b36..b8537bf7 100644 --- a/BlueComponents.js +++ b/BlueComponents.js @@ -158,7 +158,7 @@ export const BlueNavigationStyle = (navigation, withNavigationCloseButton = fals headerTintColor: '#0c2550', headerRight: withNavigationCloseButton ? ( navigation.goBack(null)}> - + ) : null, headerBackTitle: null, diff --git a/MainBottomTabs.js b/MainBottomTabs.js index 0abbcbd9..1e47939f 100644 --- a/MainBottomTabs.js +++ b/MainBottomTabs.js @@ -39,6 +39,9 @@ const WalletsStackNavigator = createStackNavigator({ TransactionDetails: { screen: details, }, + WalletDetails: { + screen: WalletDetails, + }, RBF: { screen: rbf, }, @@ -110,9 +113,6 @@ const MainBottomTabs = createStackNavigator( ScanQrWif: { screen: scanQrWif, }, - WalletDetails: { - screen: WalletDetails, - }, WalletExport: { screen: WalletExport, }, diff --git a/img/close.png b/img/close.png new file mode 100755 index 0000000000000000000000000000000000000000..5b2e38c880de577f827d99b3aad20a73426ba0a4 GIT binary patch literal 294 zcmV+>0oneEP)Px#;7LS5R45f=6x0mV`Tdt+A_F%|#Fz7{Uo+qVJcgm73}64OU}a{=X98>b|KEw> z%b$H<2^<>1azHf6Fz^NFT zfX)N!!xuQ%G!cvre41c>$EJn}l=iU26HF6`2HOsHIy8j=^)PdbX`cJ{pHTxC$M0{{R3 literal 0 HcmV?d00001 diff --git a/img/close@2x.png b/img/close@2x.png new file mode 100755 index 0000000000000000000000000000000000000000..6f8179fd831a143c5a9ced481f0c336dc6a7586d GIT binary patch literal 511 zcmVPx$xk*GpR7efA)-g`QFcb#h=Oi5}A%PGqu!4w$1Pq;+dIQQ*RqD`tFmV^e(g`>L z2Vh}9qFbkm0S3f`L=*fwd7)|I#CC#*I&$Op`NgqgpJeIxuY>o_)=hUe48A{JU(nW8 z**qEyJKN#a`N`;EK7Wh^u&2fIEyeMW1pWAe#-FphX&WH0WlSy6ofKHj!F=5 zbf_}0gK#mxaBKFKa=-Ojw`Amfyk?U{ZMY@Yf*61XO~z)JS#tC0D7odIYoiQH=kae~ zR@-1LSc+k@7Zgd8=g}Cgd`op0zL`kSWm#x5titet*1SlynU;ce7*C%IS^!NkS2PFO zVlHR~x?;Ad0-ItssAvmg6m?ZhZyC{rIyZ6;%e|4it=3pJYOP{};DXbjw7lN_*#w7F z)!qWe@e3#p!mvC_X|SRxPx%RY^oaR9Fek*}G1|Fcb#hIzYt&5{Q9`tp!oB@EQz=NDQnz4Nt)XaH&{$l)})B z6^Q`}iM#P1dR#ZR`W!ofEOzYpoUe}6xamU2IaYh=L3d;4thc#$^Z0o8<#e@H9Sn}U zuWQ>E%j>%@Z%_AQN}Nyy$Zw^GTI=-T<8z1s)Yn#toX8CWEHF`Sg$f}%T3eh_>UL{s zF&&LA-|6BeO9yFj9i`qAtCv-6U>|obn8uG=OPVca#v5XHOd$eZOw9XW>Cx^cc44#+`1%}g|>y2AYq$MdDompnviR!LSrO~5d-K-XsiTC5+hbAG)79> zl?JE+)wN4ctb@Im-q!^ypX7yIV9d{`AcWXDq#liKlzhWTUT>iJvm zo3=i+=gPk6A0$evbG$3hb!MkcA}Jppx!51jW`^2rX>2fNYqab=ej7-OF_qF~;QrY_ z7rWTDkz|;`I!NlbC9o^~qiYPXjV)J@8wOb1)IYVZFJbF0op}HN002ovPDHLkV1hSy BBh>%^ literal 0 HcmV?d00001 diff --git a/loc/en.js b/loc/en.js index 3134e273..bad8ca53 100644 --- a/loc/en.js +++ b/loc/en.js @@ -41,7 +41,7 @@ module.exports = { bitcoin: 'Bitcoin', }, details: { - title: 'wallet details', + title: 'Wallet', address: 'Address', type: 'Type', label: 'Label', @@ -50,6 +50,8 @@ module.exports = { are_you_sure: 'Are you sure?', yes_delete: 'Yes, delete', no_cancel: 'No, cancel', + delete: 'Delete', + save: 'Save', delete_this_wallet: 'Delete this wallet', export_backup: 'Export / backup', buy_bitcoin: 'Buy Bitcoin', diff --git a/loc/es.js b/loc/es.js index 51a2b23d..876a81fe 100644 --- a/loc/es.js +++ b/loc/es.js @@ -45,6 +45,8 @@ module.exports = { address: 'Dirección', type: 'Tipo', label: 'Etiqueta', + delete: 'Eliminar', + save: 'Guardar', destination: 'destino', description: 'descripcion', are_you_sure: '¿Estás seguro?', diff --git a/loc/pt_BR.js b/loc/pt_BR.js index 37718657..117c0ff4 100644 --- a/loc/pt_BR.js +++ b/loc/pt_BR.js @@ -54,6 +54,8 @@ module.exports = { delete_this_wallet: 'Apagar esta wallet', export_backup: 'Exportar / backup', buy_bitcoin: 'Buy Bitcoin', + delete: 'Delete', + save: 'Save', }, export: { title: 'Exportar Wallet', diff --git a/loc/pt_PT.js b/loc/pt_PT.js index d1c3aa90..bab518a4 100644 --- a/loc/pt_PT.js +++ b/loc/pt_PT.js @@ -44,6 +44,8 @@ module.exports = { title: 'wallet', address: 'Endereço', type: 'Tipo', + delete: 'Delete', + save: 'Save', label: 'Nome', destination: 'destination', description: 'description', diff --git a/loc/ru.js b/loc/ru.js index db092bc4..6e609556 100644 --- a/loc/ru.js +++ b/loc/ru.js @@ -45,6 +45,8 @@ module.exports = { address: 'Адрес', type: 'Тип', label: 'Метка', + delete: 'Delete', + save: 'Save', are_you_sure: 'Вы уверены?', yes_delete: 'Да, удалить', destination: 'destination', diff --git a/loc/ua.js b/loc/ua.js index ab839af2..f4b3542c 100644 --- a/loc/ua.js +++ b/loc/ua.js @@ -44,6 +44,8 @@ module.exports = { title: 'Інформація про Гаманець', address: 'Адреса', type: 'Тип', + delete: 'Delete', + save: 'Save', label: 'Мітка', destination: 'destination', description: 'description', diff --git a/screen/settings/settings.js b/screen/settings/settings.js index db6643b0..eaf2754c 100644 --- a/screen/settings/settings.js +++ b/screen/settings/settings.js @@ -39,7 +39,7 @@ export default class Settings extends Component { this.props.navigation.navigate('Language')}> - + this.props.navigation.navigate('About')}> diff --git a/screen/wallets/details.js b/screen/wallets/details.js index e7d8c25e..6bd4c148 100644 --- a/screen/wallets/details.js +++ b/screen/wallets/details.js @@ -1,18 +1,9 @@ +/* global alert */ import React, { Component } from 'react'; -import { ActivityIndicator, View } from 'react-native'; -import { - BlueFormInput, - BlueButton, - SafeBlueArea, - BlueCard, - BlueText, - BlueFormLabel, - BlueFormInputAddress, - BlueSpacing20, - BlueNavigationStyle, -} from '../../BlueComponents'; +import { ActivityIndicator, View, Button, Text, TextInput, Alert } from 'react-native'; +import { BlueButton, SafeBlueArea, BlueCard, BlueFormInputAddress, BlueSpacing20, BlueNavigationStyle } from '../../BlueComponents'; import PropTypes from 'prop-types'; -import { LightningCustodianWallet } from '../../class/lightning-custodian-wallet' +import { LightningCustodianWallet } from '../../class/lightning-custodian-wallet'; let EV = require('../../events'); /** @type {AppStorage} */ let BlueApp = require('../../BlueApp'); @@ -20,9 +11,17 @@ let loc = require('../../loc'); export default class WalletDetails extends Component { static navigationOptions = ({ navigation }) => ({ - ...BlueNavigationStyle(navigation, true), + ...BlueNavigationStyle(), title: loc.wallets.details.title, - headerLeft: null, + headerRight: ( +