From 39c89dddb7a9a4b490296e410fca0a53375e74cc Mon Sep 17 00:00:00 2001 From: Pawan Paudel Date: Fri, 7 Feb 2025 00:06:19 +0545 Subject: [PATCH 1/8] fix: align balance to the end --- src/components/popup/Token.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/popup/Token.tsx b/src/components/popup/Token.tsx index 8ffd62d9b..c676fb58a 100644 --- a/src/components/popup/Token.tsx +++ b/src/components/popup/Token.tsx @@ -447,7 +447,8 @@ const FiatBalance = styled(Text).attrs({ const BalanceSection = styled.div` display: flex; flex-direction: column; - justify-content: right; + align-items: flex-end; + justify-content: center; flex-shrink: 0; p, From 8319d501ec9888284ff52a5b6e06cfbc271c5eec Mon Sep 17 00:00:00 2001 From: 7i7o Date: Sun, 9 Feb 2025 00:46:03 +0100 Subject: [PATCH 2/8] fix update ao pid --- src/tokens/aoTokens/ao.ts | 3 ++- src/utils/ao_import.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tokens/aoTokens/ao.ts b/src/tokens/aoTokens/ao.ts index c77473fdd..c4db2926e 100644 --- a/src/tokens/aoTokens/ao.ts +++ b/src/tokens/aoTokens/ao.ts @@ -46,7 +46,8 @@ export const defaultTokens: TokenInfo[] = [ Ticker: "AO", Denomination: 12, Logo: "UkS-mdoiG8hcAClhKK8ch4ZhEzla0mCPDOix9hpdSFE", - processId: "m3PaWzK4PTG9lAaqYQPaPdOcXdO8hYqi5Fe9NWqXd0w" + // processId: "m3PaWzK4PTG9lAaqYQPaPdOcXdO8hYqi5Fe9NWqXd0w" + processId: "0syT13r0s0tgPmIed95bJnuSqaD29HQNN8D3ElLSrsc" }, { Name: "Q Arweave", diff --git a/src/utils/ao_import.ts b/src/utils/ao_import.ts index 9b6be5386..60db1953d 100644 --- a/src/utils/ao_import.ts +++ b/src/utils/ao_import.ts @@ -1,7 +1,8 @@ import { getAoTokens } from "~tokens"; import { ExtensionStorage } from "./storage"; -export const AO_NATIVE_TOKEN = "m3PaWzK4PTG9lAaqYQPaPdOcXdO8hYqi5Fe9NWqXd0w"; +// export const AO_NATIVE_TOKEN = "m3PaWzK4PTG9lAaqYQPaPdOcXdO8hYqi5Fe9NWqXd0w"; +export const AO_NATIVE_TOKEN = "0syT13r0s0tgPmIed95bJnuSqaD29HQNN8D3ElLSrsc"; export const EXP_TOKEN = "aYrCboXVSl1AXL9gPFe3tfRxRf0ZmkOXH65mKT0HHZw"; export const AO_NATIVE_TOKEN_BALANCE_MIRROR = "Pi-WmAQp2-mh-oWH9lWpz5EthlUDj_W0IusAv-RXhRk"; From 302b97da79844f8a9d1019b51629bc28fc88537a Mon Sep 17 00:00:00 2001 From: 7i7o Date: Sun, 9 Feb 2025 00:53:42 +0100 Subject: [PATCH 3/8] remove old ao pid on update --- src/utils/ao_import.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/ao_import.ts b/src/utils/ao_import.ts index 60db1953d..b0c148ae9 100644 --- a/src/utils/ao_import.ts +++ b/src/utils/ao_import.ts @@ -6,8 +6,10 @@ export const AO_NATIVE_TOKEN = "0syT13r0s0tgPmIed95bJnuSqaD29HQNN8D3ElLSrsc"; export const EXP_TOKEN = "aYrCboXVSl1AXL9gPFe3tfRxRf0ZmkOXH65mKT0HHZw"; export const AO_NATIVE_TOKEN_BALANCE_MIRROR = "Pi-WmAQp2-mh-oWH9lWpz5EthlUDj_W0IusAv-RXhRk"; +// export const AO_NATIVE_OLD_TOKEN = +// "BJj8sNao3XPqsoJnea4DnJyPzHnKhkhcY1HtWBxHcLs"; export const AO_NATIVE_OLD_TOKEN = - "BJj8sNao3XPqsoJnea4DnJyPzHnKhkhcY1HtWBxHcLs"; + "m3PaWzK4PTG9lAaqYQPaPdOcXdO8hYqi5Fe9NWqXd0w"; export const AO_NATIVE_TOKEN_INFO = { Name: "AO", From b8e6c62fab6d487c373b089f590aee0b4393a2d9 Mon Sep 17 00:00:00 2001 From: Pawan Paudel Date: Mon, 10 Feb 2025 13:15:10 +0545 Subject: [PATCH 4/8] chore: add aolotto to games --- assets/ecosystem/aolotto.png | Bin 0 -> 32377 bytes src/routes/popup/explore.tsx | 60 ++++++++++++++++++++++++++++------- src/utils/apps.ts | 12 +++++++ 3 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 assets/ecosystem/aolotto.png diff --git a/assets/ecosystem/aolotto.png b/assets/ecosystem/aolotto.png new file mode 100644 index 0000000000000000000000000000000000000000..94679c0384a4d5acb757767c3cb21e6efb3674df GIT binary patch literal 32377 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

juzb^-|xv!+9)%$eRvu6?Cy@jiW+N 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 wKb&Xl)6xY{ky?mLLAb ) : ( )} @@ -127,21 +131,32 @@ const filterApps = ( }); }; -const IconWrapper = styled.div<{ backgroundColor?: string }>` +const IconWrapper = styled.div<{ + backgroundColor?: string; + showBorder?: boolean; +}>` background-color: ${(props) => props.backgroundColor || "white"}; border-radius: 12px; + ${(props) => + props.showBorder && `border: 1px solid ${props.theme.borderDefault};`} overflow: hidden; height: 40px; width: 40px; + display: flex; + justify-content: center; + align-items: center; `; -const IconImage = styled.img<{ objectFit?: "contain" | "cover" }>` - width: 100%; - height: 100%; +const IconImage = styled.img<{ + objectFit?: "contain" | "cover"; + size?: string; +}>` + width: ${(props) => props.size || "100%"}; + height: ${(props) => props.size || "100%"}; object-fit: ${(props) => props.objectFit || "contain"}; `; -const GradientWrapper = styled.div<{ colors?: string[] }>` +const GradientWrapper = styled.div<{ colors?: string[]; showBorder?: boolean }>` border-radius: 12px; overflow: hidden; height: 40px; @@ -150,6 +165,11 @@ const GradientWrapper = styled.div<{ colors?: string[] }>` props.colors ? `linear-gradient(135deg, ${props.colors[0]} 0%, ${props.colors[1]} 100%)` : "linear-gradient(135deg, #8B57FE 0%, #886DFB 100%)"}; + ${(props) => + props.showBorder && `border: 1px solid ${props.theme.borderDefault};`} + display: flex; + justify-content: center; + align-items: center; `; interface AppIconProps { @@ -157,17 +177,26 @@ interface AppIconProps { alt?: string; backgroundColor?: string; objectFit?: "contain" | "cover"; + showBorder?: boolean; + imageSize?: string; } function AppIconWrapper({ source, alt, + showBorder, backgroundColor, - objectFit + objectFit, + imageSize }: AppIconProps) { return ( - - + + ); } @@ -177,17 +206,26 @@ interface AppGradientIconProps { alt?: string; colors?: string[]; objectFit?: "contain" | "cover"; + showBorder?: boolean; + imageSize?: string; } function AppLinearGradientIconWrapper({ source, alt, colors, - objectFit + showBorder, + objectFit, + imageSize }: AppGradientIconProps) { return ( - - + + ); } diff --git a/src/utils/apps.ts b/src/utils/apps.ts index 354293d55..ee89b5caa 100644 --- a/src/utils/apps.ts +++ b/src/utils/apps.ts @@ -77,6 +77,7 @@ import AoctionHouseIcon from "url:/assets/ecosystem/aoctionhouse.png"; import CtrlPlayIcon from "url:/assets/ecosystem/ctrlplay.png"; import DecentraMindIcon from "url:/assets/ecosystem/decentramind.png"; import PetOrRektIcon from "url:/assets/ecosystem/pet-or-rekt.png"; +import AolottoIcon from "url:/assets/ecosystem/aolotto.png"; export interface App { name: string; @@ -97,7 +98,9 @@ export interface App { icon: string; useAppIconWrapper?: boolean; backgroundColor?: string; + showBorder?: boolean; objectFit?: "contain" | "cover"; + imageSize?: string; } export const apps: App[] = [ @@ -291,6 +294,15 @@ export const apps: App[] = [ useAppIconWrapper: true, backgroundColor: "#000000" }, + { + name: "Aolotto", + category: "Games", + url: "https://aolotto.com", + icon: AolottoIcon, + showBorder: true, + imageSize: "32px", + backgroundColor: "#FFF" + }, // DeAI { From a691eced4cb13801d4c6b7bd8f9ba442f2c2f543 Mon Sep 17 00:00:00 2001 From: Pawan Paudel Date: Mon, 10 Feb 2025 13:57:37 +0545 Subject: [PATCH 5/8] fix: make explore header to be fixed at top --- src/routes/popup/explore.tsx | 80 +++++++++++++++++++++--------------- src/utils/apps.ts | 1 + 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/src/routes/popup/explore.tsx b/src/routes/popup/explore.tsx index 726e15e31..0f61a65ff 100644 --- a/src/routes/popup/explore.tsx +++ b/src/routes/popup/explore.tsx @@ -41,33 +41,35 @@ export function ExploreView() { return ( -

- Wander Icon - scroll("left")}> - - - - {categories.map((category) => ( - handleCategoryClick(category.title)} - > - - {category.title} - - ))} - - scroll("right")}> - - -
- + +
+ Wander Icon + scroll("left")}> + + + + {categories.map((category) => ( + handleCategoryClick(category.title)} + > + + {category.title} + + ))} + + scroll("right")}> + + +
+ +
{filteredApps.map((app, index) => ( (theme.displayTheme === "dark" ? "#111" : "#FFF")} 150px - ); `; const AppTitle = styled(Text).attrs({ @@ -355,6 +352,22 @@ const CategoryIcon = styled.div` color: ${(props) => props.theme.primaryText}; `; +const FixedHeader = styled.div` + display: flex; + gap: 1rem; + flex-direction: column; + position: fixed; + width: 100vw; + padding: 24px 24px 16px 24px; + box-sizing: border-box; + background: linear-gradient( + 180deg, + #26126f 0%, + ${({ theme }) => (theme.displayTheme === "dark" ? "#111" : "#FFF")} 150px + ); + z-index: 100; +`; + const Header = styled.div` display: flex; align-items: center; @@ -406,4 +419,5 @@ const AppList = styled.div` display: flex; flex-direction: column; gap: 8px; + padding-top: 136px; `; diff --git a/src/utils/apps.ts b/src/utils/apps.ts index ee89b5caa..c3e259304 100644 --- a/src/utils/apps.ts +++ b/src/utils/apps.ts @@ -330,6 +330,7 @@ export const apps: App[] = [ category: "NFTs", url: "https://1of1_aoction-house.arweave.net", icon: AoctionHouseIcon, + imageSize: "32px", useAppIconWrapper: true }, From d89e1415dae55d3cb93107ce4ef2fbbb96a43fcf Mon Sep 17 00:00:00 2001 From: Pawan Paudel Date: Mon, 10 Feb 2025 16:05:12 +0545 Subject: [PATCH 6/8] fix: add left zero --- src/routes/popup/explore.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes/popup/explore.tsx b/src/routes/popup/explore.tsx index 0f61a65ff..6a495cafd 100644 --- a/src/routes/popup/explore.tsx +++ b/src/routes/popup/explore.tsx @@ -357,6 +357,7 @@ const FixedHeader = styled.div` gap: 1rem; flex-direction: column; position: fixed; + left: 0; width: 100vw; padding: 24px 24px 16px 24px; box-sizing: border-box; From a32bb604da915c566e6dd48e96eaf3d269367738 Mon Sep 17 00:00:00 2001 From: nicholas ma Date: Tue, 11 Feb 2025 10:45:15 -0800 Subject: [PATCH 7/8] fix: removed token mirror --- .../token_balance/token_balance.background.ts | 8 ++------ .../modules/user_tokens/user_tokens.background.ts | 13 ++----------- src/tokens/aoTokens/ao.ts | 4 +--- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/api/modules/token_balance/token_balance.background.ts b/src/api/modules/token_balance/token_balance.background.ts index 3cdc0d078..448e24d6c 100644 --- a/src/api/modules/token_balance/token_balance.background.ts +++ b/src/api/modules/token_balance/token_balance.background.ts @@ -1,7 +1,6 @@ import type { BackgroundModuleFunction } from "~api/background/background-modules"; import { ExtensionStorage } from "~utils/storage"; -import { getAoTokenBalance, getNativeTokenBalance } from "~tokens/aoTokens/ao"; -import { AO_NATIVE_TOKEN } from "~utils/ao_import"; +import { getAoTokenBalance } from "~tokens/aoTokens/ao"; import { isAddress } from "~utils/assertions"; const background: BackgroundModuleFunction = async (_, id?: string) => { @@ -9,10 +8,7 @@ const background: BackgroundModuleFunction = async (_, id?: string) => { isAddress(id); const address = await ExtensionStorage.get("active_address"); - const balance = - id === AO_NATIVE_TOKEN - ? await getNativeTokenBalance(address) - : (await getAoTokenBalance(address, id)).toString(); + const balance = (await getAoTokenBalance(address, id)).toString(); return balance; }; diff --git a/src/api/modules/user_tokens/user_tokens.background.ts b/src/api/modules/user_tokens/user_tokens.background.ts index 4c722fad9..5b665aaa1 100644 --- a/src/api/modules/user_tokens/user_tokens.background.ts +++ b/src/api/modules/user_tokens/user_tokens.background.ts @@ -2,11 +2,9 @@ import type { BackgroundModuleFunction } from "~api/background/background-module import { ExtensionStorage } from "~utils/storage"; import { getAoTokenBalance, - getNativeTokenBalance, type TokenInfo, type TokenInfoWithBalance } from "~tokens/aoTokens/ao"; -import { AO_NATIVE_TOKEN } from "~utils/ao_import"; const background: BackgroundModuleFunction< TokenInfoWithBalance[] | TokenInfo[] @@ -25,15 +23,8 @@ const background: BackgroundModuleFunction< let balance: string | null = null; try { - if (token.processId === AO_NATIVE_TOKEN) { - balance = await getNativeTokenBalance(address); - } else { - const balanceResult = await getAoTokenBalance( - address, - token.processId - ); - balance = balanceResult.toString(); - } + const balanceResult = await getAoTokenBalance(address, token.processId); + balance = balanceResult.toString(); } catch (error) { console.error( `Error fetching balance for token ${token.Name} (${token.processId}):`, diff --git a/src/tokens/aoTokens/ao.ts b/src/tokens/aoTokens/ao.ts index c4db2926e..19f7e58c6 100644 --- a/src/tokens/aoTokens/ao.ts +++ b/src/tokens/aoTokens/ao.ts @@ -498,9 +498,7 @@ export async function fetchTokenBalance( refresh?: boolean ): Promise { try { - if (token.processId === AO_NATIVE_TOKEN) { - return (await getNativeTokenBalance(address)).toString(); - } else if (token.processId === "AR") { + if (token.processId === "AR") { return await getArTokenBalance(address); } else { if (refresh) token = await getTokenInfo(token.processId); From d5cc1e7cbb55ebf5d1e814cd42fa269e743c2e9a Mon Sep 17 00:00:00 2001 From: nicholas ma Date: Tue, 11 Feb 2025 13:05:18 -0800 Subject: [PATCH 8/8] chore: manual release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 962ad546e..429147f75 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "wander", "displayName": "Wander", - "version": "1.18.1", + "version": "1.24.2", "description": "__MSG_extensionDescription__", "author": "th8ta", "packageManager": "yarn@1.22.18",