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: move shared features to desktop #5049

Merged
Expand Up @@ -8,8 +8,8 @@
selectedAccountActivities,
setAsyncStatusOfAccountActivities,
} from '@core/wallet'
import { ActivityTile, Text, TextInput, TogglableButton, Filter, FontWeight } from 'shared/components'
import features from 'shared/features/features'
import { ActivityTile, Text, TextInput, TogglableButton, Filter, FontWeight } from '@ui'
import features from '@features/features'
import { debounce, getMonthYear } from '@core/utils'
import VirtualList from '@sveltejs/svelte-virtual-list'

Expand Down
Expand Up @@ -3,7 +3,7 @@
import { resetLedgerPreparedOutput, resetShowInternalVerificationPopup } from '@core/ledger'
import { resetNewTokenTransactionDetails } from '@core/wallet'
import { openPopup } from '@auxiliary/popup'
import { OnboardingButton } from 'shared/components'
import { OnboardingButton } from '@ui'

function onSendClick(): void {
resetNewTokenTransactionDetails()
Expand Down
Expand Up @@ -10,8 +10,8 @@
SecuritySettingsRoute,
} from '@core/router'
import { SETTINGS_ICON_SVG } from '@lib/auxiliary/icon'
import { Icon, Text, TextType } from 'shared/components'
import features from 'shared/features/features'
import { Icon, Text, TextType } from '@ui'
import features from '@features/features'

export let group: string
export let settings:
Expand Down
3 changes: 3 additions & 0 deletions packages/desktop/components/index.js
@@ -1 +1,4 @@
export { default as AccountActivity } from './AccountActivity.svelte'
export { default as SendButton } from './SendButton.svelte'
export { default as SettingsMenu } from './SettingsMenu.svelte'
export { default as SidebarTab } from './SidebarTab.svelte'
4 changes: 2 additions & 2 deletions packages/desktop/electron/lib/menu.js
@@ -1,6 +1,6 @@
import { app, ipcMain, Menu, shell } from 'electron'
import { DISCORD_URL, DOCUMENTATION_URL, FAQ_URL, ISSUE_REPORT_URL } from 'shared/lib/contexts/settings/constants'
import features from 'shared/features/features'
import { DISCORD_URL, DOCUMENTATION_URL, FAQ_URL, ISSUE_REPORT_URL } from '@contexts/settings/constants'
import features from '@features/features'
maxwellmattryan marked this conversation as resolved.
Show resolved Hide resolved
import { closeAboutWindow, getOrInitWindow, openAboutWindow } from '../main'
import { menuState } from './menuState'

Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/electron/main.js
@@ -1,4 +1,4 @@
import features from 'shared/features/features'
import features from '@features/features'
import { initAutoUpdate } from './lib/appUpdater'
import { shouldReportError } from './lib/errorHandling'
const { app, dialog, ipcMain, protocol, shell, BrowserWindow, session } = require('electron')
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/tsconfig.json
Expand Up @@ -11,7 +11,7 @@
"@contexts/*": ["../shared/lib/contexts/*"],
"@components": ["./components"],
"@core/*": ["../shared/lib/core/*"],
"@features/*": ["../shared/features/*"],
"@features/*": ["./features/*"],
"@lib/*": ["../shared/lib/*"],
"@ui": ["../shared/components"],
"@views": ["./views"]
Expand Down
@@ -1,5 +1,6 @@
<script lang="typescript">
import { SettingsMenu, Text, TextType } from 'shared/components'
import { Text, TextType } from '@ui'
import { SettingsMenu } from '@components'
import { mobile } from '@core/app'
import { localize } from '@core/i18n'
import { activeProfile, isActiveLedgerProfile, isSoftwareProfile } from '@core/profile'
Expand All @@ -13,7 +14,7 @@
SettingsRoute,
settingsRouter,
} from '@core/router'
import features from 'shared/features/features'
import features from '@features/features'

const { loggedIn } = $activeProfile

Expand Down
Expand Up @@ -12,7 +12,7 @@
NetworkConfiguration,
WalletFinder,
} from './'
import features from 'shared/features/features'
import features from '@features/features'

