Skip to content

Commit

Permalink
Merge branch 'release-ghostnet-beta' into 410-further-split-out-batch…
Browse files Browse the repository at this point in the history
…er-and-mm-contracts-to-avoid-size-constraint
  • Loading branch information
glottologist committed Nov 26, 2023
2 parents 44f13f8 + ca19585 commit 76d13bd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions batcher-ui/src/components/batcher/Exchange.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ const Exchange = () => {

console.info('SWAP PARAMS', swap_params);


if (selectedToken.standard === 'FA1.2 token') {
if (!swap.from.address) {
dispatch(
Expand Down
2 changes: 2 additions & 0 deletions batcher-ui/src/components/batcher/SelectPair.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,11 @@ const SelectPair = ({ isFrom }: SelectPairProps) => {
return ds;
});


setAvailableSwapPairs(swapPairs);
}, [dispatch, swaps, displayTokens]);


const displayValue = useCallback(() => {
if (isReverse && isFrom) return swap.to?.name;
if (isReverse && !isFrom) return swap.from?.name;
Expand Down
1 change: 1 addition & 0 deletions batcher-ui/src/utils/token-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const getSwapFromBigmap = (
`${process.env.NEXT_PUBLIC_TZKT_API_URI}/v1/bigmaps/${bigMapId}/keys/${swapName}`
).then(checkStatus);


// FIXME =- This is the only way I could ge tthe string comparisons to work the same way as they do in the contract ¯\_(ツ)_/¯
const alignWithLigoLexicographicalSorting = (to: string, from: string) => {
const startsWithTzTo = to.startsWith('tz');
Expand Down

0 comments on commit 76d13bd

Please sign in to comment.