Skip to content

Commit

Permalink
chore: rebase fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
o-az committed Nov 8, 2024
1 parent f347185 commit 015752c
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/app.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ _: {
{
packages = {
app = jsPkgs.buildNpmPackage {
npmDepsHash = "sha256-wbkEIJl8mLPGkbzloIlBa9/d+HKagjuXAOQbP69Ef9A=";
npmDepsHash = "sha256-SR+/eljOCVnpxmj/H8yspK92FZ038VPsbAeQEv5SMAs=";
src = ./.;
sourceRoot = "app";
npmFlags = [
Expand Down
1 change: 1 addition & 0 deletions app/src/lib/queries/balance/evm/multicall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export async function erc20ReadMulticall({

const currentResult = accumulator.at(-1)
const fn = functionNames[index % functionNames.length]
if (!currentResult) return accumulator
currentResult[fn === "balanceOf" ? "balance" : fn] = result ?? (fn === "decimals" ? 0 : "")
return accumulator
},
Expand Down
10 changes: 6 additions & 4 deletions app/src/lib/wallet/aptos/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ export type AptosWalletId = (typeof aptosWalletsInformation)[number]["id"]

export function getAptosWallet(walletId: AptosWalletId = "petra") {
// handle okx wallet special case since it's nested
if (walletId === "okxwallet") {
if (Object.hasOwn(window, "okxwallet") && Object.hasOwn(window.okxwallet, "aptos")) {
return window.okxwallet.aptos
}
if (
walletId === "okxwallet" &&
Object.hasOwn(window, "okxwallet") &&
Object.hasOwn(window.okxwallet, "aptos")
) {
return window.okxwallet.aptos
}
if (Object.hasOwn(window, walletId)) return window[walletId] as AptosBrowserWallet
if (Object.hasOwn(window, "aptos")) return window.aptos
Expand Down
8 changes: 5 additions & 3 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
"include": [
"*.ts",
"*.mts",
"*.cts",
"*.js",
"*.cjs",
"*.mjs",
"*.jsx",
"*.tsx",
"*.d.ts",
Expand Down Expand Up @@ -85,8 +87,8 @@
"*.mts",
"*.cts",
"*.js",
"*.mjs",
"*.cjs",
"*.mjs",
"*.jsx",
"*.tsx",
"*.d.ts",
Expand Down Expand Up @@ -149,8 +151,8 @@
"*.mts",
"*.cts",
"*.js",
"*.mjs",
"*.cjs",
"*.mjs",
"*.jsx",
"*.tsx",
"*.d.ts",
Expand Down Expand Up @@ -276,8 +278,8 @@
"*.mts",
"*.cts",
"*.js",
"*.mjs",
"*.cjs",
"*.mjs",
"*.jsx",
"*.tsx",
"*.d.ts",
Expand Down

0 comments on commit 015752c

Please sign in to comment.