Skip to content

Commit

Permalink
v2.4.0
Browse files Browse the repository at this point in the history
- Resfinex Token (RES) support
- Updated Stably Dollar (USDS) name and Logo
- Adjusted Send Token menu height
- Client-Node socket connection
- New status 'In blockchain' for messages
- Updated Buy&Sell tokens dialog
- Added validation for BTC addresses
- Fix for paste from clipboard address validation
- Fix negative to send amount
  • Loading branch information
adamant-al authored Feb 1, 2020
2 parents 33b51f3 + 66caf25 commit f8208c0
Show file tree
Hide file tree
Showing 38 changed files with 507 additions and 12,788 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adamant-im",
"version": "2.3.0",
"version": "2.4.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down Expand Up @@ -45,9 +45,9 @@
"qrcode": "^1.3.2",
"qs": "^6.6.0",
"register-service-worker": "^1.0.0",
"rxjs": "^6.3.3",
"semver": "^5.5.1",
"simple-audio": "^1.0.1",
"socket.io-client": "^2.2.0",
"sodium-browserify-tweetnacl": "^0.2.3",
"throttle-promise": "^1.0.4",
"underscore": "^1.9.1",
Expand Down
3 changes: 1 addition & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import dayjs from 'dayjs'
import Notifications from '@/lib/notifications'
import AppInterval from '@/lib/AppInterval'
export default {
created () {
Expand All @@ -22,7 +21,7 @@ export default {
},
beforeDestroy () {
this.notifications.stop()
AppInterval.unsubscribe()
this.$store.dispatch('stopInterval')
},
computed: {
layout () {
Expand Down
9 changes: 9 additions & 0 deletions src/assets/stylus/components/_chat.styl
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,11 @@ $chat-avatar-size := 40px
i
line-height: 1.2

&__blockchain-status
font-size: 12px
line-height: 1
margin-right: 5px

&__direction
font-size: 14px
font-weight: 300
Expand Down Expand Up @@ -225,6 +230,8 @@ $chat-avatar-size := 40px
color: $grey.darken-4
&__timestamp
color: $adm-colors.muted
&__blockchain-status
color: $adm-colors.muted
&__amount
color: $adm-colors.regular
&__direction
Expand Down Expand Up @@ -281,6 +288,8 @@ $chat-avatar-size := 40px
color: $shades.white
&__timestamp
color: $grey.base
&__blockchain-status
color: $grey.base
&__message-text
a
color: $blue.lighten-2
Expand Down
5 changes: 3 additions & 2 deletions src/components/AChat/AChatMessage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
</div>

<div v-if="!hideTime" class="a-chat__message-card-header mt-1">
<div v-if="status === 'confirmed'" class="a-chat__blockchain-status">&#x26AD;</div>
<div :title="timeTitle" class="a-chat__timestamp">{{ time }}</div>
<div v-if="isOutgoingMessage" class="a-chat__status">
<v-icon
Expand All @@ -42,7 +43,7 @@
export default {
computed: {
statusIcon () {
if (this.status === 'delivered') {
if (this.status === 'confirmed' || this.status === 'delivered') {
return 'mdi-check'
} else if (this.status === 'pending') {
return 'mdi-clock-outline'
Expand Down Expand Up @@ -74,7 +75,7 @@ export default {
status: {
type: String,
default: 'confirmed',
validator: v => ['delivered', 'pending', 'rejected'].includes(v)
validator: v => ['confirmed', 'delivered', 'pending', 'rejected'].includes(v)
},
userId: {
type: String,
Expand Down
7 changes: 4 additions & 3 deletions src/components/AChat/AChatTransaction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ export default {
},
computed: {
statusIcon () {
if (this.status === 'delivered') {
if (this.status === 'confirmed') {
return 'mdi-check'
} else if (this.status === 'pending') {
} else if (this.status === 'pending' || this.status === 'delivered') {
return 'mdi-clock-outline'
} else if (this.status === 'rejected') {
return 'mdi-close-circle-outline'
Expand Down Expand Up @@ -115,6 +115,7 @@ export default {
sent: 'Sent',
received: 'Received',
statuses: {
confirmed: '',
delivered: '',
pending: '',
rejected: '',
Expand All @@ -130,7 +131,7 @@ export default {
status: {
type: String,
default: 'confirmed',
validator: v => ['delivered', 'pending', 'rejected', 'invalid', 'unknown'].includes(v)
validator: v => ['confirmed', 'delivered', 'pending', 'rejected', 'invalid', 'unknown'].includes(v)
},
isClickable: {
type: Boolean,
Expand Down
5 changes: 5 additions & 0 deletions src/components/BuyTokensDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ export default {
? `https://adamant.im/buy-tokens/?wallet=${this.adamantAddress}`
: 'https://adamant.im/buy-tokens'
},
{
icon: 'RES',
title: 'Resfinex',
link: 'https://trade.resfinex.com/?pair=ADM_USDT'
},
{
icon: 'BZ',
title: 'Bit-Z',
Expand Down
4 changes: 4 additions & 0 deletions src/components/Chat/ChatMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ export default {
<style lang="stylus" scoped>
@import '~vuetify/src/stylus/settings/_colors.styl'
.v-menu__content
max-height: 70%
min-width: 200px!important
/** Themes **/
.theme--light
.chat-menu
Expand Down
2 changes: 1 addition & 1 deletion src/components/ChatPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export default {
return this.getTransactionStatus(this.transaction)
},
statusIcon () {
if (this.status === 'delivered') {
if (this.status === 'confirmed' || this.status === 'delivered') {
return 'mdi-check'
} else if (this.status === 'pending') {
return 'mdi-clock-outline'
Expand Down
22 changes: 12 additions & 10 deletions src/components/SendFundsForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,11 @@ export default {
amount = amount.minus(0.00001)
}
return amount
const amt = amount
.minus(this.calculateTransferFee(this.balance))
.toNumber()
return Math.max(amt, 0)
},
/**
* String representation of `this.maxToTransfer`
Expand Down Expand Up @@ -446,18 +448,18 @@ export default {
/**
* Parse address from an URI on paste text
* @param {string} e Event
* @param {ClipboardEvent} e Event
*/
onPasteURIAddress (e) {
this.$nextTick(() => {
const address = parseURI(e.target.value).address
const data = e.clipboardData.getData('text')
const address = parseURI(data).address
if (validateAddress(this.currency, address)) {
this.cryptoAddress = address
} else {
this.$emit('error', this.$t('transfer.error_incorrect_address', { crypto: this.currency }))
}
})
if (validateAddress(this.currency, address)) {
e.preventDefault()
this.cryptoAddress = address
} else {
this.$emit('error', this.$t('transfer.error_incorrect_address', { crypto: this.currency }))
}
},
/**
Expand Down
2 changes: 1 addition & 1 deletion src/components/icons/BnzFill.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<g>
<path d="M417.8,248c0,0,34.4-26.2,34.1-100.2c0,0,3.8-76.4-80.6-115.4c-24.7-11-51.4-16.6-78.4-16.3h-246c-3.6-0.2-6.7,2.5-7.1,6.1v467.7c0.2,3.6,3.4,6.4,7,6.1l254.1-1.4c41.4,0.4,83.3-7.7,115.8-30.2c30.4-21.1,47.8-43.8,54.6-96.7C471.4,367.7,483,291.2,417.8,248z M346.5,188.9L225.7,320.6h121V372H136.4v-42.7l124-133.3h-124v-48.4h210.2L346.5,188.9z"/>
<path d="m394.34375,248.007736c0,0 29.62619,-22.564117 29.367828,-86.294891c0,0 3.272644,-65.797707 -69.414886,-99.385548c-21.272278,-9.473495 -44.267029,-14.29636 -67.520172,-14.037994l-211.861717,0c-3.10041,-0.172245 -5.770218,2.153069 -6.114708,5.253483l0,402.795685c0.172249,3.100403 2.928169,5.511841 6.028587,5.253479l218.837669,-1.205719c35.654785,0.344482 71.740173,-6.631439 99.730042,-26.009033c26.181305,-18.171906 41.166626,-37.721741 47.02298,-83.280609c0.086121,0 10.076355,-65.88385 -46.075623,-103.088852zm-61.405457,-50.898483l-104.036179,113.423553l104.20845,0l0,44.267029l-181.115982,0l0,-36.774384l106.792099,-114.801483l-106.792099,0l0,-41.68338l181.029831,0l-0.086121,35.568665z"/>
</g>
</template>
2 changes: 2 additions & 0 deletions src/components/icons/CryptoIcon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import DashFillIcon from './DashFill'
import KcsFillIcon from './KcsFill'
import LskFillIcon from './LskFill'
import UsdsFillIcon from './UsdsFill'
import ResFillIcon from './ResFill'
import BtcFillIcon from './BtcFill'
import UnknownCryptoFillIcon from './UnknownCryptoFill'
Expand All @@ -39,6 +40,7 @@ export default {
KcsFillIcon,
LskFillIcon,
UsdsFillIcon,
ResFillIcon,
BtcFillIcon,
UnknownCryptoFillIcon
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/icons/DogeFill.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<g>
<g id="path3759">
<path d="M242.7,496c-27.4,0-55.8-1.5-84.8-2.9c-8.6-0.5-17.3-0.9-26-1.3l-44.8-2.1V18.6l45.7-1.3C243.2,14.2,357.2,11,429.5,82c42.5,41.7,62.8,101.3,62.1,182.2v2c-4.1,81.4-26.6,139.5-68.7,177.4C375.3,486.5,312.3,496,242.7,496z M181.1,400.1c77.9,3.9,144.2,4.9,178.8-26.3c22.5-20.3,34.8-56.7,37.7-111.4c0.4-53.6-10.7-90.7-33.9-113.4C327.1,113.1,256.1,109,181,110.1v290H181.1z"/>
<path d="m245.999176,474.609467c-24.72522,0 -50.352844,-1.353577 -76.521866,-2.616882c-7.760468,-0.451202 -15.611191,-0.812164 -23.461884,-1.173126l-40.426643,-1.894989l0,-425.11145l41.238777,-1.173092c99.622803,-2.797379 202.494186,-5.684998 267.736282,58.384014c38.351166,37.629272 56.669495,91.411148 56.037842,164.413742l0,1.804749c-3.699768,73.453766 -24.003326,125.88208 -61.993561,160.082306c-42.953308,38.712128 -99.803253,47.284729 -162.608948,47.284729zm-55.586624,-86.5383c70.295456,3.519287 130.123245,4.421661 161.345596,-23.732574c20.303589,-18.318359 31.402863,-51.165009 34.019775,-100.525208c0.360931,-48.367599 -9.655457,-81.845901 -30.590698,-102.329941c-33.02713,-32.395462 -97.09613,-36.09523 -164.864929,-35.102608l0,261.690331l0.090256,0z"/>
</g>
<g id="rect2987">
<rect x="20.4" y="213.3" width="248.4" height="86.8"/>
<rect height="78.326625" width="224.15131" y="219.506499" x="45.4"/>
</g>
</g>
</template>
5 changes: 5 additions & 0 deletions src/components/icons/ResFill.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<template>
<g>
<path fill-rule="evenodd" d="m108.630844,32.695637c-17.101631,3.094212 -29.72084,15.170784 -35.069061,33.554272l-1.06237,3.651657l-0.118492,149.56427l-0.118484,149.564255l1.081215,2.978424c3.024193,8.332001 9.247627,16.103882 15.33506,19.149628c15.449501,7.72879 37.770103,-2.855896 41.765106,-19.805359c0.61264,-2.598724 0.694794,-18.895172 0.700165,-139.036163l0.006744,-136.092728l31.608612,19.557617c17.384399,10.755676 76.148804,47.058105 130.588318,80.671631c54.439514,33.613525 99.009369,61.279648 99.045685,61.481613c0.036377,0.200623 -60.936249,35.256226 -135.494904,77.900574c-74.558594,42.644379 -144.257767,82.514984 -154.886887,88.602417c-20.916214,11.978271 -23.295441,13.678864 -26.331757,18.826477c-5.286278,8.960815 -4.770576,18.405029 1.598274,29.218597c6.169571,10.474274 13.113365,14.827423 23.649567,14.827423c7.513359,0 -2.116669,5.275513 168.304543,-92.186707c161.722992,-92.489685 164.685272,-94.20105 170.468384,-98.509827c28.67868,-21.364563 27.874817,-55.449371 -1.825806,-77.430649c-2.134155,-1.579422 -35.100037,-22.136124 -73.257935,-45.680664c-97.810974,-60.353256 -180.861832,-111.643356 -198.722885,-122.722191c-20.527084,-12.735004 -21.376724,-13.14299 -34.020157,-16.320683c-7.84594,-1.972591 -17.885284,-2.734699 -23.242935,-1.763885" id="path0"/>
</g>
</template>
19 changes: 8 additions & 11 deletions src/components/icons/UsdsFill.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
<template>
<g>
<path d="M372.3,330.6c0.1,14.6-3,29-9.2,42.3c-6.1,12.9-15,24.2-25.9,33.4c-11.1,9.4-24.5,16.7-40.2,21.9
c-15.7,5.2-33.1,7.8-52.3,7.8c-18.4,0-36.7-2-54.6-6c-17.5-3.7-34.4-9.6-50.5-17.5l14.8-55.8c13.3,6.3,27.1,11.3,41.2,15.1
c15.3,4.2,31.1,6.3,46.9,6.3c17.1,0,31-3.6,41.8-10.7c10.8-7.1,16.2-17.5,16.2-31c0-12.5-5.1-22.8-15.4-30.8
c-10.2-8-26-16.4-47.1-25c-13.7-5.6-27.1-12.2-40-19.6c-10.8-6.1-20.6-13.8-29.2-22.7c-7.7-8.1-13.9-17.6-18.2-27.9
c-4.3-10.2-6.4-21.8-6.4-34.7c0-32,10.7-56.6,32-73.8C197.7,84.6,226.3,76,262.1,76c17-0.1,34.1,1.6,50.7,5.2
c15.5,3.5,30.5,9.2,44.6,16.7l-13.3,55.8c-12.1-6-24.7-10.8-37.7-14.3c-13.1-3.6-26.6-5.5-40.2-5.5c-15,0-27.1,2.9-36.4,8.6
c-9.2,5.7-13.8,14.7-13.8,26.9c-0.1,5,0.7,9.9,2.3,14.6c1.8,4.6,4.7,8.6,8.5,11.7c5,4.2,10.4,7.9,16.1,11
c6.7,3.7,15.1,7.8,25.4,12.3c13.7,5.9,26.7,12.2,39.2,18.8c11.9,6.2,23,13.9,33.1,23c9.4,8.6,17.3,18.8,23.1,30.3
C369.4,302.4,372.3,315.6,372.3,330.6L372.3,330.6z"/>
<path d="M116.5,286.9v-23.6h286.3v23.6H116.5L116.5,286.9z M116.5,247.3v-23.6h286.3v23.6H116.5L116.5,247.3z"/>
<g id="usds_logo">
<path id="XMLID_17_" d="m382.898712,382.975708c-34.168945,34.168884 -79.587463,52.95932 -127.898712,52.95932c-48.311203,0 -93.729736,-18.815125 -127.898674,-52.95932c-21.831543,-21.831573 -37.753967,-48.855225 -46.086067,-78.202972l-53.874218,0c23.092476,106.438049 118.651821,183.478912 227.858959,183.478912c109.207153,0 204.766479,-77.065613 227.858948,-183.478912l-53.874237,0c-8.332001,29.347717 -24.254456,56.371399 -46.085999,78.202972z"/>
<path id="XMLID_5_" d="m434.844421,235.767288c0.692291,6.428314 1.013672,12.930817 1.013672,19.309662c0,6.40358 -0.34613,12.881363 -1.013672,19.309677l52.539063,0c0.543945,-6.527222 0.815918,-13.029694 0.815918,-19.309677c0,-6.279953 -0.271973,-12.78244 -0.815918,-19.309662l-52.539063,0z"/>
<path id="XMLID_4_" class="st2" d="m74.141899,255.07695c0,-6.378845 0.346138,-12.881348 1.013695,-19.309662l-52.539099,0c-0.543936,6.502487 -0.815903,13.004974 -0.815903,19.309662s0.271967,12.807175 0.815903,19.309677l52.539099,0c-0.667557,-6.428314 -1.013695,-12.930786 -1.013695,-19.309677z"/>
<path id="XMLID_3_" d="m127.101311,127.178253c34.168953,-34.144226 79.587456,-52.959412 127.898689,-52.959412c48.311249,0 93.729767,18.815186 127.898712,52.984131c21.831543,21.806824 37.753998,48.83046 46.085999,78.178177l53.874237,0c-23.092468,-106.438026 -118.651794,-183.478886 -227.858948,-183.478886c-109.207138,0 -204.766472,77.040852 -227.858955,183.478886l53.874199,0c8.332085,-29.347717 24.254517,-56.346649 46.086067,-78.202896z"/>
<g id="XMLID_40_">
<path id="XMLID_41_" d="m262.862335,357.707397l-14.537872,0c-3.387238,0 -5.093231,-1.705963 -5.093231,-5.09314l0,-18.64212l-1.705948,0c-12.26326,0 -21.831512,-3.510864 -28.704895,-10.532562c-6.873352,-7.021698 -10.285309,-16.738373 -10.285309,-29.174622l0,-4.598724c0,-3.387238 1.681259,-5.093231 5.093201,-5.093231l20.570602,0c3.387238,0 5.093201,1.705994 5.093201,5.093231l0,1.681213c0,6.131622 1.211517,10.334778 3.63446,12.584656c2.423004,2.249908 6.848663,3.387238 13.326416,3.387238l9.691895,0c6.304718,0 10.680878,-1.211456 13.202759,-3.634491c2.497162,-2.422974 3.758148,-6.947479 3.758148,-13.548889l0,-3.63443c0,-4.030121 -1.211548,-7.170074 -3.634521,-9.444672c-2.422943,-2.249939 -5.241547,-3.782867 -8.480408,-4.598755c-2.892731,-0.642853 -8.604065,-1.359833 -17.059769,-2.175751c-8.480408,-0.815887 -14.80983,-1.804871 -19.012955,-3.016357c-4.203125,-1.211456 -8.480438,-3.263611 -12.831909,-6.18103c-9.049088,-5.810226 -13.548889,-17.18338 -13.548889,-34.144241l0,-8.950195c0,-12.757736 3.436646,-22.548538 10.285278,-29.421875c6.848633,-6.873352 16.515808,-10.285309 28.927414,-10.285309l1.705978,0l0,-19.136581c0,-3.387238 1.705963,-5.093201 5.093201,-5.093201l14.537842,0c3.387268,0 5.093231,1.705963 5.093231,5.093201l0,19.136581l0.494446,0c11.472107,0 20.496429,3.560287 27.12262,10.656158c6.626068,7.095886 9.939087,16.787781 9.939087,29.051025l0,4.598709c0,3.387222 -1.705963,5.093231 -5.093201,5.093231l-20.570587,0c-3.387238,0 -5.093201,-1.706009 -5.093201,-5.093231l0,-1.705948c0,-6.131622 -1.162048,-10.334747 -3.510803,-12.584686c-2.348816,-2.249878 -6.823914,-3.387207 -13.450073,-3.387207l-7.738663,0c-6.626099,0 -11.101196,1.260941 -13.450012,3.758072c-2.348801,2.497162 -3.510834,7.392578 -3.510834,14.661514l0,4.845947c0,3.560303 1.211472,6.329422 3.634445,8.356812c2.423004,2.027405 5.167389,3.362518 8.233215,4.005341c3.560272,0.642822 9.568283,1.335098 18.048706,2.052124c8.480438,0.71701 14.859283,1.780136 19.136566,3.139969c4.277344,1.359818 8.505188,3.510849 12.708282,6.428299c8.554596,6.131638 12.83194,17.109207 12.83194,32.932755l0,9.197418c0,12.584686 -3.510895,22.375488 -10.532562,29.298309c-7.021698,6.947479 -16.589996,10.408875 -28.704926,10.408875l-0.494446,0l0,18.64212c-0.02475,3.362488 -1.730682,5.068451 -5.11792,5.068451z"/>
</g>
</g>
</template>
10 changes: 6 additions & 4 deletions src/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,12 @@
"title": "Chats",
"too_long": "Nachricht zu lang",
"transaction_statuses": {
"delivered": "Transaction is confirmed on token’s network",
"invalid": "Information about transaction, fetched from rich message in ADAMANT newtwork, differs from information, fetched from token’s network or this type of cryptocurrency is not supported",
"pending": "Transaction is not confirmed yet",
"rejected": "Transaction is cancelled or not accepted on token’s network"
"confirmed": "Confirmed in token’s blockchain",
"delivered": "Delivered to Node",
"invalid": "Incorrect information. Check transaction in token's blockchain carefully",
"pending": "Not confirmed yet",
"rejected": "The transaction is cancelled or not accepted",
"unknown": "This cryptocurrency is not supported yet"
},
"welcome_message": "ADAMANT ist ein Messenger, der vollständig auf der Blockchain funktioniert. Er ist unabhängig von Staaten, Konzernen und sogar Entwicklern. Das wird dank der dezentralen Netzinfrastruktur ermöglicht, deren Quellcode offen ist und die von Nutzern unterstützt wird. Deswegen kostet jede Transaktion wie Versand von Nachrichten oder Speichern von Kontakten eine Netzwerkgebühr von 0.001 ADM.\n\nDie Blockchain hilft, herausragende Sicherheit und Privatsphäre zu erlangen, die für keinen gewöhnlichen P2P- oder zentralisierten Messenger verfügbar ist. Außerdem stellt die Blockchain neue Möglichkeiten dar. Sie können Kryptowährungen in der Wallet aufbewahren sowie direkt im Chat versenden, ohne dabei die Kontrolle über Ihre privaten Schlüssel zu verlieren, oder auch ADAMANT als eine 2FA-Lösung verwenden.\n\nIn ADAMANT kann kein Konto kontrolliert, geblockt, deaktiviert, eingeschränkt oder zensiert werden. Alle Nutzer tragen die volle Verantwortung für die Inhalte, Nachrichten, Medien, Absichten und Ziele bei der Nutzung des Messenger.\n\nBedenken Sie, dass Sicherheit und Anonymität auch von Ihnen selbst abhängt. Folgen Sie keinen Links in den Chats, andernfalls kann Ihre IP-Adresse für Dritte sichtbar werden. Verwenden Sie einen PIN-Code auf Ihrem Gerät. Mehr Informationen zu Sicherheit und Anonymität lesen Sie hier: https://adamant.im/de-staysecured/.\n\nVergewissern Sie sich, dass sie die Passphrase von Ihrem Konto gespeichert haben – loggen Sie sich aus und wieder ein. Schreiben Sie die Passphrase auf einem Stück Papier. Nur Sie tragen die Verantwortung für die sichere Aufbewahrung Ihrer Passphrase. Diese kann nämlich nicht wiederhergestellt werden. Gelangt Sie in die Hände Dritter, verlieren Sie Ihr Geld und Ihr Chatverlauf wird gelesen. Behandeln Sie Ihre Passphrase so, als würden Tokens in Ihrer Wallet 1.000.000.000 Dollar kosten.\n\nUm mit einer Konversation zu beginnen, erhalten Sie zuerst kostenlose Tokens im Account-Tab. Erstellen Sie einen neuen Chat und geben Sie die ADM-Adresse Ihres Gesprächspartners. Zeigen Sie Ihre ADM-Adresse persönlich und senden Sie sie nicht über andere Messenger.",
"welcome_message_title": "Willkommen in ADAMANT",
Expand Down
10 changes: 7 additions & 3 deletions src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
"start_chat": "Start a chat",
"title": "Chats",
"too_long": "The message is too long",
"transaction_statuses": {
"delivered": "Confirmed in token’s blockchain",
"transaction_statuses": {
"confirmed": "Confirmed in token’s blockchain",
"delivered": "Delivered to Node",
"invalid": "Incorrect information. Check transaction in token's blockchain carefully",
"pending": "Not confirmed yet",
"rejected": "The transaction is cancelled or not accepted",
Expand Down Expand Up @@ -122,7 +123,10 @@
"nodeLabelDescription": "Support decentralization and enhance privacy level—<a target=\"_blank\" href=\"https://medium.com/adamant-im/how-to-run-your-adamant-node-on-ubuntu-990e391e8fcc\">run your own ADAMANT node</a>. To add your nodes to the list, you need <a target=\"_blank\" href=\"https://github.com/Adamant-im/adamant-im/\">to deploy web application on separate domain</a>. This limitation refers to Content Security Policy (CSP).",
"offline": "Offline",
"ping": "Ping",
"unsupported": "Unsupported"
"socket": "Socket",
"unsupported": "Unsupported",
"use_socket_connection": "Use socket connection by default",
"use_socket_connection_tooltip": ""
},
"notifications": {
"tabMessage": {
Expand Down
Loading

0 comments on commit f8208c0

Please sign in to comment.