diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/ScopesBlock.tsx b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/ScopesBlock.tsx index ecada045f9..451be5d9b5 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/ScopesBlock.tsx +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/ScopesBlock.tsx @@ -128,7 +128,7 @@ const ScopesBlock = ({ > {scope.read.name} {" "} - — {t(`${scope.read.tKey}`)} + — {t(`Common:${scope.read.tKey}`)} {/* @ts-ignore */} {scope.write.name} - — {t(`${scope.write.tKey}`)} + — {t(`Common:${scope.write.tKey}`)} diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/index.tsx b/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/index.tsx index e4fc1874c4..84e658d5aa 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/index.tsx +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/index.tsx @@ -67,23 +67,25 @@ const AuthorizedApps = ({ {t("ProfileDescription")} - - {(context: { sectionWidth: number; sectionHeight: number }) => ( - <> - {viewAs === "table" ? ( - - ) : ( - - )} - - )} - + {consents && consents?.length > 0 && ( + + {(context: { sectionWidth: number; sectionHeight: number }) => ( + <> + {viewAs === "table" ? ( + + ) : ( + + )} + + )} + + )} {infoDialogVisible && ( )} diff --git a/packages/client/src/store/OAuthStore.ts b/packages/client/src/store/OAuthStore.ts index 7f2d9290e2..ec62c9660d 100644 --- a/packages/client/src/store/OAuthStore.ts +++ b/packages/client/src/store/OAuthStore.ts @@ -226,8 +226,6 @@ class OAuthStore implements OAuthStoreProps { try { const consentList: IClientProps[] = await getConsentList(); - console.log(consentList); - runInAction(() => { this.consents = [...consentList]; }); @@ -370,7 +368,7 @@ class OAuthStore implements OAuthStoreProps { t: any, item: IClientProps, isInfo?: boolean, - isSettings?: boolean + isSettings: boolean = true ) => { const { clientId } = item; @@ -438,16 +436,17 @@ class OAuthStore implements OAuthStoreProps { await Promise.all(actions); - runInAction(() => { - this.activeClients = []; - this.selection = []; - }); + this.setActiveClient(""); + this.setSelection(""); } catch (e) {} } else { this.setActiveClient(clientId); await this.changeClientStatus(clientId, status); + this.setActiveClient(""); + this.setSelection(""); + //TODO OAuth, show toast } };