Merge pull request #232 from edge/fix/223-clipboard-check-update

fix: update clipboard check to be in line with explorer
edge · Jun 6, 2023 · b1edd86 · b1edd86
2 parents d199960 + 9b878f7
commit b1edd86
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/components/index/CreateModal.vue b/src/components/index/CreateModal.vue
@@ -18,7 +18,6 @@
             </button>
             <button
               class="flex-shrink-0 w-24 ml-24 text-green on-clicked-effect"
-              v-if="canCopy"
               @click="copyToClipboard(address)"
             >
               <ClipboardCopyIcon/>
@@ -33,7 +32,6 @@
             </span>
             <button
               class="flex-shrink-0 w-24 text-green ml-18 on-clicked-effect"
-              v-if="canCopy"
               @click="copyToClipboard(privateKey)"
             >
               <ClipboardCopyIcon/>
@@ -130,8 +128,6 @@ export default {
 
       password: '',
       confirmPhrase: '',
-
-      canCopy: !!navigator.clipboard,
       phrase: confirmPhrase
     }
   },
@@ -174,8 +170,10 @@ export default {
       this.create()
     },
     copyToClipboard(input) {
-      if (!this.canCopy) window.alert('Clipboard unavailable. Please copy-paste manually.')
-      return navigator.clipboard.writeText(input)
+      if (!!navigator.clipboard) {
+        return navigator.clipboard.writeText(input)
+      }
+      window.alert('Clipboard unavailable. Please copy-paste manually.')
     },
     generateWallet() {
       const wallet = xe.wallet.create()

diff --git a/src/components/index/ExportModal.vue b/src/components/index/ExportModal.vue
@@ -38,7 +38,6 @@
             <span class="font-mono break-all text-sm2">{{ address }}</span>
             <button
               class="flex-shrink-0 w-24 ml-24 text-green on-clicked-effect"
-              v-if="canCopy"
               @click.prevent="copyToClipboard(address)"
             >
               <ClipboardCopyIcon/>
@@ -53,7 +52,6 @@
             </span>
             <button
               class="flex-shrink-0 w-24 text-green ml-18 on-clicked-effect"
-              v-if="canCopy"
               @click.prevent="copyToClipboard(privateKey)"
             >
               <ClipboardCopyIcon/>
@@ -99,8 +97,7 @@ export default {
     return {
       password: '',
       passwordError: '',
-      privateKey: '',
-      canCopy: !!navigator.clipboard
+      privateKey: ''
     }
   },
   validations() {
@@ -154,8 +151,10 @@ export default {
       this.exportKey()
     },
     copyToClipboard(input) {
-      if (!this.canCopy) window.alert('Clipboard unavailable. Please copy-paste manually.')
-      return navigator.clipboard.writeText(input)
+      if (!!navigator.clipboard) {
+        return navigator.clipboard.writeText(input)
+      }
+      window.alert('Clipboard unavailable. Please copy-paste manually.')
     }
   },
   setup() {