Feat/support kly qrcode

src/components/NodesOfflineDialog.vue

@@ -76,7 +76,7 @@ export default {
 @import 'vuetify/_settings.scss';
 @import '@/assets/styles/settings/_colors.scss';
 
-.nodes-offline-dialog {
+.all-nodes-disabled-dialog {
   &__card-text {
     padding: 16px !important;
   }
@@ -91,13 +91,13 @@ export default {
     margin-right: 8px;
   }
   &__btn-block {
-    padding: 16px 0 32px 0;
+    padding: 16px 0 16px 0;
     text-align: center;
   }
 }
 
 .v-theme--dark {
-  .nodes-offline-dialog {
+  .all-nodes-disabled-dialog {
     &__disclaimer {
       color: map-get($shades, 'white');
     }

src/components/SendFundsForm.vue

@@ -214,7 +214,7 @@ import {
   Fees
 } from '@/lib/constants'
 
-import { parseURIasAIP } from '@/lib/uri'
+import { parseURI } from '@/lib/uri'
 import { sendMessage } from '@/lib/adamant-api'
 import { replyMessageAsset } from '@/lib/adamant-api/asset'
 
@@ -310,6 +310,7 @@ export default {
     increaseFee: false,
     showWarningOnPartnerAddressDialog: false,
     warningOnPartnerInfo: {},
+    klayrOptionalMessage: '',
 
     // Account exists check
     // Currently works only with KLY
@@ -671,7 +672,7 @@ export default {
      */
     onPasteURIAddress(e) {
       const data = e.clipboardData.getData('text')
-      const address = parseURIasAIP(data).address
+      const address = parseURI(data).address
 
       if (validateAddress(this.currency, address)) {
         e.preventDefault()
@@ -687,7 +688,7 @@ export default {
      */
     onPasteURIComment(e) {
       nextTick(() => {
-        const params = parseURIasAIP(e.target.value).params
+        const params = parseURI(e.target.value).params
 
         if (params.message) {
           this.comment = params.message
@@ -700,18 +701,20 @@ export default {
      * @param {string} uri URI
      */
     onScanQrcode(uri) {
-      const recipient = parseURIasAIP(uri)
-
-      this.cryptoAddress = ''
-      if (validateAddress(this.currency, recipient.address)) {
-        this.cryptoAddress = recipient.address
-        if (recipient.params.amount) {
-          const amount = formatNumber(this.exponent)(recipient.params.amount)
-
+      const recipient = parseURI(uri)
+      const { params, address, crypto } = recipient
+      const isValidAddress = validateAddress(this.currency, address)
+      if (isValidAddress) {
+        this.cryptoAddress = address
+        if (params.amount && !this.amountString) {
+          const amount = formatNumber(this.exponent)(params.amount)
           if (Number(amount) <= this.maxToTransfer) {
             this.amountString = amount
           }
         }
+        if (crypto === Cryptos.KLY) {
+          this.textData = params.reference ? params.reference : ''
+        }
       } else {
         this.$emit('error', this.$t('transfer.error_incorrect_address', { crypto: this.currency }))
       }

src/lib/uri.js

@@ -2,6 +2,8 @@ import { isAddress as isEthAddress, isHexStrict } from 'web3-utils'
 import { validateBase32Address as isKlyAddress } from '@klayr/cryptography'
 import { Cryptos, CryptosInfo } from './constants'
 
+const KLAYR_WALLET = 'klayr://wallet'
+
 /**
  * Get an ADAMANT URI from the address bar or argv[]
  * Complies with AIP-2, AIP-8, AIP-9
@@ -18,11 +20,68 @@ export function getAddressBarURI() {
   return aip2 || document.URL
 }
 
+const formQueryParamsObject = (query) => {
+  return query.split('&').reduce((accum, param) => {
+    const [key, value = ''] = param.split('=')
+    return key && value
+      ? {
+          ...accum,
+          [key]: window.decodeURIComponent(
+            value.includes('+') ? value.replace(/\+/g, ' ') : value
+          )
+        }
+      : accum
+  }, {})
+}
+
+/**
+* Parse info from an URI
+* @param {string} uri URI. Default is address bar or argv[].
+* @returns {
+*   {
+*     address: string,
+*     crypto: string,
+*     params: Object<string, string>,
+*     protocol: string
+*   }
+* }
+*/
+export function parseURI(uri = getAddressBarURI()) {
+  const [origin, query = ''] = uri.split('?')
+  if (origin === KLAYR_WALLET) return parseKlyURI(query)
+  return parseURIasAIP(uri)
+}
+
+/**
+* Parse info from an URI of the Klayr wallet
+* Ex.: klayr://wallet?modal=send&recipient=klyap2bbanxn4agw286ofz85zf3y2brdzjdyoby8r&amount=123&token=0000000000000000&recipientChain=00000000
+* @param {string} URI's query parameters
+* @returns {
+*   {
+*     address: string,
+*     crypto: string,
+*     params: Object<string, string>,
+*     protocol: string
+*   }
+* }
+*/
+function parseKlyURI(query) {
+  let address = ''
+  let params = {}
+
+  if (query) {
+    params = formQueryParamsObject(query)
+    address = params.recipient || ''
+  }
+
+  return { address, crypto: Cryptos.KLY, params, protocol: Cryptos.KLY.toLowerCase() }
+}
+
 /**
  * Parse info from an URI containing a cryptocurrency address
  * Complies with AIP-2, AIP-8, AIP-9
  * Sample: https://msg.adamant.im?address=U9821606738809290000&label=John+Doe&amount=1.12&message=Buy+a+beer
- * @param {string} uri URI. Default is address bar or argv[].
+ * @param {string} URI
  * @returns {
  *   {
  *     address: string,
@@ -39,22 +98,10 @@ export function parseURIasAIP(uri = getAddressBarURI()) {
   let params = Object.create(null)
   let protocol = ''
 
-  if (query) {
-    params = query.split('&').reduce((accum, param) => {
-      const [key, value = ''] = param.split('=')
-      return key && value
-        ? {
-            ...accum,
-            [key]: window.decodeURIComponent(
-              value.includes('+') ? value.replace(/\+/g, ' ') : value
-            )
-          }
-        : accum
-    }, Object.create(null))
-  }
+  if (query) params = formQueryParamsObject(query)
 
   if (origin.includes(':')) {
-    ;[protocol, address] = origin.split(':')
+    [protocol, address] = origin.split(':')
     if (protocol === 'ethereum') {
       crypto = Cryptos.ETH
     } else if (/^https?$/.test(protocol) || /^app$/.test(protocol)) {