Merge branch 'feat/new-net-tags' into devop/release-1-40

packages/extension/src/libs/networks-state/index.ts

@@ -2,6 +2,7 @@ import BrowserStorage from "../common/browser-storage";
 import { POPULAR_NAMES } from "../utils/networks";
 import { InternalStorageNamespace } from "@/types/provider";
 import { IState, StorageKeys, NetworkStorageElement } from "./types";
+import { newNetworks, newSwaps } from "@/providers/common/libs/new-features";
 
 class NetworksState {
   private storage: BrowserStorage;
@@ -14,7 +15,7 @@ class NetworksState {
     const networks: NetworkStorageElement[] = POPULAR_NAMES.map((name) => ({
       name,
     }));
-    await this.setState({ networks });
+    await this.setState({ networks, newNetworksVersion: "" });
   }
 
   async setNetworkStatus(
@@ -33,7 +34,7 @@ class NetworksState {
     } else if (!isActive) {
       const idxArr = state.networks.map((_, i) => i);
       const filteredIdx = idxArr
-        .filter((i) => state.networks[i].name !== targetNetwork!.name)
+        .filter((i) => state.networks[i].name !== targetNetwork.name)
         .sort((a, b) => a - b);
       const activeNetworks: NetworkStorageElement[] = [];
       filteredIdx.forEach((i) => activeNetworks.push(state.networks[i]));
@@ -42,16 +43,41 @@ class NetworksState {
     await this.setState(state);
   }
 
-  async getActiveNetworkNames(): Promise<string[]> {
+  async insertNetworksWithNewFeatures(): Promise<void> {
     const state: IState | undefined = await this.getState();
-    if (state && state.networks) {
-      const validNetworks = state.networks.filter((net) => {
-        if ((net as any).isActive === undefined || (net as any).isActive) {
-          return true;
-        }
+    if (
+      state &&
+      state.networks &&
+      state.newNetworksVersion !== process.env.PACKAGE_VERSION
+    ) {
+      let validNetworks = state.networks;
+      const netsWithFeatures = [
+        ...new Set([...newNetworks, ...newSwaps]),
+      ].sort();
+      const filteredNets = netsWithFeatures.filter((n) => {
+        for (const vn of validNetworks) if (vn.name === n) return false;
+        return true;
+      });
+      const fnetworkItem = filteredNets.map((name) => {
+        return {
+          name,
+        };
       });
+      const insertIdx = validNetworks.length > 5 ? 5 : validNetworks.length;
+      validNetworks = validNetworks
+        .slice(0, insertIdx)
+        .concat(fnetworkItem, validNetworks.slice(insertIdx));
       state.networks = validNetworks;
+      state.newNetworksVersion = process.env.PACKAGE_VERSION as string;
       await this.setState(state);
+    }
+  }
+
+  async getActiveNetworkNames(): Promise<string[]> {
+    await this.insertNetworksWithNewFeatures();
+    const state: IState | undefined = await this.getState();
+    if (state && state.networks) {
+      const validNetworks = state.networks;
       return validNetworks.map(({ name }) => name);
     } else {
       await this.setInitialActiveNetworks();
@@ -60,10 +86,14 @@ class NetworksState {
   }
 
   async reorderNetwork(networkNames: string[]): Promise<void> {
+    const state: IState | undefined = await this.getState();
     const activeNetworks: NetworkStorageElement[] = networkNames.map(
-      (name) => ({ name })
+      (name) => ({ name, isActive: true })
     );
-    await this.setState({ networks: activeNetworks });
+    await this.setState({
+      networks: activeNetworks,
+      newNetworksVersion: state.newNetworksVersion,
+    });
   }
 
   async setState(state: IState): Promise<void> {

packages/extension/src/libs/networks-state/types.ts

@@ -8,4 +8,5 @@ export interface NetworkStorageElement {
 
 export interface IState {
   networks: NetworkStorageElement[];
+  newNetworksVersion: string;
 }

packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue

@@ -389,7 +389,7 @@ const inputAmount = (inputAmount: string) => {
   }
   const inputAmountBn = new BigNumber(inputAmount);
   isMaxSelected.value = false;
-  amount.value = inputAmountBn.lt(0) ? "0" : inputAmountBn.toFixed();
+  amount.value = inputAmountBn.lt(0) ? "0" : inputAmount;
 };
 
 const toggleSelectFee = () => {

packages/extension/src/providers/common/libs/new-features.ts

@@ -0,0 +1,6 @@
+import { NetworkNames } from "@enkryptcom/types";
+
+const newNetworks = [NetworkNames.Kadena, NetworkNames.Amplitude];
+const newSwaps = [NetworkNames.MaticZK, NetworkNames.Arbitrum];
+
+export { newNetworks, newSwaps };

packages/extension/src/providers/common/ui/send-transaction/send-input-amount.vue

@@ -3,9 +3,10 @@
     <input
       ref="inputRef"
       v-model="amount"
-      type="number"
+      type="text"
       placeholder="0"
       :style="{ color: !hasEnoughBalance ? 'red' : 'black' }"
+      @keypress="onlyNumber"
       @focus="changeFocus"
       @blur="changeFocus"
     />
@@ -31,7 +32,7 @@ import SwitchArrowIcon from "@action/icons/send/switch-arrow-icon.vue";
 import BigNumber from "bignumber.js";
 
 const emit = defineEmits<{
-  (e: "update:inputAmount", address: string): void;
+  (e: "update:inputAmount", value: string): void;
   (e: "update:inputSetMax"): void;
 }>();
 
@@ -64,10 +65,18 @@ const fiatEquivalent = computed(() => {
 const amount = computed({
   get: () => props.amount,
   set: (value) => {
-    emit("update:inputAmount", value.toString());
+    let fValue = value.toString();
+    if (fValue === ".") fValue = "0.";
+    emit("update:inputAmount", fValue);
   },
 });
 
+const onlyNumber = ($event: KeyboardEvent) => {
+  const keyCode = $event.keyCode ? $event.keyCode : $event.which;
+  if ((keyCode < 48 || keyCode > 57) && keyCode !== 46) {
+    $event.preventDefault();
+  }
+};
 const changeFocus = () => {
   isFocus.value = !isFocus.value;
 };

packages/extension/src/providers/ethereum/ui/send-transaction/index.vue

@@ -614,7 +614,7 @@ const inputAmount = (inputAmount: string) => {
   }
   const inputAmountBn = new BigNumber(inputAmount);
   isMaxSelected.value = false;
-  amount.value = inputAmountBn.lt(0) ? "0" : inputAmountBn.toFixed();
+  amount.value = inputAmountBn.lt(0) ? "0" : inputAmount;
   if (isInputsValid.value) {
     updateTransactionFees(Tx.value);
   }

packages/extension/src/providers/kadena/ui/send-transaction/index.vue

@@ -65,8 +65,9 @@
 
       <send-input-amount
         :amount="amount"
+        :show-max="true"
         :fiat-value="selectedAsset.price"
-        :is-valid="fieldsValidation.amount"
+        :has-enough-balance="fieldsValidation.amount"
         @update:input-amount="inputAmount"
         @update:input-set-max="setSendMax"
       />
@@ -103,7 +104,7 @@ import SendContactsList from "./components/send-contacts-list.vue";
 import SendFromContactsList from "./components/send-from-contacts-list.vue";
 import SendTokenSelect from "./components/send-token-select.vue";
 import AssetsSelectList from "@action/views/assets-select-list/index.vue";
-import SendInputAmount from "./components/send-input-amount.vue";
+import SendInputAmount from "@/providers/common/ui/send-transaction/send-input-amount.vue";
 import SendFeeSelect from "./components/send-fee-select.vue";
 import SendAlert from "./components/send-alert.vue";
 import BaseButton from "@action/components/base-button/index.vue";
@@ -399,9 +400,13 @@ const selectToken = (token: KDAToken | Partial<KDAToken>) => {
   isOpenSelectToken.value = false;
 };
 
-const inputAmount = (number: string | undefined) => {
+const inputAmount = (inputAmount: string) => {
+  if (inputAmount === "") {
+    inputAmount = "0";
+  }
+  const inputAmountBn = new BigNumber(inputAmount);
   sendMax.value = false;
-  amount.value = number ? (parseFloat(number) < 0 ? "" : number) : number;
+  amount.value = inputAmountBn.lt(0) ? "0" : inputAmount;
 };
 
 const sendButtonTitle = computed(() => {