Merge pull request #2531 from BlueWallet/fix-2201

FIX: 'Few seconds ago' -> 'pending'
BlueWallet · Jan 25, 2021 · 2448a15 · 2448a15
2 parents 9de0bc5 + 97032e7
commit 2448a15
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/components/WalletsCarousel.js b/components/WalletsCarousel.js
@@ -241,6 +241,8 @@ const WalletCarouselItem = ({ item, index, onPress, handleLongPress, isSelectedW
           <Text numberOfLines={1} style={[iStyles.latestTxTime, { color: colors.inverseForegroundColor }]}>
             {item.getBalance() !== 0 && item.getLatestTransactionTime() === 0
               ? loc.wallets.pull_to_refresh
+              : item.getTransactions().find(tx => tx.confirmations === 0)
+              ? loc.transactions.pending.toLowerCase()
               : transactionTimeToReadable(item.getLatestTransactionTime())}
           </Text>
         </LinearGradient>

diff --git a/screen/wallets/reorderWallets.js b/screen/wallets/reorderWallets.js
@@ -149,7 +149,9 @@ const ReorderWallets = () => {
             {loc.wallets.list_latest_transaction}
           </Text>
           <Text numberOfLines={1} style={styles.latestTxValue}>
-            {transactionTimeToReadable(item.getLatestTransactionTime())}
+            {item.getTransactions().find(tx => tx.confirmations === 0)
+              ? loc.transactions.pending.toLowerCase()
+              : transactionTimeToReadable(item.getLatestTransactionTime())}
           </Text>
         </LinearGradient>
       </View>