diff --git a/src/HTML/CSS/mobile-wallet.css b/src/HTML/CSS/mobile-wallet.css index c1ec8dc..216e89d 100644 --- a/src/HTML/CSS/mobile-wallet.css +++ b/src/HTML/CSS/mobile-wallet.css @@ -241,7 +241,7 @@ textarea { /* background: var(--blue-grey); */ background: transparent; border: none; - color: #fff; + color: #000; padding: 5px; width: 55px; font-family: inherit; @@ -1858,7 +1858,7 @@ td.hash { width: 60px; border-radius: 3px; background: transparent; - color: rgba(255, 255, 255, 0.6); + color: #000; } .white-select { display: block; @@ -2773,7 +2773,7 @@ iframe .btn--float { float: left; - width: 230px; + width: 200px; margin: 10px; } diff --git a/src/HTML/JS/client.js b/src/HTML/JS/client.js index d5bdd69..57b562c 100644 --- a/src/HTML/JS/client.js +++ b/src/HTML/JS/client.js @@ -64,6 +64,7 @@ window.IsLocalClient = function () { return (window.location.protocol.substr(0, 4) !== "http"); }; +var glSession; var ServerHTTP; var MainServer; if(window.nw) @@ -1983,3 +1984,10 @@ function isMobile() } return false; }; + +function DoNewSession() +{ + var arr = new Uint8Array(6); + window.crypto.getRandomValues(arr); + glSession = GetHexFromArr(arr); +}; diff --git a/src/HTML/JS/mobile-wallet.js b/src/HTML/JS/mobile-wallet.js index cb41015..5816bc5 100644 --- a/src/HTML/JS/mobile-wallet.js +++ b/src/HTML/JS/mobile-wallet.js @@ -24,6 +24,7 @@ var CONNECT_STATUS = 0; var NotModalClose = 0; window.onload = function () { + DoNewSession(); InitAccountsCard(); DoLangScript(); InitWalletKeyName(); @@ -38,7 +39,6 @@ window.onload = function () if(Data && Data.result) { Storage.setItem("NETWORK", Data.NETWORK); - console.log("Default network: " + Data.NETWORK); OnLoad(); } }); @@ -98,8 +98,8 @@ function OnLoad() LoadValues(); InitDappsCard(); StartWebWallet(); - setInterval(UpdatesExplorerData, 1000); - setInterval(UpdatesAccountsData, 1000); + setInterval(UpdatesExplorerData, 2000); + setInterval(UpdatesAccountsData, 2000); DoStableScroll(); window.onmousemove = function (event) { @@ -117,12 +117,14 @@ function OnLoad() function ChangeNetwork(bStart) { + FirstAccountsData = 1; CONNECT_STATUS = 0; NETWORK = $("idCurNetwork").value; Storage.setItem("NETWORK", NETWORK); if(bStart) StartWebWallet(); - ConnectWebWallet(); + else + ConnectWebWallet(); }; function UpdateTabs() @@ -144,6 +146,7 @@ function OnFindServer() CONNECT_STATUS = 2; Storage.setItem("MainServer", JSON.stringify({ip:MainServer.ip, port:MainServer.port})); FillCurrencyAsync("idAccountCur"); + SetDataUpdateTime(10); UpdateTabs(); }; @@ -188,10 +191,20 @@ function OnSelectTab(name) SetPrivKey($("idPrivKeyEdit").value.trim()); InitPrivKey(); } - if(name === "TabDapps") + if(name === "TabAccounts" || name === "TabSend") { - ViewDapps(); + UpdatesAccountsData(1); } + else + if(name === "TabExplorer") + { + UpdatesExplorerData(1); + } + else + if(name === "TabDapps") + { + ViewDapps(); + } }; function SetVisibleTab() @@ -292,8 +305,14 @@ function OnPrivKeyCancel() }; var FirstAccountsData = 1; var AccountsCount = - 1; +var DataUpdateTime = 0; -function UpdatesAccountsData() +function SetDataUpdateTime(PeriodSec) +{ + DataUpdateTime = Date.now() + 1000 * PeriodSec; +}; + +function UpdatesAccountsData(bGetData) { if(IsVisibleClass(".accounts-info__add")) return ; @@ -304,7 +323,16 @@ function UpdatesAccountsData() { return ; } - GetData("/GetAccountListByKey", {Key:Str, AllData:FirstAccountsData}, function (Data,responseText) + if(!bGetData) + { + if(IsVisibleBlock("TabAccounts") || DataUpdateTime >= Date.now()) + { + bGetData = 1; + } + } + if(!bGetData) + return ; + GetData("/GetAccountListByKey", {Key:Str, Session:glSession, AllData:FirstAccountsData}, function (Data,responseText) { if(!Data || !Data.result || !Data.arr) return ; @@ -549,8 +577,20 @@ function RestoreAllAccounts() DelAccount(0); }; -function UpdatesExplorerData() +function UpdatesExplorerData(bGetData) { + var bDiagram = 0; + if(IsVisibleBlock("TabExplorer") && IsVisibleBlock("idStatBlock")) + bDiagram = 1; + if(!bGetData) + { + if(bDiagram || DataUpdateTime >= Date.now()) + { + bGetData = 1; + } + } + if(!bGetData) + return ; var WasSendTr = 0; for(var key in MapSendTransaction) { @@ -561,7 +601,7 @@ function UpdatesExplorerData() break; } } - GetData("GetCurrentInfo", {Diagram:IsVisibleBlock("idStatBlock") ? 1 : 0, ArrLog:WasSendTr}, function (Data) + GetData("GetCurrentInfo", {Diagram:bDiagram, ArrLog:WasSendTr}, function (Data) { if(!Data || !Data.result) return ; @@ -697,9 +737,11 @@ function downloadKey(fieldID) anchor.click(); document.body.removeChild(anchor); }; +var glWasModal = 0; function openModal(id) { + glWasModal = 1; var modal = document.querySelector("#" + id); var overlay = document.querySelector("#overlay"); modal.style.display = "block"; @@ -710,6 +752,7 @@ function closeModal() { if(NotModalClose) return ; + glWasModal = 0; var modals = document.querySelectorAll(".modal"); var overlay = document.querySelector("#overlay"); modals.forEach(function (item) @@ -802,14 +845,24 @@ function SendMobileBefore() SetVisibleClass(".send-page__setting", 0); SetVisibleClass(".send-page__confirm", 1); SetStatus(""); + UpdatesAccountsData(1); + UpdatesExplorerData(1); }; function OKSend() { - SendMoney(); - ClearSend(); - SaveValues(); + SendMoney(function () + { + if(glWasModal) + { + ClearSend(); + SaveValues(); + } + closeModal(); + }); + SetDataUpdateTime(20); CancelSend(); + openModal('idSending'); }; function CancelSend() @@ -920,6 +973,7 @@ function SetUsePassword(bUse) function DoExitWallet() { ClearSend(); + SaveValues(); NotModalClose = 1; $("Password").value = ""; SetWalletPassword(""); @@ -1210,7 +1264,7 @@ LangMap["RUS"] = {"TERA WALLET":"TERA КОШЕЛЕК", "Generate key":"Сген "Buy/sell/mine TERA":"Купить/Продать", "+ CREATE NEW":"+ СОЗДАТЬ", "Confirm Transaction":"Подтверждение транзакции", "CREATE DAPPS":"СОЗДАТЬ", "Set pass":"Установить пароль", "Unlock":"Разблокировать", "Entrance to sub-wallet":"Войти в под-кошелек", "Public name":"Публичное имя", "Currency":"Валюта", "Pay to:":"Получатель:", "Amount:":"Сумма:", "Description:":"Описание:", "Welcome to TERA Wallet":"Добропожаловать в кошелек TERA", - "Edit your wallet":"Редактирование вашего кошелька", "Key settings":"Задание ключей", "KEY SETTINGS":"ЗАДАНИЕ КЛЮЧЕЙ", "Create an account":"Создание счета", + "Edit your wallet":"Редактирование вашего кошелька", "Key settings":"Задание ключей", "KEY SETTINGS":"КЛЮЧИ", "Create an account":"Создание счета", "Sending coins":"Отправка монет", "Decentralized applications (dApps)":"Децентрализованные приложения (Даппс)", "Secure your wallet":"Безопасность вашего кошелька", "Wallet is secured":"Установлен пароль", "Total":"Всего", "Item.Name":"Item.Name", "You have no accounts yet":"У вас нет ни одного счета", "Wait 10-15 sec":"Ждите 10-15 сек", "Creating your account":"Идет создание вашего счета", "From:":"Отправитель:", "Set a password for protect entry":"Установите пароль для безопасности", diff --git a/src/HTML/JS/wallet-lib.js b/src/HTML/JS/wallet-lib.js index f8e834b..6ef7156 100644 --- a/src/HTML/JS/wallet-lib.js +++ b/src/HTML/JS/wallet-lib.js @@ -347,7 +347,7 @@ function SendMoney2() SendMoney(); }; -function SendMoney() +function SendMoney(F) { if(!CanSendTransaction) { @@ -358,7 +358,9 @@ function SendMoney() if($("idSendButton").disabled) return ; SetVisibleBlock("idBlockOnSend", 0); - CreateTransaction(SendMoneyTR, true, ClearAttach); + if(!F) + F = ClearAttach; + CreateTransaction(SendMoneyTR, true, F); }; function GetJSONFromTransaction(TR) diff --git a/src/HTML/dapp-frame.html b/src/HTML/dapp-frame.html index c6134ec..ef7b58d 100644 --- a/src/HTML/dapp-frame.html +++ b/src/HTML/dapp-frame.html @@ -26,9 +26,9 @@ var NumDappGet=0; var NumDappInfo=0; - var arr = new Uint8Array(6); - window.crypto.getRandomValues(arr); - var glSession=GetHexFromArr(arr); +// var arr = new Uint8Array(6); +// window.crypto.getRandomValues(arr); +// var glSession=GetHexFromArr(arr); //DAPP TRANSFER @@ -295,6 +295,8 @@ var SMART={},BASE_ACCOUNT={},OPEN_PATH=""; window.onload=function() { + DoNewSession(); + if(window.location.hash) OPEN_PATH=window.location.hash.substr(1); if(IsLocalClient()) diff --git a/src/HTML/wallet.html b/src/HTML/wallet.html index 84d6879..9acd68e 100644 --- a/src/HTML/wallet.html +++ b/src/HTML/wallet.html @@ -490,6 +490,13 @@ { CanSendTransaction=1; } + if(Data.NET_WORK_MODE && Data.NET_WORK_MODE.NOT_RUN) + { + CanSendTransaction=0; + WalletStatus="OK"; + SetMainStatus("
NODE NOT RUNING
",1); + } + MaxAccID=Data.MaxAccID; MaxDappsID=Data.MaxDappsID; @@ -1105,10 +1112,10 @@ ArrInfo= [ {Name:"Hashrate from the beginning of the chain", Delta:1000000000, DX:310}, - {Name:"month", Delta:30.5*24*3600, DX:200}, - {Name:"day", Delta:24*3600, DX:140}, - {Name:"hour", Delta:3600, DX:90}, - {Name:"minute", Delta:60, DX:60} + {Name:"month", Delta:30.5*24*3600, DX:200, Mult:10000}, + {Name:"day", Delta:24*3600, DX:140, Mult:1000}, + {Name:"hour", Delta:3600, DX:90, Mult:100}, + {Name:"minute", Delta:60, DX:60, Mult:2}, ]; for(var i=0;i

-
Block: DB delta: @@ -1676,7 +1684,7 @@ - This Version Refactor By MiaoWoo Use TypeScript +
diff --git a/src/HTML/web-wallet.html b/src/HTML/web-wallet.html index fdd95cf..c56a3e4 100644 --- a/src/HTML/web-wallet.html +++ b/src/HTML/web-wallet.html @@ -632,9 +632,12 @@ + - -