Merge remote-tracking branch 'origin/feature-fixbackground-unload' into dev_1.1.7

src/entry/background.js

@@ -35,210 +35,219 @@ import {
 import {
     closeAchPayNoticeHandler
 } from "@/logic/background/denet";
-
-//加载bg.js 执行
-setMessageCount();
-
-// 消息通讯
-chrome.runtime.onConnect.addListener(function (port) {
-    port.onDisconnect.addListener(function () {
-        onDisconnectHandler(port);
-    });
-});
-
-// 当有可用更新时触发
-chrome.runtime.onUpdateAvailable.addListener(() => {
-    try {
-        Report.reportLog({
-            objectType: Report.objectType.background_function_try,
-            funcName: 'onUpdateAvailable'
+try {
+    //加载bg.js 执行
+    setMessageCount();
+
+    // 消息通讯
+    chrome.runtime.onConnect.addListener(function (port) {
+        port.onDisconnect.addListener(function () {
+            onDisconnectHandler(port);
         });
-        chrome.runtime.reload()
-    } catch (error) {
-        Report.reportLog({
-            objectType: Report.objectType.background_function_catch,
-            funcName: 'onUpdateAvailable',
-            errMsg: error.message
-        });
-    }
-})
-
-chrome.runtime.onInstalled.addListener(onInstalledMethod);
-
-chrome.runtime.onMessage.addListener(onMessageMethod);
-
-// 定时器
-chrome.alarms.onAlarm.addListener(function (alarm) {
-    // console.log("onAlarm-", alarm);
-    switch (alarm.name) {
-        case 'denetChromeAlarm':
-            getMessageInfo();
-            break
-        case 'PingPong':
-            PingPong()
-            break;
-        case 'LuckMessage':
-            getSysMessage()
-            break
-    }
-});
-
-chrome.action.onClicked.addListener(function (tab) {
-    injectExtensionPopup(tab);
-});
+    });
 
-chrome.tabs.onActivated.addListener(function (activeInfo) {
-    setPopupConfig(activeInfo);
-})
+    // 当有可用更新时触发
+    chrome.runtime.onUpdateAvailable.addListener(() => {
+        try {
+            setChromeStorage({ onUpdateAvailable: JSON.stringify({ onUpdateAvailable: '1' }) }, () => {
+                chrome.runtime.reload()
+            })
+        } catch (error) {
+            Report.reportLog({
+                objectType: Report.objectType.background_function_catch,
+                funcName: 'onUpdateAvailable',
+                errMsg: error.message
+            });
+        }
+    })
+
+    chrome.runtime.onInstalled.addListener(onInstalledMethod);
+
+    chrome.runtime.onMessage.addListener(onMessageMethod);
+
+    // 定时器
+    chrome.alarms.onAlarm.addListener(function (alarm) {
+        // console.log("onAlarm-", alarm);
+        switch (alarm.name) {
+            case 'denetChromeAlarm':
+                getMessageInfo();
+                break
+            case 'PingPong':
+                PingPong()
+                break;
+            case 'LuckMessage':
+                getSysMessage()
+                break
+        }
+    });
 
-function thenInstalledMethod() {
-    try {
+    chrome.action.onClicked.addListener(function (tab) {
+        injectExtensionPopup(tab);
+    });
 
-        onInstalledCreateTab()
-        onInstalledMid()
-        onInstalledUserSet()
-        // pingpang
-        chrome.alarms.create('PingPong', {
-            //1分鐘之後開始(該值不能小於1) 
-            delayInMinutes: 2,
-            //開始後每一分鐘執行一次(該值不能小于1) 
-            periodInMinutes: 4
-        });
-        chrome.alarms.create('LuckMessage', {
-            //1分鐘之後開始(該值不能小於1) 
-            delayInMinutes: 1,
-            //開始後每一分鐘執行一次(該值不能小于1) 
-            periodInMinutes: 1
-        });
-    } catch (error) {
-        Report.reportLog({
-            objectType: Report.objectType.background_function_catch,
-            funcName: 'thenInstalledMethod',
-            errMsg: error.message
-        });
+    chrome.tabs.onActivated.addListener(function (activeInfo) {
+        setPopupConfig(activeInfo);
+    })
+
+    function thenInstalledMethod() {
+        try {
+
+            onInstalledCreateTab()
+            onInstalledMid()
+            onInstalledUserSet()
+            // pingpang
+            chrome.alarms.create('PingPong', {
+                //1分鐘之後開始(該值不能小於1) 
+                delayInMinutes: 2,
+                //開始後每一分鐘執行一次(該值不能小于1) 
+                periodInMinutes: 4
+            });
+            chrome.alarms.create('LuckMessage', {
+                //1分鐘之後開始(該值不能小於1) 
+                delayInMinutes: 1,
+                //開始後每一分鐘執行一次(該值不能小于1) 
+                periodInMinutes: 1
+            });
+        } catch (error) {
+            Report.reportLog({
+                objectType: Report.objectType.background_function_catch,
+                funcName: 'thenInstalledMethod',
+                errMsg: error.message
+            });
+        }
     }
-}
-
-// 2.reportLog 异常 存储到本地，再上报
-// 3.onInstalledMethod 执行了那个
-
-function onInstalledMethod() {
-    try {
-        // 3.onInstalledMethod 执行了那个
-        // 版本更新判断
-        getChromeStorage('baseInfo', (info) => {
-            if (!info || !info.appVersionCode) {
-                setChromeStorage({ onInstalledMethod: JSON.stringify({ onInstalledMethod: '1' }) })
-                setChromeStorage({ baseInfo: JSON.stringify({ appVersionCode }) })
-                thenInstalledMethod()
-            } else if (appVersionCode != info.appVersionCode) {
-                setChromeStorage({ onInstalledMethod: JSON.stringify({ onInstalledMethod: '2' }) }, () => {
-                    setChromeStorage({ baseInfo: JSON.stringify({ appVersionCode }) }, () => {
-                        chrome.runtime.reload()
+    function onInstalledMethod({ id, previousVersion, reason }) {
+        try {
+            Report.reportLog({
+                id,
+                previousVersion,
+                reason,
+                funcName: 'onInstalledMethodCallback'
+            });
+            // 3.onInstalledMethod 执行了那个
+            // 版本更新判断
+            getChromeStorage('baseInfo', (info) => {
+                if (!info || !info.appVersionCode) {
+                    setChromeStorage({ onInstalledMethod: JSON.stringify({ onInstalledMethod: '1' }) })
+                    setChromeStorage({ baseInfo: JSON.stringify({ appVersionCode }) })
+                    thenInstalledMethod()
+                } else if (appVersionCode != info.appVersionCode) {
+                    setChromeStorage({ onInstalledMethod: JSON.stringify({ onInstalledMethod: '2' }) }, () => {
+                        setChromeStorage({ baseInfo: JSON.stringify({ appVersionCode }) }, () => {
+                            chrome.runtime.reload()
+                            onInstalledUserSet()
+                        })
                     })
-                })
-            } else {
-                setChromeStorage({ onInstalledMethod: JSON.stringify({ onInstalledMethod: '3' }) })
-                thenInstalledMethod()
-            }
-        })
-
-        // 1.onUpdateAvailable 存储到本地，再上报
-        getChromeStorage('onUpdateAvailable', (res) => {
-            if (res && res.onUpdateAvailable) {
-                Report.reportLog({
-                    objectType: Report.objectType.background_function_try,
-                    funcName: 'onUpdateAvailable',
-                })
-            }
-        })
-    } catch (error) {
-        Report.reportLog({
-            objectType: Report.objectType.background_function_catch,
-            funcName: 'onInstalledMethod',
-            errMsg: error.message
-        })
+                } else {
+                    setChromeStorage({ onInstalledMethod: JSON.stringify({ onInstalledMethod: '3' }) })
+                    thenInstalledMethod()
+                }
+            })
+
+            // 1.onUpdateAvailable 存储到本地，再上报
+            getChromeStorage('onUpdateAvailable', (res) => {
+                if (res && res.onUpdateAvailable) {
+                    Report.reportLog({
+                        objectType: Report.objectType.background_function_try,
+                        funcName: 'onUpdateAvailable',
+                    })
+                }
+            })
+        } catch (error) {
+            Report.reportLog({
+                objectType: Report.objectType.background_function_catch,
+                funcName: 'onInstalledMethod',
+                errMsg: error.message
+            })
+        }
     }
-}
 
-function onMessageMethod(req, sender, sendResponse) {
-    try {
-        if (req) {
-            switch (req.actionType) {
-                case "POPUP_LOGIN":
-                    twitterPinLoginToken();
-                    break;
-                case "POPUP_PUBLISH_TWITTER_RED_PACK":
-                    popupRePublish(req);
-                    break;
-                case "POPUP_SHOW_DENET_PUBLISH_DIALOG":
-                    checkShowPublishDialog();
-                    break;
-                case 'CONTENT_GET_PINED':
-                    checkPined();
-                    break;
-                case 'CONTENT_SET_BADGE':
-                    setBadgeInfo(req);
-                    break;
-                case 'CONTENT_HIDE_BADGE':
-                    hideBadge();
-                    break
-                case 'CONTENT_SEND_CODE':
-                    twitterPinLoginCode(sender, req.code);
-                    break;
-                case 'CONTENT_TWITTER_LOGIN':
-                    if (req.data) {
-                        twitterPinLoginToken()
-                    }
-                    break
-                case "CONTENT_SEND_DISCORD_AUTH_CODE":
-                    discordLoginCode(req, sender);
-                    break
-                case 'RED_PACKET_SAVE_DISCORD_AUTH_WINDOW_ID':
-                    saveDiscordAuthWindowId(req);
-                    break;
-                case 'CONTENT_FACEBOOK_SHARE_SUCCESS':
-                    facebookShareSuccess(req, sender);
-                    break;
-                case 'CONTENT_PONG':
-                    console.log('CONTENT_PONG')
-                    break
-                case 'CONTENT_WINDOW_LOADED_SET_POPUP_PAGE':
-                    // windwoLoadSetPopupPage(req, sender);
-                    break;
-                case 'CONTENT_SET_POPUP_CONFIG':
-                    setActionPopup(req, sender);
-                    break;
-                case 'CONTENT_GET_TWITTER_NFT_POST_PRE':
-                    getTwitterNftPostPre(req.data, sender)
-                    break
-                case 'CONTENT_NFT_TXT_PUBLISH':
-                    nftTxtPublish(req.data, sender)
-                    break
-                case 'CONTENT_HTTP_NET_WORK':
-                    httpNetWork(req.funcName, req.data, sender)
-                    break
-                case 'HTTP_CONTENT_TO_BACK':
-                    httpContentToBack(req, sender)
-                    break
-                case 'CONTENT_TWITTER_SHORT_LINK':
-                    sendResponse('ok')
-                    req.arr_url.forEach(item => {
-                        if (item) {
-                            twitterShortUrl(sender, item)
+    function onMessageMethod(req, sender, sendResponse) {
+        try {
+            if (req) {
+                switch (req.actionType) {
+                    case "POPUP_LOGIN":
+                        twitterPinLoginToken();
+                        sendResponse('ok');
+                        break;
+                    case "POPUP_PUBLISH_TWITTER_RED_PACK":
+                        popupRePublish(req);
+                        sendResponse('ok');
+                        break;
+                    case "POPUP_SHOW_DENET_PUBLISH_DIALOG":
+                        checkShowPublishDialog();
+                        break;
+                    case 'CONTENT_GET_PINED':
+                        checkPined();
+                        break;
+                    case 'CONTENT_SET_BADGE':
+                        setBadgeInfo(req);
+                        break;
+                    case 'CONTENT_HIDE_BADGE':
+                        hideBadge();
+                        break
+                    case 'CONTENT_SEND_CODE':
+                        twitterPinLoginCode(sender, req.code);
+                        break;
+                    case 'CONTENT_TWITTER_LOGIN':
+                        if (req.data) {
+                            twitterPinLoginToken();
+                            sendResponse('ok');
                         }
-                    });
-                    break
-                case 'CONTENT_CLOSE_ACH_PAY_NOTICE':
-                    closeAchPayNoticeHandler();
-                    break;
+                        break
+                    case "CONTENT_SEND_DISCORD_AUTH_CODE":
+                        discordLoginCode(req, sender);
+                        break
+                    case 'RED_PACKET_SAVE_DISCORD_AUTH_WINDOW_ID':
+                        saveDiscordAuthWindowId(req);
+                        sendResponse('ok');
+                        break;
+                    case 'CONTENT_FACEBOOK_SHARE_SUCCESS':
+                        facebookShareSuccess(req, sender);
+                        break;
+                    case 'CONTENT_PONG':
+                        sendResponse('CONTENT_PONG');
+                        break
+                    case 'CONTENT_WINDOW_LOADED_SET_POPUP_PAGE':
+                        // windwoLoadSetPopupPage(req, sender);
+                        break;
+                    case 'CONTENT_SET_POPUP_CONFIG':
+                        setActionPopup(req, sender);
+                        break;
+                    case 'CONTENT_GET_TWITTER_NFT_POST_PRE':
+                        getTwitterNftPostPre(req.data, sender)
+                        break
+                    case 'CONTENT_NFT_TXT_PUBLISH':
+                        nftTxtPublish(req.data, sender)
+                        break
+                    case 'CONTENT_HTTP_NET_WORK':
+                        httpNetWork(req.funcName, req.data, sender)
+                        break
+                    case 'HTTP_CONTENT_TO_BACK':
+                        httpContentToBack(req, sender)
+                        sendResponse('ok')
+                        break
+                    case 'CONTENT_TWITTER_SHORT_LINK':
+                        sendResponse('ok')
+                        req.arr_url.forEach(item => {
+                            if (item) {
+                                twitterShortUrl(sender, item)
+                            }
+                        });
+                        break
+                    case 'CONTENT_CLOSE_ACH_PAY_NOTICE':
+                        closeAchPayNoticeHandler();
+                        break;
+                }
             }
+        } catch (error) {
+            Report.reportLog({
+                objectType: Report.objectType.background_function_catch,
+                funcName: 'onMessageMethod',
+                errMsg: error.message
+            });
         }
-    } catch (error) {
-        Report.reportLog({
-            objectType: Report.objectType.background_function_catch,
-            funcName: 'onMessageMethod',
-            errMsg: error.message
-        });
     }
-}
+} catch (error) {
+    console.log('error', error)
+}

src/entry/content.js

@@ -67,7 +67,7 @@ window.onload = () => {
     chrome.runtime.sendMessage({
         actionType: "CONTENT_WINDOW_LOADED_SET_POPUP_PAGE",
         data: {}
-    }, () => { });
+    });
 };
 window.onmessage = (res) => {
     if (res.data && res.data.actionType) {
@@ -187,9 +187,8 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
             setTwitterTextarea(req.data)
             break
         case 'SWITCH_GROUP_STATUS':
-            sendResponse('ok')
             groupTipsSelectGroupTab(req.data);
-            break
+            return sendResponse('ok')
         case 'IFRAME_GROUP_BANNER_GROUP_INFO':
 
             setGroupInfo(req.data)
@@ -214,8 +213,7 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
             showPublishDialog();
             break;
         case 'Get_ToolBox_Fixed_TweetId':
-            sendResponse(toolbox_fixed_tweetId)
-            break
+            return sendResponse(toolbox_fixed_tweetId)
         case 'Set_ToolBox_Fixed':
             toolBox.switchStatus(req)
             break
@@ -226,4 +224,5 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
             toolBox.hideBuyNft(req)
             break;
     }
+    sendResponse && sendResponse('ok');
 })

src/entry/content_help.js

@@ -29,7 +29,7 @@ const init = () => {
     chrome.runtime.sendMessage({
         actionType: "CONTENT_WINDOW_LOADED_SET_POPUP_PAGE",
         data: {}
-    }, () => { });
+    });
 }
 
 
@@ -38,7 +38,7 @@ chrome.runtime.sendMessage({
     data: {
         popup: 'popup.html'
     }
-}, () => { });
+});
 
 chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
 
@@ -50,4 +50,5 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
             tiggerInjectPopupPage();
             break
     }
+    sendResponse && sendResponse()
 })

src/logic/background/twitter.js

@@ -303,9 +303,7 @@ function sendActivetabMessage(message = {}) {
             currentWindow: true
         }, (tabs) => {
             if(tabs && tabs.length) {
-                chrome.tabs.sendMessage(tabs[0].id, message, res => {
-                    console.log(res)
-                })
+                chrome.tabs.sendMessage(tabs[0].id, message)
             }
         })
     } catch (error) {

src/logic/content/denet.js

@@ -10,6 +10,6 @@ const closeAchPayNotice = () => {
         chrome.runtime.sendMessage({
             actionType: "CONTENT_CLOSE_ACH_PAY_NOTICE",
             data: {}
-        }, () => { });
+        });
     }
 }

