Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore-mobile: use mobile path aliases #5922

Merged
merged 14 commits into from Feb 24, 2023
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/mobile/App.svelte
Expand Up @@ -14,8 +14,8 @@
shouldBeDarkMode,
} from '@core/app'
import { onboardingProfile } from '@contexts/onboarding'
import { ToastContainer } from './components'
import { isKeyboardOpen, keyboardHeight } from './lib/auxiliary/keyboard'
import { ToastContainer } from '@components'
import { isKeyboardOpen, keyboardHeight } from '@/auxiliary/keyboard'
import {
appRoute,
AppRoute,
Expand All @@ -25,8 +25,8 @@
initialiseRouters,
resetRouterForAppContext,
resetRouters,
} from './lib/routers'
import { DashboardView, LoginRouter, OnboardingRouter } from './views'
} from '@/routers'
import { DashboardView, LoginRouter, OnboardingRouter } from '@views'

appStage.set(AppStage[process.env.STAGE.toUpperCase()] ?? AppStage.ALPHA)

Expand Down
6 changes: 3 additions & 3 deletions packages/mobile/components/ActivityList.svelte
@@ -1,9 +1,9 @@
<script lang="ts">
import { activityFilter, queriedActivities } from '@core/wallet/stores'
import VirtualList from '@sveltejs/svelte-virtual-list'
import { FontWeight, Text } from 'shared/components'
import { ActivityTile, Filter, SearchInput } from '../../mobile/components'
import { FilterType } from '../lib/routers/routers/dashboard'
import { FontWeight, Text } from '@ui'
import { ActivityTile, Filter, SearchInput } from '@components'
import { FilterType } from '@/routers/routers/dashboard'
import { time } from '@core/app'
import { getGroupSeparator, localize } from '@core/i18n'
import { getMonthYear } from '@core/utils'
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/components/ActivityTile.svelte
Expand Up @@ -7,8 +7,8 @@
NftActivityTileContent,
TimelockActivityTileFooter,
TransactionActivityTileContent,
} from 'shared/components'
import { AsyncActivityTileFooter } from '../components'
} from '@ui'
import { AsyncActivityTileFooter } from '@components'

export let activity: Activity
export let onClick: () => unknown = () => {}
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/components/AssetList.svelte
Expand Up @@ -5,8 +5,8 @@
import { isVisibleAsset } from '@core/wallet/utils/isVisibleAsset'
import VirtualList from '@sveltejs/svelte-virtual-list'
import { AssetTile, Text } from '@ui'
import { Filter, SearchInput } from '../components'
import { FilterType } from '../lib/routers/routers'
import { Filter, SearchInput } from '@components'
import { FilterType } from '@/routers/routers/dashboard'

export let assets: IAccountAssets
export let onAssetTileClick: (asset: IAsset) => unknown = () => {}
Expand Down
12 changes: 2 additions & 10 deletions packages/mobile/components/AsyncActivityTileFooter.svelte
@@ -1,18 +1,10 @@
<script lang="ts">
import features from '@features/features'
import { ActivityAsyncStatus, ActivityDirection, getTimeDifference, Activity } from '@core/wallet'
import {
ActivityAsyncStatusPill,
TooltipIcon,
Text,
Button,
TileFooter,
FontWeight,
ButtonSize,
} from 'shared/components'
import { ActivityAsyncStatusPill, TooltipIcon, Text, Button, TileFooter, FontWeight, ButtonSize } from '@ui'
import { time } from '@core/app'
import { Icon as IconEnum } from '@lib/auxiliary/icon'
import { Position } from 'shared/components/enums'
import { Position } from '@ui/enums'
import { localize } from '@core/i18n'

export let onClaim: () => unknown = () => {}
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/ColorPicker.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { AccountColors } from '@core/account'
import { localize } from '@core/i18n'
import { Icon, Text } from 'shared/components'
import { Icon, Text } from '@ui'
import { isBright } from '@core/utils'

export let active: string
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/Confirmation.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { localize } from '@core/i18n'
import { Button, ButtonVariant, Text, TextHint } from 'shared/components'
import { Button, ButtonVariant, Text, TextHint } from '@ui'

export let description: string = ''
export let hint: string = ''
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/components/Drawer.svelte
@@ -1,8 +1,8 @@
<script lang="ts">
import { Icon as IconEnum } from '@lib/auxiliary/icon'
import { Icon, Text, TextType } from 'shared/components'
import { Icon, Text, TextType } from '@ui'
import { fade, fly } from 'svelte/transition'
import { DRAWER_IN_ANIMATION_DURATION_MS, DRAWER_OUT_ANIMATION_DURATION_MS } from '../lib/contexts/dashboard'
import { DRAWER_IN_ANIMATION_DURATION_MS, DRAWER_OUT_ANIMATION_DURATION_MS } from '@/contexts/dashboard'

