Merge pull request ava-labs#159 from ava-labs/dev

Fix Advanced page import X bug
moreati · Feb 10, 2021 · 2f25b8e · 2f25b8e
2 parents 6c1fb52 + 6bab615
commit 2f25b8e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/components/wallet/advanced/ChainImport.vue b/src/components/wallet/advanced/ChainImport.vue
@@ -4,7 +4,7 @@
         <p>{{ $t('advanced.import.desc') }}</p>
         <div v-if="isSuccess" class="is_success">
             <label>Tx ID</label>
-            <p>{{ txId }}</p>
+            <p style="word-break: break-all; font-size: 13px">{{ txId }}</p>
         </div>
         <p class="err" v-else-if="err">{{ err }}</p>
         <template v-if="!isLoading">
@@ -57,14 +57,25 @@ export default class ChainImport extends Vue {
     async atomicImportX() {
         this.beforeSubmit()
         if (!this.wallet) return
+
+        // Import from P
         try {
             let txId = await this.wallet.importToXChain('P')
+            this.onSuccess(txId)
+        } catch (e) {
+            if (this.isSuccess) return
+            this.onError(e)
+        }
+
+        // Import from C
+        try {
             // TODO: Change after ledger support
             if (this.wallet.type !== 'ledger') {
                 let txId2 = await this.wallet.importToXChain('C')
+                this.onSuccess(txId2)
             }
-            this.onSuccess(txId)
         } catch (e) {
+            if (this.isSuccess) return
             this.onError(e)
         }
     }

diff --git a/src/components/wallet/earn/ChainTransfer/ChainTransfer.vue b/src/components/wallet/earn/ChainTransfer/ChainTransfer.vue
@@ -370,7 +370,6 @@ export default class ChainTransfer extends Vue {
     // STEP 3
     async chainImport() {
         let wallet: AvaHdWallet = this.$store.state.activeWallet
-
         let importTxId
         try {
             if (this.targetChain === 'P') {