src/logic/content/facebook.js

@@ -63,9 +63,7 @@ function shareCallback() {
         let params = JSON.parse(urlParams.get('params'));
         if (params) {
             chrome.storage.local.remove("shareFacebookData");
-            chrome.runtime.sendMessage({ actionType: "CONTENT_FACEBOOK_SHARE_SUCCESS", data: params }, () => { 
-
-            })
+            chrome.runtime.sendMessage({ actionType: "CONTENT_FACEBOOK_SHARE_SUCCESS", data: params })
         }
     }
 }

src/logic/content/twitter.js

@@ -36,7 +36,7 @@ function twitterPinLogin() {
 
         if (code) {
             pin_login = true
-            chrome.runtime.sendMessage({ actionType: "CONTENT_SEND_CODE", code: code.innerText }, () => { })
+            chrome.runtime.sendMessage({ actionType: "CONTENT_SEND_CODE", code: code.innerText })
             // port.postMessage({ state: 'CONTENT_SEND_CODE', code: code.innerText })
         }
     }
@@ -47,7 +47,7 @@ function getDiscordAuthCode() {
         const urlParams = new URLSearchParams(window.location.search);
         const code = urlParams.get('code');
         if (code) {
-            chrome.runtime.sendMessage({ actionType: "CONTENT_SEND_DISCORD_AUTH_CODE", code }, () => { })
+            chrome.runtime.sendMessage({ actionType: "CONTENT_SEND_DISCORD_AUTH_CODE", code })
         }
     }
 };
