mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'update-wallet' into 'main' 

Restrict wallet access

Closes #1824

See merge request soapbox-pub/soapbox!3365
merge-requests/3366/head
Alex Gleason 2025-04-23 18:32:06 +00:00
rodzic 75e1e9ecd6 9301824d80
commit 5b7b7d7e14
3 zmienionych plików z 19 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
src/components/sidebar-menu.tsx
Wyświetl plik

@ -214,12 +214,15 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
onClick={onClose} onClick={onClose}
/> />
<SidebarLink {features.nostr && (
to={'/wallet'} <SidebarLink
icon={walletIcon} to={'/wallet'}
text={<FormattedMessage id='tabs_bar.wallet' defaultMessage='Wallet' />} icon={walletIcon}
onClick={onClose} text={<FormattedMessage id='tabs_bar.wallet' defaultMessage='Wallet' />}
/> onClick={onClose}
/>
)
}
{(account.locked || followRequestsCount > 0) && ( {(account.locked || followRequestsCount > 0) && (
<SidebarLink <SidebarLink

15
src/components/sidebar-navigation.tsx
Wyświetl plik

@ -197,12 +197,15 @@ const SidebarNavigation = () => {
text={<FormattedMessage id='tabs_bar.profile' defaultMessage='Profile' />} text={<FormattedMessage id='tabs_bar.profile' defaultMessage='Profile' />}
/> />
<SidebarNavigationLink {features.nostr && (
to={'/wallet'} <SidebarNavigationLink
icon={walletIcon} to={'/wallet'}
activeIcon={walletIcon} icon={walletIcon}
text={<FormattedMessage id='tabs_bar.wallet' defaultMessage='Wallet' />} activeIcon={walletIcon}
/> text={<FormattedMessage id='tabs_bar.wallet' defaultMessage='Wallet' />}
/>
)
}
<SidebarNavigationLink <SidebarNavigationLink
to='/settings' to='/settings'

2
src/features/ui/index.tsx
Wyświetl plik

@ -334,7 +334,7 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
<WrappedRoute path='/settings/mfa' page={DefaultPage} component={MfaForm} exact /> <WrappedRoute path='/settings/mfa' page={DefaultPage} component={MfaForm} exact />
<WrappedRoute path='/settings/tokens' page={DefaultPage} component={AuthTokenList} content={children} /> <WrappedRoute path='/settings/tokens' page={DefaultPage} component={AuthTokenList} content={children} />
<WrappedRoute path='/settings' page={DefaultPage} component={Settings} content={children} /> <WrappedRoute path='/settings' page={DefaultPage} component={Settings} content={children} />
<WrappedRoute path='/wallet' page={DefaultPage} component={Wallet} content={children} exact /> {features.nostr && <WrappedRoute path='/wallet' page={DefaultPage} component={Wallet} content={children} exact />}
<WrappedRoute path='/wallet/relays' page={DefaultPage} component={WalletRelays} content={children} exact /> <WrappedRoute path='/wallet/relays' page={DefaultPage} component={WalletRelays} content={children} exact />
<WrappedRoute path='/wallet/mints' page={DefaultPage} component={WalletMints} content={children} exact /> <WrappedRoute path='/wallet/mints' page={DefaultPage} component={WalletMints} content={children} exact />
<WrappedRoute path='/wallet/transactions' page={DefaultPage} component={WalletTransactions} content={children} exact /> <WrappedRoute path='/wallet/transactions' page={DefaultPage} component={WalletTransactions} content={children} exact />