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.

Sign up for GitHub

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

Refactor and Standardize Route paths #1362

Closed
wants to merge 1 commit into from
Closed

Refactor and Standardize Route paths #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/extension-base/src/defaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2019-2024 @polkadot/extension-base authors & contributors
// SPDX-License-Identifier: Apache-2.0

const ALLOWED_PATH = ['/', '/account/import-ledger', '/account/restore-json'] as const;
const ALLOWED_PATH = ['/', '/create-account-full-screen'] as const;
// Added for Polkagate
const START_WITH_PATH = [
'/account/',
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-polkagate/src/fullscreen/homeFullScreen/partials/HomeMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default function HomeMenu (): React.ReactElement {
const areAllExternalAccounts = useMemo(() => accounts.every(({ isExternal }) => isExternal), [accounts]);

const onCreate = useCallback(() => {
openOrFocusTab('/account/create');
openOrFocusTab('/create-account-full-screen');
}, []);

const onExportAll = useCallback(() => {
Expand Down
8 changes: 4 additions & 4 deletions ...extension-polkagate/src/fullscreen/homeFullScreen/partials/ImportAccSubMenuFullScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ function ImportAccSubMenuFullScreen ({ show, toggleSettingSubMenu }: Props): Rea
const theme = useTheme();

const onRestoreFromJson = useCallback((): void => {
openOrFocusTab('/account/restore-json');
openOrFocusTab('/import/restore-json-full-screen');
}, []);

const onImportFromSeed = useCallback(() => {
openOrFocusTab('/account/import-seed');
openOrFocusTab('/import/seed-full-screen');
}, []);

const onImportFromRawSeed = useCallback(() => {
openOrFocusTab('/account/import-raw-seed');
openOrFocusTab('/import/raw-seed-full-screen');
}, []);

const onAddWatchOnlyFullScreen = useCallback(() => {
Expand All @@ -51,7 +51,7 @@ function ImportAccSubMenuFullScreen ({ show, toggleSettingSubMenu }: Props): Rea
}, []);

const onImportLedger = useCallback((): void => {
openOrFocusTab('/account/import-ledger');
openOrFocusTab('/import/ledger-full-screen');
}, []);

return (
Expand Down
10 changes: 5 additions & 5 deletions packages/extension-polkagate/src/fullscreen/onboarding/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ function Onboarding (): React.ReactElement {

const onRestoreFromJson = useCallback(
(): void => {
windowOpen('/account/restore-json').catch(console.error);
windowOpen('/import/restore-json-full-screen').catch(console.error);
}, []
);

const onImportLedger = useCallback(
(): void => {
windowOpen('/account/import-ledger').catch(console.error);
windowOpen('/import/ledger-full-screen').catch(console.error);
}, []
);

Expand All @@ -63,7 +63,7 @@ function Onboarding (): React.ReactElement {

const onCreate = useCallback(
(): void => {
windowOpen('/account/create').catch(console.error);
windowOpen('/create-account-full-screen').catch(console.error);
}, []
);

Expand All @@ -75,13 +75,13 @@ function Onboarding (): React.ReactElement {

const onImport = useCallback(
(): void => {
windowOpen('/account/import-seed').catch(console.error);
windowOpen('/import/seed-full-screen').catch(console.error);
}, []
);

const onImportRawSeed = useCallback(
(): void => {
windowOpen('/account/import-raw-seed').catch(console.error);
windowOpen('/import/raw-seed-full-screen').catch(console.error);
}, []
);

Expand Down
4 changes: 2 additions & 2 deletions packages/extension-polkagate/src/partials/AddNewAccountButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export default function AddNewAccountButton (): React.ReactElement {

const onCreate = useCallback((): void => {
isExtensionMode
? windowOpen('/account/create').catch(console.error)
: onAction('/account/create');
? windowOpen('/create-account-full-screen').catch(console.error)
: onAction('/create-account-full-screen');
}, [isExtensionMode, onAction]);

return (
Expand Down
8 changes: 4 additions & 4 deletions packages/extension-polkagate/src/partials/ImportAccSubMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ function ImportAccSubMenu ({ show, toggleSettingSubMenu }: Props): React.ReactEl
const onAction = useContext(ActionContext);

const onRestoreFromJson = useCallback((): void => {
windowOpen('/account/restore-json').catch(console.error);
windowOpen('/import/restore-json-full-screen').catch(console.error);
}, []);

const onImportAcc = useCallback(() => {
windowOpen('/account/import-seed').catch(console.error);
windowOpen('/import/seed-full-screen').catch(console.error);
}, []);

const onImportRawSeed = useCallback(() => {
windowOpen('/account/import-raw-seed').catch(console.error);
windowOpen('/import/raw-seed-full-screen').catch(console.error);
}, []);

const onAddWatchOnly = useCallback(() => {
Expand All @@ -46,7 +46,7 @@ function ImportAccSubMenu ({ show, toggleSettingSubMenu }: Props): React.ReactEl
}, [onAction]);

const onImportLedger = useCallback((): void => {
windowOpen('/account/import-ledger').catch(console.error);
windowOpen('/import/ledger-full-screen').catch(console.error);
}, []);

const onImportProxied = useCallback((): void => {
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-polkagate/src/partials/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function Menu ({ setShowMenu, theme }: Props): React.ReactElement<Props> {
}, [setShowMenu]);

const _goToExportAll = useCallback(() => {
onAction('/account/export-all');
onAction('/export/all');
}, [onAction]);

const onEnableTestnetConfirm = useCallback(() => {
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-polkagate/src/partials/NewAccountSubMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function NewAccountSubMenu({ show }: Props): React.ReactElement<Props> {
}, [master, onAction]);

const goToCreateAcc = useCallback(() => {
windowOpen('/account/create').catch(console.error);
windowOpen('/create-account-full-screen').catch(console.error);
}, []);

return (
Expand Down
4 changes: 2 additions & 2 deletions packages/extension-polkagate/src/popup/passwordManagement/Reset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ function Reset (): React.ReactElement {
const theme = useTheme();

const _goToRestoreFromJson = useCallback((): void => {
windowOpen('/account/restore-json').catch(console.error);
windowOpen('/import/restore-json-full-screen').catch(console.error);
}, []);

const _goToImport = useCallback((): void => {
windowOpen('/account/import-seed').catch(console.error);
windowOpen('/import/seed-full-screen').catch(console.error);
}, []);

return (
Expand Down
4 changes: 2 additions & 2 deletions packages/extension-polkagate/src/popup/passwordManagement/ResetFS.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ function ResetFS (): React.ReactElement {
useFullscreen();

const _goToRestoreFromJson = useCallback((): void => {
windowOpen('/account/restore-json').catch(console.error);
windowOpen('/import/restore-json-full-screen').catch(console.error);
}, []);

const _goToImport = useCallback((): void => {
windowOpen('/account/import-seed').catch(console.error);
windowOpen('/import/seed-full-screen').catch(console.error);
}, []);

return (
Expand Down
10 changes: 5 additions & 5 deletions packages/extension-polkagate/src/popup/welcome/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ function Welcome(): React.ReactElement {

const onRestoreFromJson = useCallback(
(): void => {
windowOpen('/account/restore-json').catch(console.error);
windowOpen('/import/restore-json-full-screen').catch(console.error);
}, []
);

const onImportLedger = useCallback(
(): void => {
windowOpen('/account/import-ledger').catch(console.error);
windowOpen('/import/ledger-full-screen').catch(console.error);
}, []
);

const onCreate = useCallback(
(): void => {
windowOpen('/account/create').catch(console.error);
windowOpen('/create-account-full-screen').catch(console.error);
}, []
);

Expand All @@ -47,13 +47,13 @@ function Welcome(): React.ReactElement {

const onImport = useCallback(
(): void => {
windowOpen('/account/import-seed').catch(console.error);
windowOpen('/import/seed-full-screen').catch(console.error);
}, []
);

const onImportRawSeed = useCallback(
(): void => {
windowOpen('/account/import-raw-seed').catch(console.error);
windowOpen('/import/raw-seed-full-screen').catch(console.error);
}, []
);

Expand Down
2 changes: 1 addition & 1 deletion packages/extension-polkagate/src/util/constants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,4 @@ export const USD_CURRENCY = {
};

export const FULLSCREEN_WIDTH = '900px';
export const ALLOWED_URL_ON_RESET_PASSWORD = ['/account/restore-json', '/account/import-seed', '/account/import-raw-seed', '/forgot-password', '/reset-wallet'];
export const ALLOWED_URL_ON_RESET_PASSWORD = ['/import/restore-json-full-screen', '/import/seed-full-screen', '/import/raw-seed-full-screen', '/forgot-password', '/reset-wallet'];
12 changes: 6 additions & 6 deletions packages/extension-ui/src/Popup/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,17 +282,13 @@ export default function Popup (): React.ReactElement {
<SigningReqContext.Provider value={signRequests}>
<Switch>
<Route path='/account/:genesisHash/:address/'>{wrapWithErrorBoundary(<AccountEx />, 'account')}</Route>
<Route path='/account/create'>{wrapWithErrorBoundary(<CreateAccount />, 'account-creation')}</Route>
<Route path='/account/export-all'>{wrapWithErrorBoundary(<ExportAll />, 'export-all-address')}</Route>
<Route path='/account/import-ledger'>{wrapWithErrorBoundary(<ImportLedger />, 'import-ledger')}</Route>
<Route path='/account/import-seed'>{wrapWithErrorBoundary(<ImportSeed />, 'import-seed')}</Route>
<Route path='/account/import-raw-seed'>{wrapWithErrorBoundary(<ImportRawSeed />, 'import-raw-seed')}</Route>
<Route path='/account/restore-json'>{wrapWithErrorBoundary(<RestoreJson />, 'restore-json')}</Route>
<Route path='/accountfs/:address/:paramAssetId'>{wrapWithErrorBoundary(<AccountFS />, 'account')}</Route>
<Route path='/auth-list'>{wrapWithErrorBoundary(<AuthList />, 'auth-list')}</Route>
<Route path='/create-account-full-screen'>{wrapWithErrorBoundary(<CreateAccount />, 'account-creation')}</Route>
<Route path='/crowdloans/:address'>{wrapWithErrorBoundary(<CrowdLoans />, 'crowdloans')}</Route>
<Route path='/derive/:address/locked'>{wrapWithErrorBoundary(<Derive isLocked />, 'derived-address-locked')}</Route>
<Route path='/derive/:address'>{wrapWithErrorBoundary(<Derive />, 'derive-address')}</Route>
<Route path='/export/all'>{wrapWithErrorBoundary(<ExportAll />, 'export-all-address')}</Route>
<Route path='/export/:address'>{wrapWithErrorBoundary(<Export />, 'export-address')}</Route>
<Route path='/forget/:address/:isExternal'>{wrapWithErrorBoundary(<ForgetAccount />, 'forget-address')}</Route>
<Route path='/forgot-password'>{wrapWithErrorBoundary(<ForgotPassword />, 'forgot-password')}</Route>
Expand All @@ -306,8 +302,12 @@ export default function Popup (): React.ReactElement {
<Route path='/import/add-watch-only-full-screen'>{wrapWithErrorBoundary(<AddWatchOnlyFullScreen />, 'import-add-watch-only-full-screen')}</Route>
<Route path='/import/attach-qr'>{wrapWithErrorBoundary(<AttachQR />, 'attach-qr')}</Route>
<Route path='/import/attach-qr-full-screen'>{wrapWithErrorBoundary(<AttachQrFullScreen />, 'attach-qr-full-screen')}</Route>
<Route path='/import/ledger-full-screen'>{wrapWithErrorBoundary(<ImportLedger />, 'import-ledger-full-screen')}</Route>
<Route path='/import/proxied'>{wrapWithErrorBoundary(<ImportProxied />, 'import-proxied')}</Route>
<Route path='/import/proxied-full-screen'>{wrapWithErrorBoundary(<ImportProxiedFullScreen />, 'import-add-watch-only-full-screen')}</Route>
<Route path='/import/raw-seed-full-screen'>{wrapWithErrorBoundary(<ImportRawSeed />, 'import-raw-seed-full-screen')}</Route>
<Route path='/import/restore-json-full-screen'>{wrapWithErrorBoundary(<RestoreJson />, 'restore-json-full-screen')}</Route>
<Route path='/import/seed-full-screen'>{wrapWithErrorBoundary(<ImportSeed />, 'import-seed-full-screen')}</Route>
<Route path='/login-password'>{wrapWithErrorBoundary(<LoginPassword />, 'manage-login-password')}</Route>
<Route path='/manageProxies/:address'>{wrapWithErrorBoundary(<ManageProxies />, 'manageProxies')}</Route>
<Route path='/manageIdentity/:address'>{wrapWithErrorBoundary(<ManageIdentity />, 'manage-identity')}</Route>
Expand Down
Loading