@@ -969,6 +969,8 @@ export function init() {
     }
     inited = true
     console.log('init')
+    // 渲染dom
+    initParseCard()
     twitterPinLogin()
     getDiscordAuthCode();
     appendPopupPage();
@@ -978,7 +980,7 @@ export function init() {
         data: {
             popup: 'popup.html'
         }
-    }, () => { });
+    });
 
     let where = window.location.host.indexOf('twitter.com') < 0 && window.location.host.indexOf('facebook.com') < 0;
     if (where) {
@@ -1000,8 +1002,7 @@ export function init() {
         // 预加载全屏 toobbox
         toolBox.initFull()
     }
-    // 渲染dom
-    initParseCard()
+    
 
 
     getChromeStorage("popupShowPublishDialog", (res) => {
@@ -1662,14 +1663,14 @@ export const publishNFTTweetPost = ({ postId, srcContent, groupId }) => {
     chrome.runtime.sendMessage({
         actionType: "CONTENT_NFT_TXT_PUBLISH",
         data: params
-    }, () => { });
+    });
 }
 
 const contentGetNftPostPre = (data) => {
     chrome.runtime.sendMessage({
         actionType: "CONTENT_GET_TWITTER_NFT_POST_PRE",
         data
-    }, () => { });
+    });
 }
 
 let tweet_nft_content = {}
