Merge remote-tracking branch 'origin/development' into TW-874-add-but…

…ton-text-to-nft-into-dapps
madfish-solutions · Aug 9, 2023 · e3024ac · e3024ac
2 parents 63232a5 + 0ae4c0b
commit e3024ac
Show file tree

Hide file tree

Showing 30 changed files with 11 additions and 1,011 deletions.
diff --git a/src/apis/liquidity-baking/index.ts b/src/apis/liquidity-baking/index.ts
@@ -4,7 +4,7 @@ import { BigNumber } from 'bignumber.js';
 import { ZERO } from 'src/config/swap';
 import { FarmPoolTypeEnum } from 'src/enums/farm-pool-type.enum';
 import { FarmTokenStandardEnum } from 'src/enums/farm-token-standard.enum';
-import { LiquidityBakingStorage } from 'src/op-params/liquidity-baking/liquidity-baking-storage.interface';
+import { LiquidityBakingStorage } from 'src/op-params/liquidity-baking-storage.interface';
 import { LIQUIDITY_BAKING_DEX_ADDRESS, SIRS_TOKEN } from 'src/token/data/token-slugs';
 import { SIRS_TOKEN_METADATA, TEZ_TOKEN_METADATA, TZBTC_TOKEN_METADATA } from 'src/token/data/tokens-metadata';
 import { TokenMetadataInterface, TokenStandardsEnum } from 'src/token/interfaces/token-metadata.interface';

diff --git a/src/components/button/button-large/button-large-white/button-large-white.styles.ts b/src/components/button/button-large/button-large-white/button-large-white.styles.ts
diff --git a/src/components/button/button-large/button-large-white/button-large-white.tsx b/src/components/button/button-large/button-large-white/button-large-white.tsx
diff --git a/src/components/icon/lp-token-icon/lp-token-icon.styles.ts b/src/components/icon/lp-token-icon/lp-token-icon.styles.ts
diff --git a/src/components/icon/lp-token-icon/lp-token-icon.tsx b/src/components/icon/lp-token-icon/lp-token-icon.tsx
diff --git a/src/config/styles.ts b/src/config/styles.ts
@@ -6,7 +6,6 @@ const maxLayoutScale = 1.1;
 export const layoutScale = clamp(Dimensions.get('screen').width / basicScreenWidth, maxLayoutScale);
 
 export const greyLight200 = '#E5E5EA';
-export const greyLight400 = '#F4F4F4';
 export const black = '#000000';
 export const orangeLight200 = '#FF3D00';
 export const white = '#FFFFFF';

diff --git a/src/hooks/use-sirs-info.hook.ts b/src/hooks/use-sirs-info.hook.ts
diff --git a/src/interfaces/fa-1-2-token.interface.ts b/src/interfaces/fa-1-2-token.interface.ts
diff --git a/src/modals/add-liquidity-modal/add-liquidity-modal.form.ts b/src/modals/add-liquidity-modal/add-liquidity-modal.form.ts
diff --git a/src/modals/add-liquidity-modal/add-liquidity-modal.selectors.ts b/src/modals/add-liquidity-modal/add-liquidity-modal.selectors.ts
diff --git a/src/modals/add-liquidity-modal/add-liquidity-modal.styles.ts b/src/modals/add-liquidity-modal/add-liquidity-modal.styles.ts
diff --git a/src/modals/add-liquidity-modal/add-liquidity-modal.tsx b/src/modals/add-liquidity-modal/add-liquidity-modal.tsx
diff --git a/src/modals/remove-liquidity-modal/remove-liquidity-modal.form.ts b/src/modals/remove-liquidity-modal/remove-liquidity-modal.form.ts
diff --git a/src/modals/remove-liquidity-modal/remove-liquidity-modal.selectors.ts b/src/modals/remove-liquidity-modal/remove-liquidity-modal.selectors.ts