feat: auto-add the recipient if loading the modal using a URI (#1936)

ArkEcosystem · May 20, 2020 · b533eb2 · b533eb2
1 parent 2f6d978
commit b533eb2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/__tests__/unit/components/Transaction/TransactionForm/TransactionFormTransfer.spec.js b/__tests__/unit/components/Transaction/TransactionForm/TransactionFormTransfer.spec.js
@@ -986,16 +986,16 @@ describe('TransactionFormTransfer', () => {
       it('should load in schema form data', () => {
         wrapper.setProps({
           schema: {
-            amount: (10 * 1e8).toString(),
             address: 'address-5',
+            amount: 100,
             vendorField: 'test vendorfield'
           }
         })
 
         wrapper.vm.populateSchema()
 
-        expect(wrapper.vm.amount).toBe((10 * 1e8).toString())
-        expect(wrapper.vm.recipientId).toBe('address-5')
+        expect(wrapper.vm.form.recipients[0].address).toBe('address-5')
+        expect(wrapper.vm.form.recipients[0].amount).toEqual(new BigNumber(100 * 1e8))
         expect(wrapper.vm.form.vendorField).toBe('test vendorfield')
       })
 

diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
@@ -559,9 +559,26 @@ export default {
         return
       }
 
-      this.$set(this, 'amount', this.schema.amount || '')
-      this.$set(this, 'recipientId', this.schema.address || '')
-      this.$set(this.form, 'vendorField', this.schema.vendorField || '')
+      try {
+        if (this.schema.address && this.schema.amount) {
+          if (WalletService.validateAddress(this.schema.address, this.session_network.version)) {
+            this.$v.form.recipients.$model = []
+            this.$v.form.recipients.$model.push({
+              address: this.schema.address,
+              amount: this.currency_unitToSub(this.schema.amount),
+              sendAll: false
+            })
+          } else {
+            throw new Error(this.$t('VALIDATION.RECIPIENT_DIFFERENT_NETWORK', [
+              this.wallet_truncate(this.schema.address)
+            ]))
+          }
+        }
+
+        this.$set(this.form, 'vendorField', this.schema.vendorField || '')
+      } catch (error) {
+        this.$error(`${this.$t('TRANSACTION.ERROR.LOAD_FROM_URI')}: ${error.message}`)
+      }
 
       if (this.schema.wallet) {
         const currentProfileId = this.$store.getters['session/profileId']

diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
@@ -1135,6 +1135,7 @@ export default {
     LEDGER_SIGN_FAILED: 'Could not sign transaction with Ledger',
     LEDGER_USER_DECLINED: 'User declined',
     LOAD_FROM_FILE: 'Load transaction from file',
+    LOAD_FROM_URI: 'Load transaction from URI',
     MULTIPLE: 'Multiple',
     NONCE: 'Nonce',
     NO_RECIPIENTS: 'There are no recipient(s)',