From 828bafd012f243bc2ada1ae0ee33e1dc0c3d4de1 Mon Sep 17 00:00:00 2001 From: Emilie Ma Date: Sun, 4 Jun 2023 14:25:41 -0700 Subject: [PATCH] Fix balance not updating properly --- cobweb.crx | Bin 1142221 -> 1142211 bytes landing/index.html | 2 +- release/RELEASE_NOTES.md | 2 +- release/generateRelease.js | 22 +++++++----------- .../Background/lib/fetchAndUpdateBalance.ts | 12 ++++------ 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/cobweb.crx b/cobweb.crx index e4c49c42dc5ed70a5512710e0e9b2418c0fead66..1a5fbfc0f095753977445ee57d7993c118263a91 100644 GIT binary patch delta 4536 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 JJJ4O${{YPfjZpvq delta 4533 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 started available on GitHub should you wish to build from source. The checksum of the current version is - 7b0e3fa8f5f2217bfd597700ba4689da9d32375347d9da41b6b5ef0380e67ab5. + f8fcf1dcb877899b6b8d9819784605dbb2eb69e8aa11cf075ffc454c6a2cf5df.

view source diff --git a/release/RELEASE_NOTES.md b/release/RELEASE_NOTES.md index 049f8ae..4b831c4 100644 --- a/release/RELEASE_NOTES.md +++ b/release/RELEASE_NOTES.md @@ -6,6 +6,6 @@ Release notes: - Fixed bug where errors reading a past stream would prevent the creation of a new one. - Fixed overflow bug on Help page. -Download on the [Chrome Webstore](https://chrome.google.com/webstore/detail/agdomcadfhkpkcjceenogkiglbhgpclg?authuser=0&hl=en-GB) ◦ Checksum: `7b0e3fa8f5f2217bfd597700ba4689da9d32375347d9da41b6b5ef0380e67ab5` +Download on the [Chrome Webstore](https://chrome.google.com/webstore/detail/agdomcadfhkpkcjceenogkiglbhgpclg?authuser=0&hl=en-GB) ◦ Checksum: `f8fcf1dcb877899b6b8d9819784605dbb2eb69e8aa11cf075ffc454c6a2cf5df` **Full Changelog**: https://github.com/kewbish/cobweb/compare/v0.0.10...v0.0.11 diff --git a/release/generateRelease.js b/release/generateRelease.js index 6eee33d..51145a5 100644 --- a/release/generateRelease.js +++ b/release/generateRelease.js @@ -3,6 +3,12 @@ const { exit } = require("process"); const semver = require("semver"); const shell = require("shelljs"); const cheerio = require("cheerio"); +const process = require("node:process"); + +if (process.cwd() !== "/home/kewbish/Downloads/dev/cobweb-rise") { + console.log("cd to project root first."); + exit(1); +} // increment version numbers in package.json and manifest.json const rawdata = fs.readFileSync("package.json"); @@ -36,7 +42,7 @@ if (code !== 0) { console.error("Packing extension failed."); exit(1); } -shell.mv("build.crx", "cobweb.crx");*/ +shell.mv("build.crx", "cobweb.crx"); // zip extension to Downloads folder ({ code } = shell.exec("zip /home/kewbish/Downloads/build.zip -r build")); @@ -57,7 +63,7 @@ const checksum = stdout.trim(); // write to landing page HTML const rawhtml = fs.readFileSync("landing/index.html"); const $ = cheerio.load(rawhtml); -$('code[style="word-break:break-all;"]').text(checksum); +$('code[style="word-break: break-all"]').text(checksum); fs.writeFileSync("landing/index.html", $.html()); // update release notes @@ -69,14 +75,4 @@ rawMD = rawMD.replace( ); fs.writeFileSync("release/RELEASE_NOTES.md", rawMD); -({ stdout } = shell.exec(`git diff HEAD`)); -if (stdout) { - console.log("Repository dirty, skipping tagging") - exit(0) -} - -({ code, stdout } = shell.exec(`git add . && git commit --amend --no-edit && git tag v${newVersion}`)); -if (code !== 0) { - console.error("Packing extension failed."); - exit(1); -} +console.log(`Remember to tag releases: git tag v${newVersion}`); diff --git a/src/pages/Background/lib/fetchAndUpdateBalance.ts b/src/pages/Background/lib/fetchAndUpdateBalance.ts index 367a30f..47313d9 100644 --- a/src/pages/Background/lib/fetchAndUpdateBalance.ts +++ b/src/pages/Background/lib/fetchAndUpdateBalance.ts @@ -45,12 +45,6 @@ const fetchAndUpdateBalance = async ({ const balance = await infuraProvider.getBalance(address); storage.local.set({ mmBalance: BigNumber.from(balance) }); - const mmSigner = mmProvider.getSigner(); - - if (!cwInitialized || !mmSigner) { - return; - } - ({ availableBalance, deposit } = await sfToken.realtimeBalanceOf({ account: address, providerOrSigner: mmProvider, @@ -76,7 +70,11 @@ const fetchAndUpdateBalance = async ({ if (balanceRes.eq(constants.Zero)) { return; } - if (balanceRes.gt(constants.Zero) && balanceRes.lte(deposit)) { + if ( + balanceRes.gt(constants.Zero) && + balanceRes.lte(deposit) && + mmProvider.getSigner() + ) { // critical balance if (sf && mmProvider) { cleanUpStreams({