Merge branch 'master' into menu

This commit is contained in:
Marcos Rodriguez Vélez 2021-11-10 15:14:45 -05:00
commit bf9287c34a
No known key found for this signature in database
GPG key ID: 0D64671698D11C5C
3 changed files with 3 additions and 3 deletions

View file

@ -303,7 +303,7 @@ class AmountInput extends Component {
<Badge status="warning" />
<View style={styles.spacing8} />
<BlueText>
{loc.formatString(loc.send.outdated_rate, { date: dayjs(this.state.mostRecentFetchedRate.LastUpdated).format('LT') })}
{loc.formatString(loc.send.outdated_rate, { date: dayjs(this.state.mostRecentFetchedRate.LastUpdated).format('l LT') })}
</BlueText>
<View style={styles.spacing8} />
<TouchableOpacity

View file

@ -257,7 +257,7 @@
"psbt_this_is_psbt": "This is a Partially Signed Bitcoin Transaction (PSBT). Please finish signing it with your hardware wallet.",
"psbt_tx_export": "Export to file",
"no_tx_signing_in_progress": "There is no transaction signing in progress.",
"outdated_rate": "Rate was last updated at {date}",
"outdated_rate": "Rate was last updated: {date}",
"psbt_tx_open": "Open Signed Transaction",
"psbt_tx_scan": "Scan Signed Transaction",
"qr_error_no_qrcode": "We were unable to find a QR Code in the selected image. Make sure the image contains only a QR Code and no additional content such as text, or buttons.",

View file

@ -155,7 +155,7 @@
"react-native-handoff": "https://github.com/BlueWallet/react-native-handoff#31d005f93d31099d0e564590a3bbd052b8a02b39",
"react-native-haptic-feedback": "1.13.0",
"react-native-idle-timer": "https://github.com/BlueWallet/react-native-idle-timer#8587876d68ab5920e79619726aeca9e672beaf2b",
"react-native-image-picker": "4.1.2",
"react-native-image-picker": "4.2.0",
"react-native-ios-context-menu": "https://github.com/BlueWallet/react-native-ios-context-menu.git#v1.3.0",
"react-native-keychain": "8.0.0",
"react-native-level-fs": "3.0.1",