Merge pull request LN-Zap#2792 from korhaliv/feat/unconf-conf-tx

Show number of confs for incoming onchain txs in activity list
mrfelton · Nov 7, 2019 · 571cc35 · 571cc35
2 parents 576dade + b8867b9
commit 571cc35
Show file tree

Hide file tree

Showing 38 changed files with 110 additions and 4 deletions.
diff --git a/config/default.js b/config/default.js
@@ -139,6 +139,12 @@ module.exports = {
     medium: 6,
     slow: 60,
   },
+  // number of confirmations for the onchain receiving transaction in the context of
+  // transaction finality
+  onchainFinality: {
+    pending: 0,
+    confirmed: 1,
+  },
 
   lnurl: {
     requirePrompt: true,

diff --git a/renderer/components/Activity/Transaction/Transaction.js b/renderer/components/Activity/Transaction/Transaction.js
@@ -1,14 +1,24 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import findLast from 'lodash/findLast'
 import { FormattedTime, FormattedMessage, injectIntl } from 'react-intl'
 import { Box, Flex } from 'rebass/styled-components'
+import config from 'config'
 import { intlShape } from '@zap/i18n'
 import { Message, Text } from 'components/UI'
 import ChainLink from 'components/Icon/ChainLink'
 import { CryptoValue, FiatValue } from 'containers/UI'
 import ErrorLink from '../ErrorLink'
 import messages from './messages'
 
+const { pending, confirmed } = config.onchainFinality
+
+// finality to color mapping
+const DISPLAY_PARAMS = [
+  { finality: pending, msg: messages.pending, color: 'primaryAccent' },
+  { finality: confirmed, msg: messages.confirmed, color: 'superGreen' },
+]
+
 const Transaction = ({ activity, showActivityModal, cryptoUnitName, intl, ...rest }) => {
   const amount = activity.amount || activity.limboAmount || 0
   const isIncoming = activity.received || activity.limboAmount > 0
@@ -18,6 +28,27 @@ const Transaction = ({ activity, showActivityModal, cryptoUnitName, intl, ...res
   } else if (activity.isClosing) {
     type = 'closing'
   }
+  const renderConfirmations = () => {
+    const { num_confirmations } = activity
+
+    // returns color for the current number of confirmations
+    const getDisplayParams = () =>
+      findLast(DISPLAY_PARAMS, ({ finality }) => num_confirmations >= finality)
+
+    if (num_confirmations > confirmed) {
+      return (
+        <Text color="gray" fontSize="xs" fontWeight="normal">
+          <FormattedTime value={activity.time_stamp * 1000} />
+        </Text>
+      )
+    }
+    const { color, msg } = getDisplayParams()
+    return (
+      <Text color={color} fontSize="xs" fontWeight="normal">
+        <FormattedMessage {...msg} />
+      </Text>
+    )
+  }
 
   return (
     <Flex
@@ -62,9 +93,7 @@ const Transaction = ({ activity, showActivityModal, cryptoUnitName, intl, ...res
             )}
           </>
         ) : (
-          <Text color="gray" fontSize="xs" fontWeight="normal">
-            <FormattedTime value={activity.time_stamp * 1000} />
-          </Text>
+          renderConfirmations()
         )}
       </Box>
 

diff --git a/renderer/components/Activity/Transaction/messages.js b/renderer/components/Activity/Transaction/messages.js
@@ -18,4 +18,6 @@ export default defineMessages({
   closetype_breach_close: 'Breach',
   closetype_funding_canceled: 'Funding Canceled',
   closetype_abandoned: 'Abandoned',
+  pending: 'Pending',
+  confirmed: 'Confirmed',
 })
diff --git a/renderer/components/Settings/SettingsPage.js b/renderer/components/Settings/SettingsPage.js
@@ -18,7 +18,8 @@ import PasswordPromptDialog from 'containers/Settings/PasswordPromptDialog'
 import PasswordSetDialog from 'containers/Settings/PasswordSetDialog'
 import messages from './messages'
 
-const isSecurityPaneEnabled = window.Zap.getPlatform() !== 'win32' || config.isWinPlatformSupported
+const isSecurityPaneEnabled =
+  window.Zap.getPlatform() !== 'win32' || config.secureStorage.isWinPlatformSupported
 
 const SettingsMenu = ({ group, setGroup, isLoggedIn, ...rest }) => {
   // Items accessible to unauthenticated users.

diff --git a/translations/af-ZA.json b/translations/af-ZA.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "",
   "components.Activity.Transaction.sent": "",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/ar-SA.json b/translations/ar-SA.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "",
   "components.Activity.Transaction.sent": "",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/bg-BG.json b/translations/bg-BG.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Такса",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Получени",
   "components.Activity.Transaction.sent": "Изпратени",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/ca-ES.json b/translations/ca-ES.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "",
   "components.Activity.Transaction.sent": "",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/cs-CZ.json b/translations/cs-CZ.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "Vynutit lokální zavření",
   "components.Activity.Transaction.closetype_remote_force_close": "Vynutit vzdálené zavření",
   "components.Activity.Transaction.closing": "Zavírání kanálu",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Poplatek",
   "components.Activity.Transaction.funding": "Financování kanálu",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Přijato",
   "components.Activity.Transaction.sent": "Odesláno",
   "components.Activity.Transaction.status_error": "Při odesílání transakce se vyskytl problém.",

diff --git a/translations/da-DK.json b/translations/da-DK.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "Lokal tvungen lukning",
   "components.Activity.Transaction.closetype_remote_force_close": "Fjern tvangslukning",
   "components.Activity.Transaction.closing": "Kanalen lukkes",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Translations gebyr",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Modtaget",
   "components.Activity.Transaction.sent": "Sendt",
   "components.Activity.Transaction.status_error": "Der opstod et problem med at sende din betaling.",

diff --git a/translations/de-DE.json b/translations/de-DE.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "Erzwungenes lokales Schließen",
   "components.Activity.Transaction.closetype_remote_force_close": "Erzwungenes remotes Schließen",
   "components.Activity.Transaction.closing": "Channel wird geschlossen",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Gebühr",
   "components.Activity.Transaction.funding": "Kanal Finanzierung",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Erhalten",
   "components.Activity.Transaction.sent": "Gesendet",
   "components.Activity.Transaction.status_error": "Während dem Senden der Transaktion ist ein Fehler aufgetreten.",

diff --git a/translations/el-GR.json b/translations/el-GR.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Αμοιβή",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Έλαβε",
   "components.Activity.Transaction.sent": "Αποστέλλονται",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/en.json b/translations/en.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "Local force close",
   "components.Activity.Transaction.closetype_remote_force_close": "Remote force close",
   "components.Activity.Transaction.closing": "Channel Closing",
+  "components.Activity.Transaction.confirmed": "Confirmed",
   "components.Activity.Transaction.fee": "Transaction fee",
   "components.Activity.Transaction.funding": "Channel Funding",
+  "components.Activity.Transaction.pending": "Pending",
   "components.Activity.Transaction.received": "Received",
   "components.Activity.Transaction.sent": "Sent",
   "components.Activity.Transaction.status_error": "There was a problem sending your transaction.",

diff --git a/translations/es-ES.json b/translations/es-ES.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "Cierre de fuerza local",
   "components.Activity.Transaction.closetype_remote_force_close": "Cierre de fuerza externa",
   "components.Activity.Transaction.closing": "Canal Cerrándose",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Comisión",
   "components.Activity.Transaction.funding": "Financiamiento de canal",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Recibido",
   "components.Activity.Transaction.sent": "Enviado",
   "components.Activity.Transaction.status_error": "Ocurrió un error con su transacción",

diff --git a/translations/fi-FI.json b/translations/fi-FI.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "",
   "components.Activity.Transaction.sent": "",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/fr-FR.json b/translations/fr-FR.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "Fermeture forcée locale",
   "components.Activity.Transaction.closetype_remote_force_close": "Fermeture forcée distante",
   "components.Activity.Transaction.closing": "Fermeture de canal",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Frais",
   "components.Activity.Transaction.funding": "Ouverture de canal",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Reçu",
   "components.Activity.Transaction.sent": "Envoyé",
   "components.Activity.Transaction.status_error": "Un problème est survenu au cours de l'envoi de votre transaction.",

diff --git a/translations/ga-IE.json b/translations/ga-IE.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "Dúnann an fórsa áitiúil",
   "components.Activity.Transaction.closetype_remote_force_close": "Dún fórsa cianda",
   "components.Activity.Transaction.closing": "Dúnadh an Mhuir nIocht",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Táille idirbhirt",
   "components.Activity.Transaction.funding": "Maoiniú Cainéil",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Faighte",
   "components.Activity.Transaction.sent": "Seolta",
   "components.Activity.Transaction.status_error": "Bhí fadhb ann le do idirbheart a sheoladh.",

diff --git a/translations/he-IL.json b/translations/he-IL.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "",
   "components.Activity.Transaction.sent": "",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/hi-IN.json b/translations/hi-IN.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "",
   "components.Activity.Transaction.sent": "",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/hr-HR.json b/translations/hr-HR.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "Lokalno prisilno zatvaranje",
   "components.Activity.Transaction.closetype_remote_force_close": "Udaljeno prisilno zatvaranje",
   "components.Activity.Transaction.closing": "Zatvaranje kanala",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Naknada",
   "components.Activity.Transaction.funding": "Financiranje kanala",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Primljeno",
   "components.Activity.Transaction.sent": "Poslano",
   "components.Activity.Transaction.status_error": "Došlo je do problema prilikom slanja vaše transakcije.",

diff --git a/translations/hu-HU.json b/translations/hu-HU.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "",
   "components.Activity.Transaction.sent": "",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/it-IT.json b/translations/it-IT.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "Canale in chiusura",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Commissione di transazione",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Ricevuto",
   "components.Activity.Transaction.sent": "Inviato",
   "components.Activity.Transaction.status_error": "Si è verificato un errore durante l'invio della transazione.",

diff --git a/translations/ja-JP.json b/translations/ja-JP.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "ローカル強制終了",
   "components.Activity.Transaction.closetype_remote_force_close": "リモート強制終了",
   "components.Activity.Transaction.closing": "チャンネルは閉鎖されています",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "フィー",
   "components.Activity.Transaction.funding": "チャンネルの資金",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "受け取る",
   "components.Activity.Transaction.sent": "送信した",
   "components.Activity.Transaction.status_error": "トランザクションの送信で問題がありました。",

diff --git a/translations/ko-KR.json b/translations/ko-KR.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "",
   "components.Activity.Transaction.sent": "",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/nl-NL.json b/translations/nl-NL.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Vergoeding",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Ontvangen",
   "components.Activity.Transaction.sent": "Verzonden",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/no-NO.json b/translations/no-NO.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "Lukker kanal",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Transaksjonsavgift",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Mottatt",
   "components.Activity.Transaction.sent": "Sendt",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/pl-PL.json b/translations/pl-PL.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "",
   "components.Activity.Transaction.sent": "",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/pt-BR.json b/translations/pt-BR.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Taxa",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Recebido",
   "components.Activity.Transaction.sent": "Enviado",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/pt-PT.json b/translations/pt-PT.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "",
   "components.Activity.Transaction.sent": "",
   "components.Activity.Transaction.status_error": "",

diff --git a/translations/ro-RO.json b/translations/ro-RO.json
@@ -46,8 +46,10 @@
   "components.Activity.Transaction.closetype_local_force_close": "",
   "components.Activity.Transaction.closetype_remote_force_close": "",
   "components.Activity.Transaction.closing": "",
+  "components.Activity.Transaction.confirmed": "",
   "components.Activity.Transaction.fee": "Taxa",
   "components.Activity.Transaction.funding": "",
+  "components.Activity.Transaction.pending": "",
   "components.Activity.Transaction.received": "Primite",
   "components.Activity.Transaction.sent": "Trimis",
   "components.Activity.Transaction.status_error": "",