From 9cd32950ed26afd7b29ce6a2c39b54f642fbb62f Mon Sep 17 00:00:00 2001 From: olgakup <16910687+olgakup@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:05:02 -0800 Subject: [PATCH 001/127] devop: refactor updates state into pinia store --- packages/extension/src/ui/action/App.vue | 102 ++------------- packages/extension/src/ui/action/main.ts | 4 +- .../src/ui/action/store/updatesStore.ts | 123 ++++++++++++++++++ .../src/ui/action/views/updates/index.vue | 16 ++- 4 files changed, 149 insertions(+), 96 deletions(-) create mode 100644 packages/extension/src/ui/action/store/updatesStore.ts diff --git a/packages/extension/src/ui/action/App.vue b/packages/extension/src/ui/action/App.vue index 0ade5518e..9256a689b 100644 --- a/packages/extension/src/ui/action/App.vue +++ b/packages/extension/src/ui/action/App.vue @@ -9,7 +9,7 @@
-
+
@@ -98,12 +93,12 @@ />
- + /> --> ({ @@ -213,9 +201,6 @@ const router = useRouter(); const route = useRoute(); const transitionName = 'fade'; const searchInput = ref(''); -const activeCategory = ref(NetworksCategory.All); -const networks = ref([]); -const pinnedNetworks = ref([]); const defaultNetwork = DEFAULT_EVM_NETWORK; const currentNetwork = ref(defaultNetwork); const currentSubNetwork = ref(''); @@ -229,7 +214,7 @@ const toggle = ref(null); const isLoading = ref(true); const currentVersion = __PACKAGE_VERSION__; const latestVersion = ref(''); -const enabledTestnetworks = ref([]); + /** ------------------- * Updates -------------------*/ @@ -254,33 +239,17 @@ const closeUpdatesDialog = () => { showUpdatesDialog.value = false; }; +/** ------------------- + * Networks + -------------------*/ + +const networksStore = useNetworksStore(); +const { orderedNetworks } = storeToRefs(networksStore); + /** ------------------- * Core -------------------*/ -const setActiveNetworks = async () => { - const pinnedNetworkNames = await networksState.getPinnedNetworkNames(); - const allNetworks = await getAllNetworks(); - enabledTestnetworks.value = await networksState.getEnabledTestNetworks(); - pinnedNetworks.value = []; - pinnedNetworkNames.forEach(name => { - const network = allNetworks.find(network => network.name === name); - if (network !== undefined) pinnedNetworks.value.push(network); - }); - networks.value = [ - ...pinnedNetworks.value, - ...allNetworks.filter( - network => !pinnedNetworkNames.includes(network.name), - ), - ]; -}; -const updateNetworkOrder = (newOrder: BaseNetwork[]) => { - if (searchInput.value === '') { - if (activeCategory.value === NetworksCategory.Pinned) - pinnedNetworks.value = newOrder; - else networks.value = newOrder; - } -}; const updateSearchValue = (newval: string) => { searchInput.value = newval; }; @@ -313,6 +282,7 @@ const openBuyPage = () => { }); trackBuyEvents(BuyEventType.BuyClick, { network: currentNetwork.value.name }); }; + const isKeyRingLocked = async (): Promise => { return await sendToBackgroundFromAction({ message: JSON.stringify({ @@ -333,7 +303,7 @@ const init = async () => { } else { setNetwork(defaultNetwork); } - await setActiveNetworks(); + await networksStore.setActiveNetworks(); isLoading.value = false; }; @@ -536,37 +506,11 @@ const showNetworkMenu = computed(() => { route.name == 'dapps') ); }); + const isLocked = computed(() => { return route.name == 'lock-screen'; }); -/**------------------- - * Network Categories - -------------------*/ -const setActiveCategory = async (category: NetworksCategory) => { - await setActiveNetworks(); - activeCategory.value = category; -}; - -/** - * Display Networks - * Categories: All, Pinned, New - */ -const displayNetworks = computed(() => { - switch (activeCategory.value) { - case NetworksCategory.All: - return networks.value.filter(net => - net.isTestNetwork ? enabledTestnetworks.value.includes(net.name) : true, - ); - case NetworksCategory.Pinned: - return pinnedNetworks.value; - case NetworksCategory.New: - return networks.value.filter(net => newNetworks.includes(net.name)); - default: - return networks.value; - } -}); - /** ------------------- * Menu Actions * ------------------- */ @@ -616,22 +560,14 @@ onClickOutside( }, { ignore: [toggle] }, ); -const setIsPinnedNetwork = async (network: string, isPinned: boolean) => { - try { - await networksState.setNetworkStatus(network, isPinned); - await setActiveNetworks(); - } catch (error) { - console.error('Failed to set pined network:', error); - } -}; -const setIsToggledTestNetwork = async () => { - try { - await setActiveNetworks(); - } catch (error) { - console.error('Failed to set is toggled test network:', error); - } -}; +// const setIsToggledTestNetwork = async () => { +// try { +// // await setActiveNetworks(); +// } catch (error) { +// console.error('Failed to set is toggled test network:', error); +// } +// }; From 16feaf886e964ebf58c685e17910822cc1debf1a Mon Sep 17 00:00:00 2001 From: olgakup <16910687+olgakup@users.noreply.github.com> Date: Mon, 10 Mar 2025 14:34:26 -0700 Subject: [PATCH 006/127] feat: basic expand/collapse logic --- packages/extension/src/ui/action/App.vue | 37 ++++- .../components/accounts-header/index.vue | 1 - .../ui/action/components/app-menu/index.vue | 37 ++++- .../action/components/network-menu/index.vue | 1 - .../ui/action/icons/actions/expand-menu.vue | 140 ++++++++++++++++++ 5 files changed, 202 insertions(+), 14 deletions(-) create mode 100644 packages/extension/src/ui/action/icons/actions/expand-menu.vue diff --git a/packages/extension/src/ui/action/App.vue b/packages/extension/src/ui/action/App.vue index 00aa95ec9..531b49a4b 100644 --- a/packages/extension/src/ui/action/App.vue +++ b/packages/extension/src/ui/action/App.vue @@ -1,10 +1,17 @@