@@ -1878,14 +1879,14 @@ export const showPopupPage = (params = {}) => {
                 path,
                 showJoinGroupFinish,
             }
-        }, () => { });
+        });
 
         chrome.runtime.sendMessage({
             actionType: "CONTENT_SET_POPUP_CONFIG",
             data: {
                 popup: ''
             }
-        }, () => { });
+        });
 
         let overlay = document.getElementById('de-popup-overlay');
         overlay.style.display = 'block';
@@ -1915,13 +1916,13 @@ export const hidePopupPage = () => {
             data: {
                 popup: 'popup.html'
             }
-        }, () => { });
+        });
 
         if (showPopupPageFrom == 'BUY_NFT_FINISH') {
             chrome.runtime.sendMessage({
                 actionType: "CONTENT_GET_PINED",
                 data: {}
-            }, () => { });
+            });
             showPopupPageFrom = '';
         }
     }
@@ -1963,14 +1964,14 @@ export const setPopupConfByPopupPage = () => {
                 data: {
                     popup: ''
                 }
-            }, () => { });
+            });
         } else {
             chrome.runtime.sendMessage({
                 actionType: "CONTENT_SET_POPUP_CONFIG",
                 data: {
                     popup: 'popup.html'
                 }
-            }, () => { });
+            });
         }
     } else {
         chrome.runtime.sendMessage({
@@ -1978,7 +1979,7 @@ export const setPopupConfByPopupPage = () => {
             data: {
                 popup: 'popup.html'
             }
-        }, () => { });
+        });
     }
 }
 