export let onClose: () => unknown = () => {}
export let onBackClick: () => unknown = () => {}
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/ExpirationTimePicker.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { formatDate, localize } from '@core/i18n'
import { Icon, Text } from 'shared/components'
import { Icon, Text } from '@ui'

export let value: Date = undefined
export let disabled: boolean = false
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/NodeListTable.svelte
Expand Up @@ -2,7 +2,7 @@
import { localize } from '@core/i18n'
import { getOfficialNodes, INode, isOfficialNetwork } from '@core/network'
import { activeProfile } from '@core/profile'
import { Pill, Text } from 'shared/components'
import { Pill, Text } from '@ui'

export let onNodeClick: (node: INode) => void

Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/components/OnboardingLayout.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { Animation, Icon, Text, TextType } from 'shared/components'
import { isKeyboardOpen, keyboardHeight } from '../lib/auxiliary/keyboard'
import { Animation, Icon, Text, TextType } from '@ui'
import { isKeyboardOpen, keyboardHeight } from '@/auxiliary/keyboard'

export let allowBack = true
export let animation = ''
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/QRScanner.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { Icon } from '@ui'
import { showCameraScanner, stopScanner } from '../lib/auxiliary/scanner'
import { showCameraScanner, stopScanner } from '@/auxiliary/scanner'
</script>

