Fixes for L2 migration button

This commit is contained in:
Marco van Dijk 2022-03-05 00:25:10 +01:00
parent 976ed8c97e
commit 6a65e5a408
2 changed files with 16 additions and 9 deletions

View File

@ -97,7 +97,7 @@ export const getEvents = () => async dispatch => {
if (eventContainsEarningsClaimed) { if (eventContainsEarningsClaimed) {
eventType = "Migrate"; eventType = "Migrate";
eventColour = migrateColour; eventColour = migrateColour;
eventDescription = "migrated " + tmpAmount.toFixed(2) + " LPT to L2 at"; eventDescription = "migrated " + tmpAmount.toFixed(2) + " LPT to L2";
} else { } else {
eventType = "Stake"; eventType = "Stake";
eventColour = stakeColour; eventColour = stakeColour;
@ -137,7 +137,10 @@ export const getEvents = () => async dispatch => {
// Fill description of Stake Event if it wasn't set yet // Fill description of Stake Event if it wasn't set yet
if (eventType === "Stake" && eventDescription === "") { if (eventType === "Stake" && eventDescription === "") {
if (eventFrom === "0x0000000000000000000000000000000000000000") { if (eventFrom === "0x0000000000000000000000000000000000000000") {
eventDescription = "staked " + tmpAmount.toFixed(2) + " LPT with"; eventDescription = "staked " + tmpAmount.toFixed(2) + " LPT";
} else if (eventFrom === eventTo) {
eventFrom = "";
eventDescription = "increased their self stake to " + tmpAmount.toFixed(2) + " LPT";
} else { } else {
eventDescription = "moved a " + tmpAmount.toFixed(2) + " LPT stake"; eventDescription = "moved a " + tmpAmount.toFixed(2) + " LPT stake";
} }
@ -194,12 +197,12 @@ export const getEvents = () => async dispatch => {
}); });
} else if (eventObj.name === "WithdrawFees") { } else if (eventObj.name === "WithdrawFees") {
const amount = parseFloat(eventObj.data.amount) / 1000000000000000000; const amount = parseFloat(eventObj.data.amount) / 1000000000000000000;
const txt = " withdrew " + amount + " LPT earned fees from " + eventObj.data.delegator; const txt = " withdrew " + amount + " LPT earned fees";
finalEventList.push({ finalEventList.push({
eventType: "Withdraw", eventType: "Withdraw",
eventDescription: txt, eventDescription: txt,
eventCaller: eventObj.data.delegator.toLowerCase(), eventCaller: eventObj.data.delegator.toLowerCase(),
eventFrom: "", eventFrom: eventObj.data.delegator.toLowerCase(),
eventTo: "", eventTo: "",
eventColour: withdrawStakeColour, eventColour: withdrawStakeColour,
transactionHash: currentTx, transactionHash: currentTx,
@ -301,8 +304,12 @@ export const getEvents = () => async dispatch => {
} }
else if (eventObj.name === "TransferBond") { else if (eventObj.name === "TransferBond") {
eventContainsTransferBond = true; eventContainsTransferBond = true;
eventFrom = eventObj.data.oldDelegator.toLowerCase(); if (!eventContainsUnbond){
eventTo = eventObj.data.newDelegator.toLowerCase(); eventFrom = eventObj.data.oldDelegator.toLowerCase();
}
if (!eventContainsRebond){
eventTo = eventObj.data.newDelegator.toLowerCase();
}
tmpAmount = parseFloat(eventObj.data.amount) / 1000000000000000000; tmpAmount = parseFloat(eventObj.data.amount) / 1000000000000000000;
} else { } else {
console.log("UNIMPLEMENTED: " + eventObj.name); console.log("UNIMPLEMENTED: " + eventObj.name);

View File

@ -19,7 +19,7 @@ const EventButton = (obj) => {
if (obj.eventObj.eventTo === "0x0000000000000000000000000000000000000000") { if (obj.eventObj.eventTo === "0x0000000000000000000000000000000000000000") {
obj.eventObj.eventTo = ""; obj.eventObj.eventTo = "";
} }
if (obj.eventObj.eventTo && obj.eventObj.eventFrom) { if (obj.eventObj.eventTo !== "" || obj.eventObj.eventFrom !== "") {
eventArrow = <p></p>; eventArrow = <p></p>;
} }
if (obj.eventObj.eventTo) { if (obj.eventObj.eventTo) {
@ -48,9 +48,9 @@ const EventButton = (obj) => {
{obj.eventObj.eventDescription} {obj.eventObj.eventDescription}
</div> </div>
<div className="row" style={{ width: 'unset'}}> <div className="row" style={{ width: 'unset'}}>
{eventTo}
{eventArrow}
{eventFrom} {eventFrom}
{eventArrow}
{eventTo}
</div> </div>
</div> </div>
) )