@@ -2206,6 +2207,7 @@ const onShowGroupBanner = () => {
                 }
                 break
         }
+        sendResponse && sendResponse()
     })
 }
 

src/view/iframe/group-card/card.vue

@@ -144,6 +144,7 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
             }
             break
     }
+    sendResponse && sendResponse()
 })
 
 chrome.storage.onChanged.addListener(changes => {

src/view/iframe/nft/card.vue

@@ -184,6 +184,7 @@ const msgListener = (req, sender, sendResponse) => {
             loginSuccessHandler();
             break;
     }
+    sendResponse && sendResponse();
 }
 
 onMounted(() => {

src/view/iframe/nft/group-card.vue

@@ -113,6 +113,7 @@ onMounted(() => {
                 getDetail();
                 break;
         }
+        sendResponse && sendResponse();
     })
 })
 </script>

src/view/iframe/publish/tool-box/child/editor.vue

@@ -307,6 +307,7 @@ const onRuntimeMsg = () => {
         searchHandler(req.data.selectGuideApp);
         break;
     }
+    sendResponse && sendResponse();
   })
 }
 

src/view/iframe/publish/tool-box/child/guide.vue

@@ -76,7 +76,7 @@ const confirm = async () => {
             siteUrl: siteUrl.value,
             selectGuideApp: pageData.selectGuideApp
         }
