Merge branch 'dev_1.1.3' of https://git.yishihui.com/DeNet/de-net into dev_1.1.3

src/logic/background/twitter.js

@@ -495,34 +495,8 @@ export const nftTxtPublish = (params, sender) => {
 
 export const checkShowPublishDialog = (params) => {
     const twitterUrl = 'https://twitter.com';
-
-    chrome.tabs.query({
-        active: true,
-    }, (tabs) => {
-        console.log(tabs, 'tabs')
-        if(tabs && tabs.length) {
-            let tab = null;
-            for (let i in tabs) {
-                if (tabs[i].url.startsWith(twitterUrl)) {
-                    tab = tabs[i];
-                    break
-                }
-            }
-            if(tab) {
-                chrome.tabs.sendMessage(tab.id, { 
-                    actionType: 'BG_SHOW_DENET_PUBLISH_DIALOG', 
-                    data: {} 
-                }, (res) => { console.log(res) });
-            } else {
-                createTabShowGiveaway({
-                    url: twitterUrl
-                })
-            }
-        } else {
-            createTabShowGiveaway({
-                url: twitterUrl
-            })
-        }
+    createTabShowGiveaway({
+        url: twitterUrl
     })
 }
 

src/view/popup/currency-detail.vue

@@ -198,10 +198,12 @@ const showSendGiveawayDialog = (params = null) => {
   } else {
       let currencyInfo = params ? params : currencyInfo.value;
       setLocalSelectCurrencyInfo(currencyInfo)
-      chrome.runtime.sendMessage({ 
+      setTimeout(() => {
+        chrome.runtime.sendMessage({ 
           actionType: "POPUP_SHOW_DENET_PUBLISH_DIALOG", 
           data: { } 
       }, () => { });
+      }, 600)
       currencyOpertionType = '';
   }
 };