Merge branch 'sairajzero:master' into master

This commit is contained in:
Sai Raj 2021-11-05 18:18:23 +05:30 committed by GitHub
commit 0b42046022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8051,7 +8051,7 @@ Bitcoin.Util = {
}
}
</script>
<script id="floCloudAPI" version="2.1.0">
<script id="floCloudAPI" version="2.1.0a">
/* FLO Cloud operations to send/request application data*/
const floCloudAPI = {
@ -8364,9 +8364,8 @@ Bitcoin.Util = {
floGlobals.appObjects[dataSet[vc].type] = dataSet[vc].message.reset;
break;
case "UPDATE":
if (dataSet[vc].message.update)
floGlobals.appObjects[dataSet[vc].type] = mergeDiff(floGlobals
.appObjects[dataSet[vc].type], message.diff)
if (dataSet[vc].message.diff)
floGlobals.appObjects[dataSet[vc].type] = mergeDiff(floGlobals.appObjects[dataSet[vc].type], dataSet[vc].message.diff)
}
floGlobals.lastVC[dataSet[vc].type] = vc;
updatedObjects.add(dataSet[vc].type)