-    }, (response) => { });
+    });
 
     setTimeout(() => {
         if(windowList && windowList.length) {

src/view/iframe/red-packet/luck-draw.vue

@@ -2037,6 +2037,7 @@ function onRuntimeMsg() {
                 setNotification(req.data)
                 break;
         }
+        sendResponse && sendResponse();
     })
 }
 
@@ -2162,7 +2163,6 @@ function discordAuth(actionState = 'default') {
                     let windowId = window.id;
                     callEventPageMethod("RED_PACKET_SAVE_DISCORD_AUTH_WINDOW_ID", {
                         windowId: windowId
-                    }, function (response) {
                     });
                 })
             }

src/view/iframe/red-packet/red-packet.vue

@@ -1830,6 +1830,7 @@ function onRuntimeMsg() {
         }
         break;
     }
+    sendResponse && sendResponse();
   })
 }
 
@@ -1955,7 +1956,6 @@ function discordAuth(actionState = 'default') {
           let windowId = window.id;
           callEventPageMethod("RED_PACKET_SAVE_DISCORD_AUTH_WINDOW_ID", {
             windowId: windowId
-          }, function (response) {
           });
         })
       }

src/view/iframe/tab-group/tab-group.vue

@@ -120,6 +120,7 @@ function onRuntimeMsg() {
                 setPageThemeStyle(req.data);
                 break;
         }
+        sendResponse && sendResponse();
     })
 }
 

src/view/iframe/tool-box/card.vue

@@ -127,6 +127,7 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
             }
             break
     }
+    sendResponse && sendResponse();
 })
 
 

src/view/iframe/tool-box/full.vue

@@ -65,6 +65,7 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
             hideMask(req.data)
             break;
     }
+    sendResponse && sendResponse();
 })
 
 

src/view/popup/currency-detail.vue

@@ -267,7 +267,7 @@ const showSendGiveawayDialog = (params = {}) => {
         chrome.runtime.sendMessage({ 
           actionType: "POPUP_SHOW_DENET_PUBLISH_DIALOG", 
           data: { } 
-      }, () => { });
+      });
       }, 600)
       currencyOpertionType = '';
   }