sync: sync upstream code

Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
2019-07-19 10:45:11 +08:00
parent 8dafeb2cf0
commit fd1b23a4c3
9 changed files with 141 additions and 64 deletions

View File

@@ -658,17 +658,11 @@ function SendTrCreateAcc(Currency,PubKey,Description,Adviser,Smart,bFindAcc,bAdd
CancelCreateAccount();
};
function ChangeSmart(NumAccount,WasSmart)
function DoChangeSmart(NumAccount,WasSmart,SmartNum)
{
if(!IsPrivateMode())
if(SmartNum !== null && SmartNum != WasSmart)
{
SetError("Pls, open wallet");
return 0;
}
var Result = prompt("Enter smart number:", WasSmart);
if(Result !== null && Result != WasSmart)
{
var Smart = parseInt(Result);
var Smart = parseInt(SmartNum);
if(Smart)
{
GetData("GetDappList", {StartNum:Smart, CountNum:1}, function (Data)
@@ -690,6 +684,17 @@ function ChangeSmart(NumAccount,WasSmart)
}
};
function ChangeSmart(NumAccount,WasSmart)
{
if(!IsPrivateMode())
{
SetError("Pls, open wallet");
return 0;
}
var SmartNum = prompt("Enter smart number:", WasSmart);
DoChangeSmart(NumAccount, WasSmart, SmartNum);
};
function SetSmartToAccount(NumAccount,Smart)
{
var OperationID = 0;