Skip to content

Commit

Permalink
updated viewing key sync modal, updated handleSwap logic.
Browse files Browse the repository at this point in the history
  • Loading branch information
dredshep committed Aug 21, 2024
1 parent 76d42f5 commit e75dd3c
Show file tree
Hide file tree
Showing 8 changed files with 593 additions and 49 deletions.
2 changes: 1 addition & 1 deletion components/app/Shared/Buttons/SyncViewingKeyButton.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { useViewingKeyStore } from "@/store/viewingKeyStore";
import { useViewingKeyStore } from "@/store/viewingKeyStore2";
import { SecretString } from "@/types";

const SyncViewingKeyButton = ({
Expand Down
25 changes: 13 additions & 12 deletions components/app/Testing/SelectComponent2.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
import React, { useState, useEffect } from "react";
import fullPoolsData from "@/outputs/fullPoolsData.json";
import { fetchTokenData, getTokenName } from "@/utils/apis/tokenInfo";
import { SecretString } from "@/types";

interface SelectComponentProps {
apiUrl?: string;
setFrom?: (from: string) => void;
setTo?: (to: string) => void;
outputOptions?: string[]; // New prop for filtered output options
setFrom?: (from: SecretString | "") => void;
setTo?: (to: SecretString | "") => void;
outputOptions?: SecretString[];
}

const SelectComponent2: React.FC<SelectComponentProps> = ({
apiUrl = "/api/tokens",
setFrom,
setTo,
outputOptions = [], // Default to empty array if not provided
outputOptions = [] as SecretString[],
}) => {
const [fromTokens, setFromTokens] = useState<string[]>([]);
const [toTokens, setToTokens] = useState<string[]>([]);
const [selectedFrom, setSelectedFrom] = useState<string>("");
const [selectedTo, setSelectedTo] = useState<string>("");
const [fromTokens, setFromTokens] = useState<SecretString[]>([]);
const [toTokens, setToTokens] = useState<SecretString[]>([]);
const [selectedFrom, setSelectedFrom] = useState<SecretString | "">("");
const [selectedTo, setSelectedTo] = useState<SecretString | "">("");
const [tokenNames, setTokenNames] = useState<{ [key: string]: string }>({});

useEffect(() => {
Expand Down Expand Up @@ -59,7 +60,7 @@ const SelectComponent2: React.FC<SelectComponentProps> = ({
(addressOrDenom): addressOrDenom is string =>
addressOrDenom !== undefined
)
.filter((address) => address !== "uscrt");
.filter((address) => address !== "uscrt") as SecretString[];

setFromTokens(Array.from(new Set(fromOptions)));
};
Expand All @@ -68,7 +69,7 @@ const SelectComponent2: React.FC<SelectComponentProps> = ({
}, [apiUrl]);

const handleFromSelect = (event: React.ChangeEvent<HTMLSelectElement>) => {
const fromToken = event.target.value;
const fromToken = event.target.value as SecretString;
setSelectedFrom(fromToken);

if (outputOptions.length > 0) {
Expand All @@ -90,7 +91,7 @@ const SelectComponent2: React.FC<SelectComponentProps> = ({
})
)
.filter((addr): addr is string => addr !== null)
.filter((addr) => addr !== "uscrt");
.filter((addr) => addr !== "uscrt") as SecretString[];

setToTokens(Array.from(new Set(toOptions)));
}
Expand All @@ -99,7 +100,7 @@ const SelectComponent2: React.FC<SelectComponentProps> = ({
};

const handleToSelect = (event: React.ChangeEvent<HTMLSelectElement>) => {
setSelectedTo(event.target.value);
setSelectedTo(event.target.value as SecretString);
};

return (
Expand Down
Loading

0 comments on commit e75dd3c

Please sign in to comment.