Skip to content

Commit

Permalink
Merge branch 'TW-626-epic-nft-update' into TW-996-fix-epic-nft-update
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-tsx committed Oct 26, 2023
2 parents 2e423c2 + d84681c commit 13b320a
Show file tree
Hide file tree
Showing 327 changed files with 431 additions and 63 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"position": "before"
}
],
"groups": [["external", "builtin"], "internal", ["parent", "sibling", "index"]],
"groups": [["external", "builtin"], "internal", "parent", "sibling", "index"],
"alphabetize": {
"order": "asc",
"caseInsensitive": true
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@
"babel-plugin-transform-remove-console": "^6.9.4",
"deprecated-react-native-prop-types": "^2.3.0",
"dotenv": "^16.0.3",
"eslint": "^8.19.0",
"eslint-import-resolver-typescript": "^3.6.0",
"eslint-plugin-import": "^2.26.0",
"eslint": "^8.52.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jest": "^26.5.3",
"metro-react-native-babel-preset": "0.76.8",
"node-libs-react-native": "^1.2.1",
Expand Down
1 change: 1 addition & 0 deletions src/apis/kord-fi/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { tzktUrl } from 'src/utils/linking';
import { tzToMutez } from 'src/utils/tezos.util';

import { fallbackTezosToolkit } from '../youves/utils';

import { KordFiLendStats, KordFiStatsResponse, KordFiUserDepositsResponse } from './types';

const kordFiApi = axios.create({
Expand Down
2 changes: 0 additions & 2 deletions src/apis/objkt/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ import {
} from './types';
import { transformObjktCollectionItem } from './utils';

export { objktCurrencies } from './constants';

export const fetchCollections$ = (accountPkh: string): Observable<Collection[]> => {
const request = buildGetCollectionsQuery(accountPkh);

Expand Down
1 change: 1 addition & 0 deletions src/beacon/beacon-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import type { ExtendedP2PPairingResponse } from '@airgap/beacon-types';

import { EventFn } from '../config/general';
import { isDefined } from '../utils/is-defined';

import { BeaconStorage } from './storage';

const WALLET_CLIENT_ERROR = 'Wallet client not defined!';
Expand Down
1 change: 1 addition & 0 deletions src/beacon/use-beacon-handler.hook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { ModalsEnum } from '../navigator/enums/modals.enum';
import { useNavigation } from '../navigator/hooks/use-navigation.hook';
import { showErrorToast } from '../toast/toast.utils';
import { isDefined } from '../utils/is-defined';

import { BeaconHandler, isBeaconMessage } from './beacon-handler';

export const beaconDeepLinkHandler = async (
Expand Down
1 change: 1 addition & 0 deletions src/biometry/biometry-availability.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React, { FC, useState } from 'react';
import ReactNativeBiometrics, { BiometryType } from 'react-native-biometrics';

import { useAppStateStatus } from '../hooks/use-app-state-status.hook';

import { BiometryAvailabilityContext } from './biometry-availability.context';

const rnBiometrics = new ReactNativeBiometrics();
Expand Down
1 change: 1 addition & 0 deletions src/components/accept-ads-banner/accept-ads-banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { formatSize } from 'src/styles/format-size';
import { ButtonLargePrimary } from '../button/button-large/button-large-primary/button-large-primary';
import { ButtonLargeSecondary } from '../button/button-large/button-large-secondary/button-large-secondary';
import { Divider } from '../divider/divider';

import { AcceptAdsBannerSelectors } from './accept-ads-banner.selectors';
import { useCommonBannerStyles } from './common-banner.styles';

Expand Down
1 change: 1 addition & 0 deletions src/components/account-dropdown/account-dropdown-base.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { isDefined } from 'src/utils/is-defined';

import { BottomSheetActionButton } from '../bottom-sheet/bottom-sheet-action-button/bottom-sheet-action-button';
import { Dropdown, DropdownActionButtonsComponent, DropdownValueBaseProps } from '../dropdown/dropdown';

import { accountEqualityFn } from './account-equality-fn';

const ActionButtons: DropdownActionButtonsComponent = ({ onPress }) => {
Expand Down
1 change: 1 addition & 0 deletions src/components/account-dropdown/account-form-dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { AccountBaseInterface } from '../../interfaces/account.interface';
import { DropdownValueComponent } from '../dropdown/dropdown';
import { DropdownItemContainer } from '../dropdown/dropdown-item-container/dropdown-item-container';
import { IconNameEnum } from '../icon/icon-name.enum';

import { AccountDropdownItem, renderAccountListItem } from './account-dropdown-item/account-dropdown-item';
import { accountEqualityFn } from './account-equality-fn';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { SectionDropdownDataInterface } from '../../interfaces/section-dropdown-
import { DropdownValueComponent } from '../dropdown/dropdown';
import { DropdownItemContainer } from '../dropdown/dropdown-item-container/dropdown-item-container';
import { IconNameEnum } from '../icon/icon-name.enum';

import { AccountDropdownItem, renderAccountListItem } from './account-dropdown-item/account-dropdown-item';
import { accountEqualityFn } from './account-equality-fn';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { useSelectedAccountSelector, useVisibleAccountsListSelector } from 'src/

import { DropdownValueComponent, DropdownValueProps } from '../dropdown/dropdown';
import { IconNameEnum } from '../icon/icon-name.enum';

import { AccountDropdownBase } from './account-dropdown-base';
import { AccountDropdownItem, renderAccountListItem } from './account-dropdown-item/account-dropdown-item';
import { CurrentAccountDropdownStyles } from './current-account-dropdown.styles';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Text, View } from 'react-native';
import { NonZeroAmounts } from '../../../../interfaces/non-zero-amounts.interface';
import { conditionalStyle } from '../../../../utils/conditional-style';
import { formatAssetAmount } from '../../../../utils/number.util';

import { useActivityGroupAmountChangeStyles } from './activity-group-amount-change.styles';

interface Props {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { View } from 'react-native';
import { NonZeroAmounts } from '../../../../interfaces/non-zero-amounts.interface';
import { conditionalStyle } from '../../../../utils/conditional-style';
import { FormattedAmount } from '../../../formatted-amount';

import { useActivityGroupDollarAmountChangeStyles } from './activity-group-dollar-amount-change.styles';

interface Props {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { tzktUrl } from '../../../utils/linking';
import { Divider } from '../../divider/divider';
import { ExternalLinkButton } from '../../icon/external-link-button/external-link-button';
import { PublicKeyHashText } from '../../public-key-hash-text/public-key-hash-text';

import { ActivityGroupAmountChange } from './activity-group-amount-change/activity-group-amount-change';
import { ActivityGroupDollarAmountChange } from './activity-group-dollar-amount-change/activity-group-dollar-amount-change';
import { useActivityGroupItemStyles } from './activity-group-item.styles';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ActivityGroup } from '../../../../interfaces/activity.interface';
import { formatSize } from '../../../../styles/format-size';
import { Divider } from '../../../divider/divider';
import { Icon } from '../../../icon/icon';

import { useActivityGroupTypeStyles } from './activity-group-type.styles';
import { useActivityGroupInfo } from './use-activity-group-info.hook';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Text, View } from 'react-native';

import { ActivityStatusEnum } from '../../../../enums/activity-status.enum';
import { useColors } from '../../../../styles/use-colors';

import { useActivityStatusBadgeStyles } from './activity-status-badge.styles';

interface Props {
Expand Down
1 change: 1 addition & 0 deletions src/components/address-input/address-input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { ButtonSmallSecondary } from '../button/button-small/button-small-second
import { StyledTextInput } from '../styled-text-input/styled-text-input';
import { StyledTextInputProps } from '../styled-text-input/styled-text-input.props';
import { StyledTextInputStyles } from '../styled-text-input/styled-text-input.styles';

import { AddressInputStyles } from './address-input.styles';

interface Props
Expand Down
1 change: 1 addition & 0 deletions src/components/asset-amount-input/asset-amount-input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { TextSegmentControl } from '../segmented-control/text-segment-control/te
import { TokenDropdownItem } from '../token-dropdown/token-dropdown-item/token-dropdown-item';
import { tokenEqualityFn } from '../token-dropdown/token-equality-fn';
import { TouchableWithAnalytics } from '../touchable-with-analytics';

import { AssetAmountInputProps, AssetAmountInputStylesConfig } from './asset-amount-input.props';
import { useAssetAmountInputStyles } from './asset-amount-input.styles';
import { dollarToTokenAmount, tokenToDollarAmount } from './asset-amount-input.utils';
Expand Down
1 change: 1 addition & 0 deletions src/components/asset-equity-text/asset-equity-text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useCurrentFiatCurrencyMetadataSelector } from '../../store/settings/set
import { TokenMetadataInterface } from '../../token/interfaces/token-metadata.interface';
import { isDefined } from '../../utils/is-defined';
import { formatAssetAmount } from '../../utils/number.util';

import { useAssetEquityTextStyles } from './asset-equity-text.styles';

interface Props {
Expand Down
1 change: 1 addition & 0 deletions src/components/attention-message/attention-message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { isDefined } from '../../utils/is-defined';
import { Divider } from '../divider/divider';
import { Icon } from '../icon/icon';
import { IconNameEnum } from '../icon/icon-name.enum';

import { useAttentionMessageStyles } from './attention-message.styles';

interface Props {
Expand Down
1 change: 1 addition & 0 deletions src/components/avatar-image/avatar-image.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { FC } from 'react';
import FastImage from 'react-native-fast-image';

import { formatSize } from '../../styles/format-size';

import { useAvatarImageStyles } from './avatar-image.styles';

interface Props {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { conditionalStyle } from 'src/utils/conditional-style';
import { setTestID } from 'src/utils/test-id.utils';

import { TouchableOpacityComponentProps, TouchableWithAnalytics } from '../../touchable-with-analytics';

import { useBottomSheetActionButtonStyles } from './bottom-sheet-action-button.styles';

interface Props extends Pick<TouchableOpacityComponentProps, 'style' | 'onPress' | 'disabled'>, TestIdProps {
Expand Down
1 change: 1 addition & 0 deletions src/components/bottom-sheet/bottom-sheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { emptyComponent, emptyFn, EmptyFn } from '../../config/general';
import { useAppLock } from '../../shelter/app-lock/app-lock';
import { formatSize } from '../../styles/format-size';
import { isDefined } from '../../utils/is-defined';

import { useDropdownBottomSheetStyles } from './bottom-sheet.styles';
import { BottomSheetControllerProps } from './use-bottom-sheet-controller';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { FC } from 'react';

import { Button } from '../../button';
import { ButtonLargeProps } from '../button-large.props';

import { useButtonDelegatePrimaryStyleConfig } from './button-delegate-primary.styles';

export const ButtonDelegatePrimary: FC<ButtonLargeProps> = props => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { StyleProp, ViewStyle, TextStyle } from 'react-native';

import { Button } from '../../button';
import { ButtonLargeProps } from '../button-large.props';

import { useButtonLargePrimaryStyleConfig } from './button-large-primary.styles';

interface Props extends ButtonLargeProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { StyleProp, ViewStyle, TextStyle } from 'react-native';
import { Button } from '../../button';
import { ButtonStyleConfig } from '../../button-style.config';
import { ButtonLargeProps } from '../button-large.props';

import { useButtonLargeSecondaryStyleConfig } from './button-large-secondary.styles';

interface Props extends ButtonLargeProps {
Expand Down
1 change: 1 addition & 0 deletions src/components/button/button-link/button-link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { FC } from 'react';

import { Button } from '../button';
import { ButtonSharedProps } from '../button-shared.props';

import { useButtonLinkStyles } from './button-link.styles';

interface Props extends Omit<ButtonSharedProps, 'iconName'> {
Expand Down
1 change: 1 addition & 0 deletions src/components/button/button-medium/button-medium.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { IconNameEnum } from '../../icon/icon-name.enum';
import { Button } from '../button';
import { ButtonSharedProps } from '../button-shared.props';
import { ButtonStyleConfig } from '../button-style.config';

import { useButtonMediumStyleConfig } from './button-medium.styles';

interface Props extends ButtonSharedProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { FC } from 'react';

import { Button } from '../../button';
import { ButtonSmallProps } from '../button-small.props';

import { useButtonSmallDelegateStyles } from './button-small-delegate.styles';

export const ButtonSmallDelegate: FC<ButtonSmallProps> = props => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { FC } from 'react';

import { Button } from '../../button';
import { ButtonSmallProps } from '../button-small.props';

import { useButtonSmallSecondaryStyles } from './button-small-secondary.styles';

export const ButtonSmallSecondary: FC<ButtonSmallProps> = props => {
Expand Down
1 change: 1 addition & 0 deletions src/components/button/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { isDefined } from 'src/utils/is-defined';
import { setTestID } from 'src/utils/test-id.utils';

import { Icon } from '../icon/icon';

import { ButtonSharedProps } from './button-shared.props';
import { ButtonStyleConfig } from './button-style.config';
import { ButtonStyles } from './button.styles';
Expand Down
1 change: 1 addition & 0 deletions src/components/checkbox-icon/checkbox-icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { EmptyFn } from '../../config/general';
import { formatSize } from '../../styles/format-size';
import { Icon } from '../icon/icon';
import { IconNameEnum } from '../icon/icon-name.enum';

import { useCheckboxIconStyles } from './checkbox-icon.styles';

interface Props {
Expand Down
1 change: 1 addition & 0 deletions src/components/collectible-image/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { isImgUriDataUri } from 'src/utils/image.utils';
import { ActivityIndicator } from '../activity-indicator';
import { AnimatedSvg } from '../animated-svg';
import { BrokenImage } from '../broken-image';

import { useCollectibleImageStyles } from './styles';
import { useCollectibleImagesStack } from './use-images-stack';

Expand Down
1 change: 1 addition & 0 deletions src/components/data-placeholder/data-placeholder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Text, View } from 'react-native';
import { formatSize } from '../../styles/format-size';
import { Icon } from '../icon/icon';
import { IconNameEnum } from '../icon/icon-name.enum';

import { useDataPlaceholderStyles } from './data-placeholder.styles';

interface Props {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { View } from 'react-native';
import { TokenInterface } from '../../../../token/interfaces/token.interface';
import { getTokenSlug } from '../../../../token/utils/token.utils';
import { useApyStyles } from '../../../token-screen-content-container/apy.styles';

import { useDelegateTagContainerStyles } from './delegate-tag-container.styles';

interface DelegateTagContainerProps {
Expand Down
1 change: 1 addition & 0 deletions src/components/delegate-tag/delegate-tag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { TokenInterface } from '../../token/interfaces/token.interface';
import { getTokenSlug } from '../../token/utils/token.utils';
import { getDelegateText } from '../../utils/get-delegate-text.util';
import { isDefined } from '../../utils/is-defined';

import { DelegateTagContainer } from './components/delegate-tag-container/delegate-tag-container';
import { useDelegateTagStyles } from './delegate-tag.styles';

Expand Down
1 change: 1 addition & 0 deletions src/components/disclaimer/disclaimer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Text } from 'react-native';
import { isDefined } from '../../utils/is-defined';
import { AttentionMessage } from '../attention-message/attention-message';
import { IconNameEnum } from '../icon/icon-name.enum';

import { useDisclaimerStyles } from './disclaimer.styles';

interface Props {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { FC } from 'react';
import { StyleProp, View, ViewStyle } from 'react-native';

import { conditionalStyle } from '../../../utils/conditional-style';

import { useDropdownItemContainerStyles } from './dropdown-item-container.styles';

interface Props {
Expand Down
1 change: 1 addition & 0 deletions src/components/dropdown/dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { useBottomSheetController } from '../bottom-sheet/use-bottom-sheet-contr
import { DataPlaceholder } from '../data-placeholder/data-placeholder';
import { SearchInput } from '../search-input/search-input';
import { TouchableWithAnalytics } from '../touchable-with-analytics';

import { DropdownItemContainer } from './dropdown-item-container/dropdown-item-container';
import { DropdownSelectors } from './selectors';
import { useDropdownStyles } from './styles';
Expand Down
1 change: 1 addition & 0 deletions src/components/dropdown/section-dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { useBottomSheetController } from '../bottom-sheet/use-bottom-sheet-contr
import { DataPlaceholder } from '../data-placeholder/data-placeholder';
import { SearchInput } from '../search-input/search-input';
import { TouchableWithAnalytics } from '../touchable-with-analytics';

import { DropdownItemContainer } from './dropdown-item-container/dropdown-item-container';
import { useDropdownStyles } from './styles';

Expand Down
1 change: 1 addition & 0 deletions src/components/earn-opportunity-item/stats-item/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { FormattedAmountWithLoader } from 'src/components/formatted-amount-with-
import { useCurrentFiatCurrencyMetadataSelector } from 'src/store/settings/settings-selectors';

import { AssetAmounts } from '../use-amounts';

import { useStatsItemStyles } from './styles';

interface Props {
Expand Down
1 change: 1 addition & 0 deletions src/components/earn-opportunity-tokens/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { TokenInterface } from 'src/token/interfaces/token.interface';
import { conditionalStyle } from 'src/utils/conditional-style';

import { TruncatedText } from '../truncated-text';

import { useEarnOpportunityTokensStyles } from './styles';

interface Props {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { isDefined } from '../../utils/is-defined';
import { Divider } from '../divider/divider';
import { Icon } from '../icon/icon';
import { IconNameEnum } from '../icon/icon-name.enum';

import { useErrorDisclaimerMessageStyles } from './error-disclaimer-message.styles';

interface Props {
Expand Down
1 change: 1 addition & 0 deletions src/components/fields/abstract-field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { formatSize } from 'src/styles/format-size';

import { CheckboxLabel } from '../checkbox-description/checkbox-label';
import { Divider } from '../divider/divider';

import { useAbstractFieldStyles } from './abstract-field.styles';
import { FieldProps } from './field.props';

Expand Down
1 change: 1 addition & 0 deletions src/components/file-input/file-input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { isString } from '../../utils/is-string';
import { ButtonLargePrimary } from '../button/button-large/button-large-primary/button-large-primary';
import { IconNameEnum } from '../icon/icon-name.enum';
import { TouchableIcon } from '../icon/touchable-icon/touchable-icon';

import { useFileInputStyles } from './file-input.styles';

export interface FileInputValue {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { useButtonMediumStyleConfig } from '../button/button-medium/button-mediu
import { ButtonsContainer } from '../button/buttons-container/buttons-container';
import { Divider } from '../divider/divider';
import { IconNameEnum } from '../icon/icon-name.enum';

import { useHeaderCardActionButtonsStyles } from './header-card-action-buttons.styles';

interface Props {
Expand Down
1 change: 1 addition & 0 deletions src/components/header-card/header-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { FC } from 'react';
import { LayoutChangeEvent, StyleProp, View, ViewStyle } from 'react-native';

import { InsetSubstitute } from '../inset-substitute/inset-substitute';

import { useHeaderCardStyles } from './header-card.styles';

interface Props {
Expand Down
1 change: 1 addition & 0 deletions src/components/header/exolix-screen-options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React, { FC, useMemo } from 'react';
import { useNavigation } from '../../navigator/hooks/use-navigation.hook';
import { useExolixStep } from '../../store/exolix/exolix-selectors';
import { IconNameEnum } from '../icon/icon-name.enum';

import { HeaderButton } from './header-button/header-button';
import { HeaderProgress } from './header-progress/header-progress';
import { HeaderTitle } from './header-title/header-title';
Expand Down
Loading

0 comments on commit 13b320a

Please sign in to comment.