Compare commits

...
Author SHA1 Message Date
Aleka Cheung 56ba69334a address feedback 2024-02-02 15:11:35 -05:00
Aleka Cheung f6e5469427 use updated isaccountconnected check 2024-02-01 16:23:00 -05:00
Jared Vu 2c220233e3 Update potential-market csv (#264)
* Update potential-market csv to match opensource guidance

* missing quantom-conversion-exponent

* fix filter

* alphabetize
2024-01-31 10:07:21 -08:00
aleka 8187e3615b add back clickable label to checkbox (#263)
* add back clickable label to checkbox

* make disabled optional
2024-01-30 16:42:05 -05:00
Bill c5888c2d5c Fix if conditioned before hooks (#262) 2024-01-30 13:18:10 -08:00
6 changed files with 816 additions and 793 deletions
@@ -90,10 +90,10 @@ BNB,Binance,BNBUSDT,2315487.589,299938471.1,292.0261567,A,6,2,Binance Coin,USDT-
BNB,Bybit,BNBUSDT,73840.12419,11584488.51,291.812684,A,6,2,Binance Coin,USDT-USD BNB,Bybit,BNBUSDT,73840.12419,11584488.51,291.812684,A,6,2,Binance Coin,USDT-USD
BNB,Gate,BNB_USDT,50000,100000,0,A,6,2,Binance Coin,USDT-USD BNB,Gate,BNB_USDT,50000,100000,0,A,6,2,Binance Coin,USDT-USD
BONK,Bybit,BONKUSDT,91223.30674,10108782.84,1.09E-05,A,6,2,Bonk Token,USDT-USD BONK,Bybit,BONKUSDT,91223.30674,10108782.84,1.09E-05,A,6,2,Bonk Token,USDT-USD
BONK,Mexc,BONK_USDT,880507.727,1996432.036,1.10E-05,A,6,2,Bonk Token,USDT-USD BONK,Mexc,BONK_USDT,880507.727,1996432.036,1.1E-05,A,6,2,Bonk Token,USDT-USD
BONK,Binance,BONKUSDT,496236.8093,63520367.26,1.09E-05,A,6,2,Bonk Token,USDT-USD BONK,Binance,BONKUSDT,496236.8093,63520367.26,1.09E-05,A,6,2,Bonk Token,USDT-USD
BONK,Okx,BONK-USDT,84194.41757,4939704.699,1.09E-05,A,6,2,Bonk Token,USDT-USD BONK,Okx,BONK-USDT,84194.41757,4939704.699,1.09E-05,A,6,2,Bonk Token,USDT-USD
BONK,CoinbasePro,BONK-USD,291120.8766,24041618.38,1.10E-05,A,6,2,Bonk Token, BONK,CoinbasePro,BONK-USD,291120.8766,24041618.38,1.1E-05,A,6,2,Bonk Token,
BONK,Kucoin,BONK-USDT,104413.0879,5795566.827,1.09E-05,A,6,2,Bonk Token,USDT-USD BONK,Kucoin,BONK-USDT,104413.0879,5795566.827,1.09E-05,A,6,2,Bonk Token,USDT-USD
BTC,Kucoin,BTC-USDT,1385049.373,192647255.8,39920.8141,A,9,1,Bitcoin,USDT-USD BTC,Kucoin,BTC-USDT,1385049.373,192647255.8,39920.8141,A,9,1,Bitcoin,USDT-USD
BTC,Mexc,BTC_USDT,6055794.786,468890338.6,39929.87241,A,9,1,Bitcoin,USDT-USD BTC,Mexc,BTC_USDT,6055794.786,468890338.6,39929.87241,A,9,1,Bitcoin,USDT-USD
@@ -367,12 +367,11 @@ SUI,Binance,SUIUSDT,1262079.981,111516956.8,1.223930951,A,6,2,SuiNetwork,USDT-US
SUI,CoinbasePro,SUI-USD,164063.7043,14862283.81,1.225266393,A,6,2,SuiNetwork, SUI,CoinbasePro,SUI-USD,164063.7043,14862283.81,1.225266393,A,6,2,SuiNetwork,
SUI,Bybit,SUIUSDT,212067.1354,19630489.94,1.225408738,A,6,2,SuiNetwork,USDT-USD SUI,Bybit,SUIUSDT,212067.1354,19630489.94,1.225408738,A,6,2,SuiNetwork,USDT-USD
SUI,Okx,SUI-USDT,613217.7334,54191478.11,1.223865903,A,6,2,SuiNetwork,USDT-USD SUI,Okx,SUI-USDT,613217.7334,54191478.11,1.223865903,A,6,2,SuiNetwork,USDT-USD
SUSHI,Mexc,SUSHI_USDT,698897.3305,162827.6862,1.069891177,A,6,2,Sushi,USDT-USD SUSHI,Mexc,SUSHI_USDT,698897.3305,162827.6862,1.069891177,B,5,2,Sushi,USDT-USD
SUSHI,Binance,SUSHIUSDT,314905.5164,8301205.3,1.070356721,A,6,2,Sushi,USDT-USD SUSHI,Binance,SUSHIUSDT,314905.5164,8301205.3,1.070356721,B,5,2,Sushi,USDT-USD
SUSHI,Okx,SUSHI-USDT,140667.711,3610840.809,1.067487683,A,6,2,Sushi,USDT-USD SUSHI,Okx,SUSHI-USDT,140667.711,3610840.809,1.067487683,B,5,2,Sushi,USDT-USD
SUSHI,Kraken,SUSHIUSD,60333.51362,206177.6733,1.075978241,A,6,2,Sushi, SUSHI,Kraken,SUSHIUSD,60333.51362,206177.6733,1.075978241,B,5,2,Sushi,
SUSHI,CoinbasePro,SUSHI-USD,84615.09476,3085188.166,1.072066002,A,6,2,Sushi, SUSHI,CoinbasePro,SUSHI-USD,84615.09476,3085188.166,1.072066002,B,5,2,Sushi,
SUSHI,Gate,SUSHI_USDT,50000,100000,0,A,6,2,Sushi,USDT-USD
TIA,Bybit,TIAUSDT,187918.6442,14660427.8,15.52650347,A,7,2,Celestia,USDT-USD TIA,Bybit,TIAUSDT,187918.6442,14660427.8,15.52650347,A,7,2,Celestia,USDT-USD
TIA,Binance,TIAUSDT,841382.0946,102103230.5,15.53648038,A,7,2,Celestia,USDT-USD TIA,Binance,TIAUSDT,841382.0946,102103230.5,15.53648038,A,7,2,Celestia,USDT-USD
TIA,CoinbasePro,TIA-USD,383069.4815,25165071.27,15.51546599,A,7,2,Celestia, TIA,CoinbasePro,TIA-USD,383069.4815,25165071.27,15.51546599,A,7,2,Celestia,
@@ -701,4 +700,10 @@ ZEC,Binance,ZECUSDT,107748.7569,6231023.464,22.06774527,C,2,2,Zcash,USDT-USD
ZEN,Binance,ZENUSDT,121239.4862,5983871.133,7.622205603,C,1,2,Horizen,USDT-USD ZEN,Binance,ZENUSDT,121239.4862,5983871.133,7.622205603,C,1,2,Horizen,USDT-USD
ZIL,Binance,ZILUSDT,78122.06511,5951041.305,0.01981457877,C,3,2,Zilliqa,USDT-USD ZIL,Binance,ZILUSDT,78122.06511,5951041.305,0.01981457877,C,3,2,Zilliqa,USDT-USD
ZIL,Mexc,ZIL_USDT,164288.1689,136450.7828,0.01983149916,C,3,2,Zilliqa,USDT-USD ZIL,Mexc,ZIL_USDT,164288.1689,136450.7828,0.01983149916,C,3,2,Zilliqa,USDT-USD
ZIL,Kucoin,ZIL-USDT,51622.45768,620061.2048,0.0198240821,C,3,2,Zilliqa,USDT-U ZIL,Kucoin,ZIL-USDT,51622.45768,620061.2048,0.0198240821,C,3,2,Zilliqa,USDT-USD
JUP,Kucoin,JUP-USDT,72000,9000000,0.69,A,6,2,Jupiter,USDT-USD
JUP,Okx,JUP-USDT,64000,29000000,0.69,A,6,2,Jupiter,USDT-USD
JUP,Binance,JUPUSDT,500000,96000000,0.69,A,6,2,Jupiter,USDT-USD
JUP,Bybit,JUPUSDT,100000,35000000,0.69,A,6,2,Jupiter,USDT-USD
JUP,Gate,JUP_USDT,35000,900000,0.68,A,6,2,Jupiter,USDT-USD
JUP,Mexc,JUP_USDT,20000,6000000,0.69,A,6,2,Jupiter,USDT-USD
1 base_asset exchange pair min_2_depth avg_30d_vol reference_price risk_assessment num_oracles liquidity_tier asset_name adjust_by_market
90 BNB Bybit BNBUSDT 73840.12419 11584488.51 291.812684 A 6 2 Binance Coin USDT-USD
91 BNB Gate BNB_USDT 50000 100000 0 A 6 2 Binance Coin USDT-USD
92 BONK Bybit BONKUSDT 91223.30674 10108782.84 1.09E-05 A 6 2 Bonk Token USDT-USD
93 BONK Mexc BONK_USDT 880507.727 1996432.036 1.10E-05 1.1E-05 A 6 2 Bonk Token USDT-USD
94 BONK Binance BONKUSDT 496236.8093 63520367.26 1.09E-05 A 6 2 Bonk Token USDT-USD
95 BONK Okx BONK-USDT 84194.41757 4939704.699 1.09E-05 A 6 2 Bonk Token USDT-USD
96 BONK CoinbasePro BONK-USD 291120.8766 24041618.38 1.10E-05 1.1E-05 A 6 2 Bonk Token
97 BONK Kucoin BONK-USDT 104413.0879 5795566.827 1.09E-05 A 6 2 Bonk Token USDT-USD
98 BTC Kucoin BTC-USDT 1385049.373 192647255.8 39920.8141 A 9 1 Bitcoin USDT-USD
99 BTC Mexc BTC_USDT 6055794.786 468890338.6 39929.87241 A 9 1 Bitcoin USDT-USD
367 SUI CoinbasePro SUI-USD 164063.7043 14862283.81 1.225266393 A 6 2 SuiNetwork
368 SUI Bybit SUIUSDT 212067.1354 19630489.94 1.225408738 A 6 2 SuiNetwork USDT-USD
369 SUI Okx SUI-USDT 613217.7334 54191478.11 1.223865903 A 6 2 SuiNetwork USDT-USD
370 SUSHI Mexc SUSHI_USDT 698897.3305 162827.6862 1.069891177 A B 6 5 2 Sushi USDT-USD
371 SUSHI Binance SUSHIUSDT 314905.5164 8301205.3 1.070356721 A B 6 5 2 Sushi USDT-USD
372 SUSHI Okx SUSHI-USDT 140667.711 3610840.809 1.067487683 A B 6 5 2 Sushi USDT-USD
373 SUSHI Kraken SUSHIUSD 60333.51362 206177.6733 1.075978241 A B 6 5 2 Sushi
374 SUSHI CoinbasePro SUSHI-USD 84615.09476 3085188.166 1.072066002 A B 6 5 2 Sushi
SUSHI Gate SUSHI_USDT 50000 100000 0 A 6 2 Sushi USDT-USD
375 TIA Bybit TIAUSDT 187918.6442 14660427.8 15.52650347 A 7 2 Celestia USDT-USD
376 TIA Binance TIAUSDT 841382.0946 102103230.5 15.53648038 A 7 2 Celestia USDT-USD
377 TIA CoinbasePro TIA-USD 383069.4815 25165071.27 15.51546599 A 7 2 Celestia
700 ZEN Binance ZENUSDT 121239.4862 5983871.133 7.622205603 C 1 2 Horizen USDT-USD
701 ZIL Binance ZILUSDT 78122.06511 5951041.305 0.01981457877 C 3 2 Zilliqa USDT-USD
702 ZIL Mexc ZIL_USDT 164288.1689 136450.7828 0.01983149916 C 3 2 Zilliqa USDT-USD
703 ZIL Kucoin ZIL-USDT 51622.45768 620061.2048 0.0198240821 C 3 2 Zilliqa USDT-U USDT-USD
704 JUP Kucoin JUP-USDT 72000 9000000 0.69 A 6 2 Jupiter USDT-USD
705 JUP Okx JUP-USDT 64000 29000000 0.69 A 6 2 Jupiter USDT-USD
706 JUP Binance JUPUSDT 500000 96000000 0.69 A 6 2 Jupiter USDT-USD
707 JUP Bybit JUPUSDT 100000 35000000 0.69 A 6 2 Jupiter USDT-USD
708 JUP Gate JUP_USDT 35000 900000 0.68 A 6 2 Jupiter USDT-USD
709 JUP Mexc JUP_USDT 20000 6000000 0.69 A 6 2 Jupiter USDT-USD
@@ -35,6 +35,7 @@ HBAR,0.07127967284,7,2,Hedera Hashgraph,-2,-4,3,4000,-11,1000000,-3,1000000,1000
ICP,11.47442186,7,2,Internet Computer,1,-7,3,4000,-8,1000000,-3,1000000,1000000,-9 ICP,11.47442186,7,2,Internet Computer,1,-7,3,4000,-8,1000000,-3,1000000,1000000,-9
INJ,31.78305093,7,2,Injective Protocol,1,-7,3,4000,-8,1000000,-3,1000000,1000000,-9 INJ,31.78305093,7,2,Injective Protocol,1,-7,3,4000,-8,1000000,-3,1000000,1000000,-9
JTO,1.886208515,6,2,Jito,0,-6,3,4000,-9,1000000,-3,1000000,1000000,-9 JTO,1.886208515,6,2,Jito,0,-6,3,4000,-9,1000000,-3,1000000,1000000,-9
JUP,0.69,6,2,Jupiter,-1,-5,3,4000,-10,1000000,-3,1000000,1000000,-9
KAVA,0.5751546332,6,2,Kava,-1,-5,3,4000,-10,1000000,-3,1000000,1000000,-9 KAVA,0.5751546332,6,2,Kava,-1,-5,3,4000,-10,1000000,-3,1000000,1000000,-9
LDO,2.524539255,8,2,Lido DAO,0,-6,3,4000,-9,1000000,-3,1000000,1000000,-9 LDO,2.524539255,8,2,Lido DAO,0,-6,3,4000,-9,1000000,-3,1000000,1000000,-9
LINK,13.81655633,8,1,ChainLink,1,-7,3,2500,-8,1000000,-3,1000000,1000000,-9 LINK,13.81655633,8,1,ChainLink,1,-7,3,2500,-8,1000000,-3,1000000,1000000,-9
1 base_asset reference_price num_oracles liquidity_tier asset_name p atomic_resolution min_exchanges min_price_change_ppm price_exponent step_base_quantum ticksize_exponent subticks_per_tick min_order_size quantum_conversion_exponent
35 ICP 11.47442186 7 2 Internet Computer 1 -7 3 4000 -8 1000000 -3 1000000 1000000 -9
36 INJ 31.78305093 7 2 Injective Protocol 1 -7 3 4000 -8 1000000 -3 1000000 1000000 -9
37 JTO 1.886208515 6 2 Jito 0 -6 3 4000 -9 1000000 -3 1000000 1000000 -9
38 JUP 0.69 6 2 Jupiter -1 -5 3 4000 -10 1000000 -3 1000000 1000000 -9
39 KAVA 0.5751546332 6 2 Kava -1 -5 3 4000 -10 1000000 -3 1000000 1000000 -9
40 LDO 2.524539255 8 2 Lido DAO 0 -6 3 4000 -9 1000000 -3 1000000 1000000 -9
41 LINK 13.81655633 8 1 ChainLink 1 -7 3 2500 -8 1000000 -3 1000000 1000000 -9
+21 -11
View File
@@ -24,15 +24,25 @@ export const Checkbox: React.FC<CheckboxProps> = ({
onCheckedChange, onCheckedChange,
id, id,
label, label,
disabled disabled,
}) => ( }) => (
<Styled.Container> <Styled.Container>
<Styled.Root className={className} checked={checked} disabled={disabled} onCheckedChange={onCheckedChange} id={id}> <Styled.Root
className={className}
checked={checked}
disabled={disabled}
onCheckedChange={onCheckedChange}
id={id}
>
<Styled.Indicator> <Styled.Indicator>
<CheckIcon /> <CheckIcon />
</Styled.Indicator> </Styled.Indicator>
</Styled.Root> </Styled.Root>
{label && <Styled.label disabled={disabled} htmlFor={id}>{label}</Styled.label>} {label && (
<Styled.Label disabled={disabled} htmlFor={id}>
{label}
</Styled.Label>
)}
</Styled.Container> </Styled.Container>
); );
@@ -42,10 +52,6 @@ Styled.Container = styled.div`
${layoutMixins.row} ${layoutMixins.row}
gap: 1ch; gap: 1ch;
font: var(--font-small-book); font: var(--font-small-book);
label {
cursor: pointer;
}
`; `;
Styled.Root = styled(Root)` Styled.Root = styled(Root)`
@@ -77,10 +83,14 @@ Styled.Indicator = styled(Indicator)`
color: var(--color-text-2); color: var(--color-text-2);
`; `;
Styled.label = styled.div<{ disabled: boolean; }>` Styled.Label = styled.label<{ disabled?: boolean }>`
cursor: pointer;
color: var(--color-text-2); color: var(--color-text-2);
${({disabled}) => disabled && css` ${({ disabled }) =>
color: var(--color-text-0); disabled &&
`} css`
cursor: not-allowed;
color: var(--color-text-0);
`}
`; `;
+3 -3
View File
@@ -50,11 +50,11 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
label={title} label={title}
// value={highlightedCommand} // value={highlightedCommand}
// onValueChange={setHighlightedCommand} // onValueChange={setHighlightedCommand}
filter={(value: string, search: string) => { filter={(value: string, search: string) =>
value.replace(/ /g, '').toLowerCase().includes(search.replace(/ /g, '').toLowerCase()) value.replace(/ /g, '').toLowerCase().includes(search.replace(/ /g, '').toLowerCase())
? 1 ? 1
: 0; : 0
}} }
className={className} className={className}
$withStickyLayout={withStickyLayout} $withStickyLayout={withStickyLayout}
> >
+13 -5
View File
@@ -115,7 +115,15 @@ export const useWalletConnection = () => {
}); });
const connectWallet = useCallback( const connectWallet = useCallback(
async ({ walletType, forceConnect }: { walletType?: WalletType; forceConnect?: boolean }) => { async ({
walletType,
forceConnect,
isAccountConnected,
}: {
walletType?: WalletType;
forceConnect?: boolean;
isAccountConnected?: boolean;
}) => {
if (!walletType) return { walletType, walletConnectionType }; if (!walletType) return { walletType, walletConnectionType };
const walletConnection = getWalletConnection({ walletType }); const walletConnection = getWalletConnection({ walletType });
@@ -143,9 +151,6 @@ export const useWalletConnection = () => {
} else if (walletConnection.type === WalletConnectionType.TestWallet) { } else if (walletConnection.type === WalletConnectionType.TestWallet) {
saveEvmAddress(STRING_KEYS.TEST_WALLET as EvmAddress); saveEvmAddress(STRING_KEYS.TEST_WALLET as EvmAddress);
} else { } else {
const isAccountConnected = Boolean(
evmAddress && evmDerivedAddresses[evmAddress]?.encryptedSignature
);
// if account connected (via remember me), do not show wagmi popup until forceConnect // if account connected (via remember me), do not show wagmi popup until forceConnect
if (!isConnectedWagmi && (forceConnect || !isAccountConnected)) { if (!isConnectedWagmi && (forceConnect || !isAccountConnected)) {
await connectWagmi({ await connectWagmi({
@@ -195,6 +200,9 @@ export const useWalletConnection = () => {
try { try {
const { walletType, walletConnectionType } = await connectWallet({ const { walletType, walletConnectionType } = await connectWallet({
walletType: selectedWalletType, walletType: selectedWalletType,
isAccountConnected: Boolean(
evmAddress && evmDerivedAddresses[evmAddress]?.encryptedSignature
),
}); });
setWalletType(walletType); setWalletType(walletType);
@@ -217,7 +225,7 @@ export const useWalletConnection = () => {
await disconnectWallet(); await disconnectWallet();
} }
})(); })();
}, [selectedWalletType, signerWagmi, signerGraz]); }, [selectedWalletType, signerWagmi, signerGraz, evmDerivedAddresses, evmAddress]);
const selectWalletType = async (walletType: WalletType | undefined) => { const selectWalletType = async (walletType: WalletType | undefined) => {
if (selectedWalletType) { if (selectedWalletType) {
@@ -55,6 +55,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const [error, setError] = useState<Error | null>(null); const [error, setError] = useState<Error | null>(null);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [requireUserActionInWallet, setRequireUserActionInWallet] = useState(false);
const { selectedNetwork } = useSelectedNetwork(); const { selectedNetwork } = useSelectedNetwork();
const { evmAddress, signerWagmi, publicClientWagmi, nobleAddress } = useAccounts(); const { evmAddress, signerWagmi, publicClientWagmi, nobleAddress } = useAccounts();
@@ -373,8 +374,6 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
return <LoadingSpace id="DepositForm" />; return <LoadingSpace id="DepositForm" />;
} }
const [requireUserActionInWallet, setRequireUserActionInWallet] = useState(false);
return ( return (
<Styled.Form onSubmit={onSubmit}> <Styled.Form onSubmit={onSubmit}>
<SourceSelectMenu <SourceSelectMenu