Skip to content

Commit c8a70e4

Browse files
committed
PR feedback
1 parent f66f74d commit c8a70e4

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

vite/src/App.tsx

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ function AppContent() {
3939
const [metadataNetworks, setMetadataNetworks] = useState<NetworkOption[]>([]);
4040
const [networkQuery, setNetworkQuery] = useState('');
4141
const [debouncedNetworkQuery, setDebouncedNetworkQuery] = useState('');
42-
const [selectedNetwork, setSelectedNetwork] = useState<NetworkOption | null>(null);
43-
const [selectedNetworkRpc, setSelectedNetworkRpc] = useState<string | null>(null);
44-
const [metadataJson, setMetadataJson] = useState<Record<string, unknown> | null>(null);
42+
const [selectedNetwork, setSelectedNetwork] = useState<NetworkOption>();
43+
const [selectedNetworkRpc, setSelectedNetworkRpc] = useState<string>();
44+
const [metadataJson, setMetadataJson] = useState<Record<string, unknown>>();
4545
const initializedFromUrlRef = useRef(false);
4646

4747
// Mode: choose between default OFTs and user-input addresses
@@ -171,16 +171,20 @@ function AppContent() {
171171
// Derive selected network RPC when selection or metadata changes
172172
useEffect(() => {
173173
if (!selectedNetwork || !metadataJson) {
174-
setSelectedNetworkRpc(null);
174+
setSelectedNetworkRpc(undefined);
175175
return;
176176
}
177177
const entry = metadataJson[selectedNetwork.chainKey];
178178
const rpc = getFirstHttpsRpc(entry);
179-
if (rpc == null) {
179+
if (!rpc) {
180180
console.warn('[metadata] No valid RPC found in metadata entry:', entry);
181+
} else {
182+
setSelectedNetworkRpc(rpc);
181183
}
182-
setSelectedNetworkRpc(rpc);
183184
}, [selectedNetwork, metadataJson]);
185+
186+
const canMint = mode !== 'USER_INPUT_OFTS';
187+
184188
return (
185189
<div className="min-h-screen bg-layerzero-black lz-grid-bg">
186190
{/* Hidden element to use chainChangedFlag and force re-render */}
@@ -350,10 +354,10 @@ function AppContent() {
350354
Solana
351355
</h4>
352356
<p className="text-layerzero-gray-500 text-sm">
353-
View your balance{mode !== 'USER_INPUT_OFTS' ? ' and mint OFT tokens' : ''} on Solana
357+
View your balance{canMint ? ' and mint OFT tokens' : ''} on Solana
354358
</p>
355359
</div>
356-
<SolanaMintCard storeAddressOverride={oftStoreAddress} canMint={mode !== 'USER_INPUT_OFTS'} />
360+
<SolanaMintCard storeAddressOverride={oftStoreAddress} canMint={canMint} />
357361
</div>
358362

359363
<div className="lz-card">
@@ -362,10 +366,10 @@ function AppContent() {
362366
{evmDisplayName}
363367
</h4>
364368
<p className="text-layerzero-gray-500 text-sm">
365-
View your balance{mode !== 'USER_INPUT_OFTS' ? ' and mint OFT tokens' : ''} on {evmDisplayName}
369+
View your balance{canMint ? ' and mint OFT tokens' : ''} on {evmDisplayName}
366370
</p>
367371
</div>
368-
<EvmMintCard networkName={evmDisplayName} isWrongNetwork={isWrongNetwork} canMint={mode !== 'USER_INPUT_OFTS'} oftAddressOverride={evmOftAddress} rpcUrl={selectedNetworkRpc || undefined} />
372+
<EvmMintCard networkName={evmDisplayName} isWrongNetwork={isWrongNetwork} canMint={canMint} oftAddressOverride={evmOftAddress} rpcUrl={selectedNetworkRpc || undefined} />
369373
</div>
370374
</div>
371375
</div>

vite/src/components/configure/Configure.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ type ConfigureSectionProps = {
2020
networkQuery: string;
2121
setNetworkQuery: Dispatch<SetStateAction<string>>;
2222
metadataNetworks: ConfigureNetworkOption[];
23-
selectedNetwork: ConfigureNetworkOption | null;
24-
setSelectedNetwork: (value: ConfigureNetworkOption | null) => void;
23+
selectedNetwork?: ConfigureNetworkOption;
24+
setSelectedNetwork: (value: ConfigureNetworkOption | undefined) => void;
2525
};
2626

2727
export function ConfigureSection(props: ConfigureSectionProps) {

vite/src/components/configure/NetworkSelector.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ export function NetworkSelector({
1313
networkQuery,
1414
setNetworkQuery,
1515
metadataNetworks,
16-
// selectedNetwork,
1716
setSelectedNetwork,
1817
}: {
1918
networkQuery: string;
2019
setNetworkQuery: Dispatch<SetStateAction<string>>;
2120
metadataNetworks: NetworkOption[];
22-
selectedNetwork: NetworkOption | null;
23-
setSelectedNetwork: (value: NetworkOption | null) => void;
21+
selectedNetwork?: NetworkOption;
22+
setSelectedNetwork: (value: NetworkOption | undefined) => void;
2423
}) {
2524
const [isNetworkInputFocused, setIsNetworkInputFocused] = useState(false);
2625
const filteredNetworks = useMemo(() => {

vite/src/components/mint/solana/SolanaMintCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export default function SolanaMintCard({ storeAddressOverride, canMint = true }:
9393
<div className="space-y-2">
9494
<button
9595
onClick={handleMint}
96-
disabled={isMinting || isMintTokenInstructionAvailable === false}
96+
disabled={isMinting || !isMintTokenInstructionAvailable }
9797
className="w-full lz-button disabled:opacity-50 disabled:cursor-not-allowed"
9898
>
9999
{isMinting

0 commit comments

Comments
 (0)