diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml deleted file mode 100644 index 6c5d00e5d..000000000 --- a/.trunk/trunk.yaml +++ /dev/null @@ -1,13 +0,0 @@ -version: 0.1 -cli: - version: 0.4.3-beta -lint: - enabled: - - actionlint@1.6.4 - - eslint@7.32.0 - - gitleaks@7.6.1 - - prettier@2.4.1 - ignore: - - linters: [gitleaks, prettier] - paths: - - src/store/consts/tokenLists/** diff --git a/src/components/AnimatedButton/AnimatedButton.tsx b/src/components/AnimatedButton/AnimatedButton.tsx index 44b00968e..db9b26f19 100644 --- a/src/components/AnimatedButton/AnimatedButton.tsx +++ b/src/components/AnimatedButton/AnimatedButton.tsx @@ -30,7 +30,7 @@ const AnimatedButton: React.FC = ({ className }) => { const classes = useStyles() - + console.log(disabled) const getMessage = () => { if (progress === 'none') { return

{content}

diff --git a/src/components/NewPosition/DepositSelector/DepositSelector.tsx b/src/components/NewPosition/DepositSelector/DepositSelector.tsx index f2fa575fa..4407f20a4 100644 --- a/src/components/NewPosition/DepositSelector/DepositSelector.tsx +++ b/src/components/NewPosition/DepositSelector/DepositSelector.tsx @@ -139,14 +139,17 @@ export const DepositSelector: React.FC = ({ if (tokenAIndex === tokenBIndex) { return 'Select different tokens' } + console.log(tokenAIndex, tokenBIndex, tokenAInputState.value, tokenBInputState.value, tokens) + console.log(poolIndex, canCreateNewPool) - if ( - (poolIndex === null && !canCreateNewPool) || - (poolIndex !== null && !canCreateNewPosition) - ) { + if (poolIndex !== null && !canCreateNewPosition) { return 'Insufficient lamports' } + if (poolIndex === null && !canCreateNewPool) { + return 'Create pool' + } + if ( !tokenAInputState.blocked && printBNtoBN(tokenAInputState.value, tokens[tokenAIndex].decimals).gt( @@ -398,7 +401,7 @@ export const DepositSelector: React.FC = ({ onAddLiquidity() } }} - disabled={getButtonMessage() !== 'Add Liquidity'} + disabled={getButtonMessage() !== 'Add Liquidity' && getButtonMessage() !== 'Create pool'} content={getButtonMessage()} progress={progress} />