const settings: {
component: unknown
Expand Down
Expand Up @@ -4,7 +4,7 @@
import { Currency, Language, NetworkStatus, Notifications, Theme } from './'
import ChangeProfileName from './ChangeProfileName.svelte'
import { activeProfile } from '@core/profile'
import features from 'shared/features/features'
import features from '@features/features'

const settings: {
component: unknown
Expand Down
Expand Up @@ -2,7 +2,7 @@
import { HR } from 'shared/components'
import { HelpAndInfoRoute } from '@core/router'
import HelpSection from './HelpSection.svelte'
import features from 'shared/features/features'
import features from '@features/features'
import { DISCORD_URL, DOCUMENTATION_URL, FAQ_URL, ISSUE_REPORT_URL } from '@contexts/settings'

const settings: {
Expand Down
Expand Up @@ -3,7 +3,7 @@
import { SecuritySettingsRoute } from '@core/router'
import { HR } from 'shared/components'
import { AppLock, ChangePassword, ChangePincode, DeleteProfile, ExportStronghold } from './'
import features from 'shared/features/features'
import features from '@features/features'

const settings: {
component: unknown
Expand Down
5 changes: 3 additions & 2 deletions packages/desktop/views/dashboard/wallet/Wallet.svelte
@@ -1,8 +1,9 @@
<script lang="typescript">
import { selectedAccount } from '@core/account'
import features from '@features/features'
import { ReceiveAddressButton, SendButton } from 'shared/components/atoms'
import { AccountActivity, AccountAssetsList, AccountSummary, Pane } from 'shared/components'
import { ReceiveAddressButton } from 'shared/components/atoms'
import { AccountActivity, SendButton } from '@components'
Comment on lines +4 to +5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can these two imports be combined?

import { AccountAssetsList, AccountSummary, Pane } from '@ui'
</script>

{#if $selectedAccount}
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/webpack.config.js
Expand Up @@ -31,7 +31,7 @@ const resolve = {
'@contexts': path.resolve(__dirname, '../shared/lib/contexts'),
'@components': path.resolve(__dirname, './components/'),
'@core': path.resolve(__dirname, '../shared/lib/core'),
'@features': path.resolve(__dirname, '../shared/features'),
'@features': path.resolve(__dirname, './features'),
'@lib': path.resolve(__dirname, '../shared/lib'),
'@ui': path.resolve(__dirname, '../shared/components/'),
'@views': path.resolve(__dirname, './views/'),
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/TopBar.svelte
@@ -1,6 +1,6 @@
<script lang="typescript">
import { AccountActionsButton, AccountSwitcherButton, ProfileActionsButton } from './'
import features from '../features/features'
import features from '@features/features'
</script>

<div class="grid grid-cols-4 h-10">
Expand Down
@@ -1,5 +1,5 @@
import { DashboardTab } from '../enums'
import features from '../../../../features/features'
import features from '@features/features'

export const INITIAL_ACTIVE_DASHBOARD_TAB: DashboardTab | null = getInitialActiveDashboardTab()

Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/views/dashboard/DashboardRouter.svelte
@@ -1,5 +1,5 @@
<script lang="typescript">
import features from '../../features/features'
import features from '@features/features'
import {
accountSwitcherRouter,
DashboardRoute,
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/views/dashboard/DashboardView.svelte
Expand Up @@ -5,7 +5,7 @@
import { activeProfile, hasStrongholdLocked, reflectLockedStronghold, saveActiveProfile } from '@core/profile'
import { Button, TogglableAmountLabel } from 'shared/components'
import { TabPane, TopBar } from '../../components'
import features from '../../features/features'
import features from '@features/features'
import { activeDashboardTab, DASHBOARD_TAB_COMPONENT } from '../../lib/contexts/dashboard'
import { DashboardRoute, dashboardRouter } from '../../lib/routers'
import DashboardRouter from './DashboardRouter.svelte'
Expand Down
@@ -0,0 +1,44 @@
<script lang="typescript">
import { localize } from '@core/i18n'
import { BASE_TOKEN } from '@core/network'
import { activeProfile, visibleActiveAccounts } from '@core/profile'
import { sumBalanceForAccounts } from '@core/account'
import { formatTokenAmountBestMatch } from '@core/wallet'
import features from '@features/features'
import { AccountSwitcherMenuItem, Drawer } from '../../../../mobile/components'
import { HR, Icon, Text, TextType } from 'shared/components'

export let onClose: () => unknown = () => {}

$: totalBalance = sumBalanceForAccounts($visibleActiveAccounts)
</script>

<Drawer {onClose} title={localize('general.accounts')}>
<div class="flex flex-col w-full">
<account-list class="accounts flex flex-col scrollable-y">
{#each $visibleActiveAccounts as account}
<AccountSwitcherMenuItem id="account-{account.index}" {account} onClick={onClose} />
{/each}
</account-list>
<HR />
<div class="flex flex-row-reverse h-16">
<Text classes="opacity-50 m-auto w-full text-right" type={TextType.h5}>
{localize('general.total', {
values: {
balance: formatTokenAmountBestMatch(totalBalance, BASE_TOKEN[$activeProfile.networkProtocol]),
},
})}
</Text>
{#if features?.dashboard?.createAccount?.enabled}
<button class="h-full" on:click={() => {}}>
<div class="flex flex-row items-center space-x-4">
<Icon icon="plus" height="12" width="12" classes="text-blue-500" />
<Text highlighted type={TextType.h5} classes="whitespace-nowrap"
>{localize('general.addAWallet')}</Text
>
</div>
</button>
{/if}
</div>
</div>
</Drawer>
Expand Up @@ -5,9 +5,9 @@
import { activeProfile, visibleActiveAccounts } from '@core/profile'
import { formatTokenAmountBestMatch } from '@core/wallet'

import features from '../../../../../features/features'
import { AccountSwitcherMenuItem } from '../../../../../components'
import { HR, Icon, Text, TextType } from 'shared/components'
import features from '@features/features'
import { AccountSwitcherMenuItem } from '@components'
import { HR, Icon, Text, TextType } from '@ui'

export let onSwitch: () => unknown = () => {}
export let onAddClick: () => unknown = () => {}
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/views/dashboard/tabs/TabNavigator.svelte
Expand Up @@ -3,7 +3,7 @@
import { localize } from '@core/i18n'
import { Icon as IconEnum } from '@lib/auxiliary/icon'
import { Icon } from 'shared/components'
import features from '../../../features/features'
import features from '@features/features'
import { activeDashboardTab, updateActiveDashboardTab, DashboardTab } from '../../../lib/contexts/dashboard'

$: darkModeEnabled = $appSettings.darkMode
Expand Down
Expand Up @@ -12,7 +12,7 @@
} from 'shared/lib/contexts/onboarding'
import { onMount } from 'svelte'
import { OnboardingLayout } from '../../../../../components'
import features from '../../../../../features/features'
import features from '@features/features'

let checked = false

Expand Down
Expand Up @@ -8,7 +8,7 @@
import { localize } from '@core/i18n'
import { getDefaultClientOptions, NetworkProtocol, NetworkType } from '@core/network'
import { networkSetupRouter } from '../../../../../lib/routers'
import features from '../../../../../features/features'
import features from '@features/features'
import { OnboardingButton } from 'shared/components'
import { onMount } from 'svelte'
import { OnboardingLayout } from '../../../../../components'
Expand Down
Expand Up @@ -2,7 +2,7 @@
import { onMount } from 'svelte'
import { OnboardingLayout } from '../../../../../components'
import { OnboardingButton } from 'shared/components'
import features from '../../../../../features/features'
import features from '@features/features'
import { cleanupOnboarding, onboardingProfile, updateOnboardingProfile } from '@contexts/onboarding'
import { localize } from '@core/i18n'
import { NetworkProtocol, NetworkType } from '@core/network'
Expand Down
Expand Up @@ -2,7 +2,7 @@
import { onMount } from 'svelte'
import { OnboardingLayout } from '../../../../../components'
import { OnboardingButton, Text, TextType } from 'shared/components'
import features from '../../../../../features/features'
import features from '@features/features'
import { localize } from '@core/i18n'
import { formatProtocolName } from '@core/network'
import { profileSetupRouter } from '../../../../../lib/routers'
Expand Down
Expand Up @@ -15,7 +15,7 @@
import { OnboardingButton } from 'shared/components'
import { onMount } from 'svelte'
import { OnboardingLayout } from '../../../../../components'
import features from '../../../../../features/features'
import features from '@features/features'

const title = localize('views.onboarding.profileSetup.setup.title', {
values: { protocol: formatProtocolName($onboardingProfile?.networkProtocol) },
Expand Down
1 change: 0 additions & 1 deletion packages/shared/components/atoms/buttons/index.js
Expand Up @@ -11,6 +11,5 @@ export { default as OnboardingButton } from './OnboardingButton.svelte'
export { default as ReceiveAddressButton } from './ReceiveAddressButton.svelte'
export { default as ReceiveButton } from './ReceiveButton.svelte'
export { default as RefreshTokenMetadataButton } from './RefreshTokenMetadataButton.svelte'
export { default as SendButton } from './SendButton.svelte'
export { default as TestDeepLinkButton } from './TestDeepLinkButton.svelte'
export { default as TooltipIcon } from './TooltipIcon.svelte'
1 change: 0 additions & 1 deletion packages/shared/components/index.js
Expand Up @@ -27,7 +27,6 @@ export { default as QR } from './QR.svelte'
export { default as RecoveryPhrase } from './RecoveryPhrase.svelte'
export { default as Route } from './Route.svelte'
export { default as Scroller } from './Scroller.svelte'
export { default as SettingsMenu } from './SettingsMenu.svelte'
export { default as SettingsNavigator } from './SettingsNavigator.svelte'
export { default as Spinner } from './Spinner.svelte'
export { default as Text } from './Text.svelte'
Expand Down
1 change: 0 additions & 1 deletion packages/shared/components/organisms/index.js
@@ -1,4 +1,3 @@
export { default as AccountActivity } from './AccountActivity.svelte'
export { default as AccountAssetsList } from './AccountAssetsList.svelte'
export { default as AccountSummary } from './AccountSummary.svelte'
export { default as NodeConfigurationForm } from './NodeConfigurationForm.svelte'
Expand Down
3 changes: 1 addition & 2 deletions packages/shared/tsconfig.json
Expand Up @@ -10,11 +10,10 @@
"@auxiliary/*": ["./lib/auxiliary/*"],
"@contexts/*": ["./lib/contexts/*"],
"@core/*": ["./lib/core/*"],
"@features/*": ["./features/*"],
"@lib/*": ["./lib/*"]
},
"types": ["node"]
},
"include": ["./lib", "./features"],
"include": ["./lib"],
"exclude": ["**/node_modules", "**/tests"]
}