Skip to content

Commit 94354f5

Browse files
authored
Minor UX tweaks + allowing the bridge form to work even if user has no bridgable assets (#224)
1 parent 6089788 commit 94354f5

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

renderer/components/BridgeAssetsForm/BridgeAssetsForm.tsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,14 @@ function BridgeAssetsFormContent({
7777
}, [accountsData]);
7878

7979
const defaultFromAccount = accountOptions[0]?.value;
80-
const defaultAssetId = accountsData[0]?.balances.iron.asset.id;
80+
const defaultAssetId =
81+
accountsData[0]?.balances.iron.asset.id ||
82+
Object.values(chainportTokensMap)[0]?.ironfishId;
8183
const defaultDestinationNetwork =
8284
chainportTokensMap[defaultAssetId]?.targetNetworks[0].value.toString();
8385

8486
if (!defaultDestinationNetwork) {
85-
throw new Error("No default destination network found");
87+
console.error("No default destination network found.");
8688
}
8789

8890
const {
@@ -144,7 +146,7 @@ function BridgeAssetsFormContent({
144146
const isBridgableForNetwork = chainportTokensMap[
145147
item.asset.id
146148
]?.targetNetworks.some(
147-
(network) => network.chainId === currentNetwork.chainId,
149+
(network) => network.chainId === currentNetwork?.chainId,
148150
);
149151
return {
150152
...item,
@@ -171,7 +173,7 @@ function BridgeAssetsFormContent({
171173
const availableNetworks = chainportTokensMap[assetIdValue]?.targetNetworks;
172174

173175
if (!availableNetworks) {
174-
throw new Error("No available networks found");
176+
console.error("No available networks found");
175177
}
176178

177179
const selectedAsset = assetOptionsMap.get(assetIdValue);
@@ -335,11 +337,11 @@ function BridgeAssetsFormContent({
335337
{...register("destinationNetwork")}
336338
value={destinationNetworkValue}
337339
label={formatMessage(messages.destinationNetwork)}
338-
options={availableNetworks}
340+
options={availableNetworks ?? []}
339341
renderChildren={(children) => (
340342
<HStack>
341343
<ChakraImage
342-
src={currentNetwork.networkIcon}
344+
src={currentNetwork?.networkIcon}
343345
boxSize="24px"
344346
/>
345347
{children}

renderer/components/BridgeAssetsForm/BridgeConfirmationModal/StepIdle.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ export function StepIdle({
162162
display="flex"
163163
alignItems="center"
164164
justifyContent="center"
165+
mx={8}
165166
>
166167
<Flex
167168
bg="#F3DEF5"

renderer/components/BridgeTransactionInformation/BridgeTransactionInformation.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ export function BridgeTransactionInformation({ transaction, ...rest }: Props) {
6767
?.explorer_url;
6868

6969
return {
70-
href: baseUrl + "tx/" + chainportStatus.target_tx_hash,
70+
href: baseUrl
71+
? baseUrl + "tx/" + chainportStatus.target_tx_hash
72+
: undefined,
7173
txHash: chainportStatus.target_tx_hash,
7274
};
7375
}, [chainportMeta, chainportStatus]);

renderer/components/BridgeTransactionInformation/BridgeTransactionInformationShell.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ export function BridgeTransactionInformationShell({
6868
}: Props) {
6969
const { formatMessage } = useIntl();
7070
const isSend = type === "send";
71+
7172
return (
7273
<Box {...rest}>
7374
<Heading as="h3" fontSize="2xl" mb={8}>

0 commit comments

Comments
 (0)