{#if $showCameraScanner}
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/StrongholdUnlock.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { localize } from '@core/i18n'
import { unlockStronghold } from '@core/profile'
import { Button, HTMLButtonType, PasswordInput, Text, TextType } from 'shared/components'
import { Button, HTMLButtonType, PasswordInput, Text, TextType } from '@ui'

export let busyMessage: string = ''

Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/components/ToastContainer.svelte
@@ -1,8 +1,8 @@
<script lang="ts">
import { Alert, Toast } from 'shared/components'
import { Alert, Toast } from '@ui'
import { notifications } from '@auxiliary/notification/stores'
import { fade } from 'svelte/transition'
import { Swiper } from '../components'
import { Swiper } from '@components'

$: toasts = $notifications.map((notification) => ({
type: notification.type,
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/TokenWithMax.svelte
Expand Up @@ -2,7 +2,7 @@
import { localize } from '@core/i18n'
import { truncateString } from '@core/utils'
import { formatTokenAmountBestMatch, IAsset } from '@core/wallet'
import { AssetIcon, Button, ButtonSize, FontWeight, Text, TextType } from 'shared/components'
import { AssetIcon, Button, ButtonSize, FontWeight, Text, TextType } from '@ui'

export let asset: IAsset
export let onMaxClick: () => unknown
Expand Down
@@ -1,6 +1,6 @@
<script lang="ts">
import { MeatballMenuButton } from 'shared/components'
import { DashboardRoute, dashboardRouter } from '../../lib/routers'
import { MeatballMenuButton } from '@ui'
import { DashboardRoute, dashboardRouter } from '@/routers'
</script>

<MeatballMenuButton
Expand Down
@@ -1,9 +1,9 @@
<script lang="ts">
import { Icon as IconEnum } from '@auxiliary/icon'
import { selectedAccount } from '@core/account'
import { Icon } from 'shared/components'
import { AccountLabel } from 'shared/components/atoms/'
import { DashboardRoute, dashboardRoute, dashboardRouter } from '../../lib/routers'
import { Icon } from '@ui'
import { AccountLabel } from '@ui/atoms/'
import { DashboardRoute, dashboardRoute, dashboardRouter } from '@/routers'

$: isDrawerOpen = $dashboardRoute === DashboardRoute.AccountSwitcher
</script>
Expand Down
@@ -1,7 +1,7 @@
<script lang="ts">
import { activeProfile } from '@core/profile'
import { getInitials } from '@core/utils'
import { DashboardRoute, dashboardRouter } from '../../lib/routers'
import { DashboardRoute, dashboardRouter } from '@/routers'

// @TODO fix the linting error that profileInitial isn't used
/* eslint-disable @typescript-eslint/no-unused-vars */
Expand Down
Expand Up @@ -8,7 +8,7 @@
nodeInfo,
} from '@core/network'
import { Icon as IconTypes } from '@lib/auxiliary/icon'
import { ProfileActionButton } from '../../components/'
import { ProfileActionButton } from '@components'

export let onClick: () => unknown

Expand Down
@@ -1,6 +1,6 @@
<script lang="ts">
import { Icon as IconEnum } from '@lib/auxiliary/icon'
import { FontWeight, Icon, Text, TextType } from 'shared/components'
import { FontWeight, Icon, Text, TextType } from '@ui'

export let primaryText: string = ''
export let secondaryText: string = ''
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/buttons/ProfileButton.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { appSettings } from '@core/app'
import { Icon, NetworkIcon, Text, FontWeight, TextType } from 'shared/components'
import { Icon, NetworkIcon, Text, FontWeight, TextType } from '@ui'
import { getInitials as _getInitials } from '@core/utils'
import { NetworkProtocol, NetworkType } from '@core/network'

Expand Down
Expand Up @@ -2,7 +2,7 @@
import { localize } from '@core/i18n'
import { activeProfile } from '@core/profile'
import { Icon as IconEnum } from '@lib/auxiliary/icon'
import { FontWeight, Icon, Text, TextType, Toggle } from 'shared/components'
import { FontWeight, Icon, Text, TextType, Toggle } from '@ui'

const { isStrongholdLocked } = $activeProfile

Expand Down
6 changes: 3 additions & 3 deletions packages/mobile/components/filters/Filter.svelte
@@ -1,8 +1,8 @@
<script lang="ts">
import { TogglableButton } from 'shared/components'
import { DashboardRoute, dashboardRoute, filterRouter, FilterType } from '../../lib/routers'
import { TogglableButton } from '@ui'
import { DashboardRoute, dashboardRoute, filterRouter, FilterType } from '@/routers'
import type { Filter } from '@core/utils/types'
import { selectedFilter } from '../../lib/contexts/dashboard'
import { selectedFilter } from '@/contexts/dashboard'
import { activeProfileId } from '@core/profile'

export let filterStoreValue: Filter
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/inputs/SearchInput.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
import { Icon } from 'shared/components'
import { Icon } from '@ui'
import { localize } from '@core/i18n'
import { debounce } from '@core/utils'
import { Icon as IconEnum } from '@lib/auxiliary/icon'
Expand Down
@@ -1,5 +1,5 @@
<script lang="ts">
import { Text, FontWeight, TextType } from 'shared/components'
import { Text, FontWeight, TextType } from '@ui'
import { formatTokenAmountBestMatch, IAsset } from '@core/wallet'
import { formatCurrency, localize } from '@core/i18n'
import { getMarketAmountFromAssetValue } from '@core/market/utils'
Expand Down
@@ -1,5 +1,5 @@
<script lang="ts">
import { ShimmerClaimingAccountTile } from 'shared/components'
import { ShimmerClaimingAccountTile } from '@ui'
import { IShimmerClaimingAccount } from '@contexts/onboarding'

export let shimmerClaimingAccounts: IShimmerClaimingAccount[]
Expand Down
@@ -1,6 +1,6 @@
<script lang="ts">
import { Text, TextType } from 'shared/components'
import { AccountLabel } from 'shared/components/atoms'
import { Text, TextType } from '@ui'
import { AccountLabel } from '@ui/atoms'
import { IAccountState, selectedAccount, setSelectedAccount } from '@core/account'
import { BASE_TOKEN } from '@core/network'
import { activeProfile } from '@core/profile'
Expand Down
@@ -1,4 +1,4 @@
import { ActivityTab, TokensTab } from '../../../../views/dashboard/tabs'
import { ActivityTab, TokensTab } from '@views/dashboard/tabs'
import { DashboardTab } from '../enums'

export const DASHBOARD_TAB_COMPONENT = {
Expand Down
@@ -1,6 +1,6 @@
import { DISCORD_URL, DOCUMENTATION_URL, FAQ_URL, ISSUE_REPORT_URL } from '@contexts/settings'
import { SETTINGS_ICON_SVG } from '@lib/auxiliary/icon'
import features from '../../../../features/features'
import features from '@features/features'
import {
AppLockView,
ChangePasswordView,
Expand All @@ -15,8 +15,8 @@ import {
NetworkConfigurationRouter,
ThemeView,
WalletFinderView,
} from '../../../../views/dashboard/drawers/profile/views/settings'
import { SettingsRoute } from '../../../routers'
} from '@views/dashboard/drawers/profile/views/settings'
import { SettingsRoute } from '@/routers'
import { SettingsCategory } from '../enums'

const { general, security, advanced, helpAndInfo } = features.settings
Expand Down
Expand Up @@ -2,7 +2,7 @@ import { get, writable, Writable } from 'svelte/store'

import { Subrouter } from '@core/router'

import { AccountAction } from '../../../../lib/contexts/dashboard'
import { AccountAction } from '@/contexts/dashboard'
import { AccountActionsRoute } from '../../enums'
import { IAccountActionsRouterEvent } from '../../interfaces'
import { dashboardRouter } from '../dashboard-router'
Expand Down
Expand Up @@ -3,7 +3,7 @@ import { get, writable } from 'svelte/store'
import { Subrouter } from '@core/router'
import { ActivityType, claimActivity, getAssetById, NotVerifiedStatus, rejectActivity } from '@core/wallet'

import { ActivityAction, selectedActivity } from '../../../../lib/contexts/dashboard'
import { ActivityAction, selectedActivity } from '@/contexts/dashboard'
import { ActivityRoute } from '../../enums'
import { IActivityRouterEvent } from '../../interfaces'
import { dashboardRouter, tokenRouter } from '../../routers'
Expand Down
Expand Up @@ -8,8 +8,8 @@ import { dashboardRouter } from '../'
import { FilterRoute } from '../../enums'
import { IFilterRouterEvent } from '../../interfaces'
import { resetRouterWithDrawerDelay } from '../../utils'
import { selectedFilter } from '../../../contexts/dashboard/stores'
import { FilterAction } from '../../../contexts/dashboard/enums'
import { selectedFilter } from '@/contexts/dashboard/stores'
import { FilterAction } from '@/contexts/dashboard/enums'
import { Filter } from '@core/utils/types'

import { activityFilter, assetFilter } from '@core/wallet/stores'
Expand Down
Expand Up @@ -11,7 +11,7 @@ import {
getAssetById,
} from '@core/wallet'

import { selectedActivity, selectedAsset, TokenAction } from '../../../contexts/dashboard'
import { selectedActivity, selectedAsset, TokenAction } from '@/contexts/dashboard'
import { activityRouter, dashboardRouter, sendRouter } from '../'

import { TokenRoute, DashboardRoute } from '../../enums'
Expand Down
Expand Up @@ -5,7 +5,7 @@ import { INode } from '@core/network'
import { Subrouter } from '@core/router'

import { settingsRouter } from '..'
import { NetworkConfigurationSettingsAction } from '../../../contexts/settings'
import { NetworkConfigurationSettingsAction } from '@/contexts/settings'
import { NetworkConfigurationSettingsRoute } from '../../enums'

export const networkConfigurationSettingsRoute = writable<NetworkConfigurationSettingsRoute>(null)
Expand Down
5 changes: 3 additions & 2 deletions packages/mobile/tsconfig.json
Expand Up @@ -7,15 +7,16 @@
"importsNotUsedAsValues": "remove",
"lib": ["DOM", "ESNext"],
"paths": {
"@auxiliary/*": ["./lib/auxiliary/*"],
"@auxiliary/*": ["../shared/lib/auxiliary/*"],
"@contexts/*": ["../shared/lib/contexts/*"],
"@components": ["./components"],
"@core/*": ["../shared/lib/core/*"],
"@features/*": ["./features/*"],
"@lib/*": ["../shared/lib/*"],
"@ui": ["../shared/components"],
"@ui/*": ["../shared/components/*"],
"@views": ["./views"]
"@views": ["./views"],
"@/*": ["./lib/*"]
}
},
"include": ["./capacitor"]
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/views/dashboard/DashboardRouter.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import features from '@features/features'
import { selectedActivity, selectedAsset, selectedFilter } from '../../lib/contexts/dashboard'
import { selectedActivity, selectedAsset, selectedFilter } from '@/contexts/dashboard'
import {
accountActionsRouter,
accountSwitcherRouter,
Expand All @@ -14,7 +14,7 @@
sendRouter,
settingsRouter,
tokenRouter,
} from '../../lib/routers'
} from '@/routers'
import {
AccountActionsDrawer,
AccountSwitcherDrawer,
Expand Down
8 changes: 4 additions & 4 deletions packages/mobile/views/dashboard/DashboardView.svelte
Expand Up @@ -4,11 +4,11 @@
import { BASE_TOKEN } from '@core/network'
import { activeProfile, hasStrongholdLocked, reflectLockedStronghold, saveActiveProfile } from '@core/profile'
import { selectedAccountAssets } from '@core/wallet'
import { Button } from 'shared/components'
import { TabPane, TogglableAssetBalanceLabel, TopBar } from '../../components'
import { Button } from '@ui'
import { TabPane, TogglableAssetBalanceLabel, TopBar } from '@components'
import features from '@features/features'
import { activeDashboardTab, DASHBOARD_TAB_COMPONENT } from '../../lib/contexts/dashboard'
import { DashboardRoute, dashboardRouter } from '../../lib/routers'
import { activeDashboardTab, DASHBOARD_TAB_COMPONENT } from '@/contexts/dashboard'
import { DashboardRoute, dashboardRouter } from '@/routers'
import DashboardRouter from './DashboardRouter.svelte'
import { TabNavigator } from './tabs'

Expand Down