Client:OAuth2: fix

packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/ScopesBlock.tsx

@@ -128,7 +128,7 @@ const ScopesBlock = ({
               >
                 {scope.read.name}
               </Text>{" "}
-              — {t(`${scope.read.tKey}`)}
+              — {t(`Common:${scope.read.tKey}`)}
             </Text>
             {/* @ts-ignore */}
             <Text
@@ -147,7 +147,7 @@ const ScopesBlock = ({
               >
                 {scope.write.name}
               </Text>
-              — {t(`${scope.write.tKey}`)}
+              — {t(`Common:${scope.write.tKey}`)}
             </Text>
           </StyledScopesName>
           <StyledScopesCheckbox>

packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/index.tsx

@@ -67,23 +67,25 @@ const AuthorizedApps = ({
       <Text fontSize={"12px"} fontWeight={"400"} lineHeight={"16px"}>
         {t("ProfileDescription")}
       </Text>
-      <Consumer>
+      {consents && consents?.length > 0 && (
-        {(context: { sectionWidth: number; sectionHeight: number }) => (
+        <Consumer>
-          <>
+          {(context: { sectionWidth: number; sectionHeight: number }) => (
-            {viewAs === "table" ? (
+            <>
-              <TableView
+              {viewAs === "table" ? (
-                items={consents || []}
+                <TableView
-                sectionWidth={context.sectionWidth}
+                  items={consents || []}
-              />
+                  sectionWidth={context.sectionWidth}
-            ) : (
+                />
-              <RowView
+              ) : (
-                items={consents || []}
+                <RowView
-                sectionWidth={context.sectionWidth}
+                  items={consents || []}
-              />
+                  sectionWidth={context.sectionWidth}
-            )}
+                />
-          </>
+              )}
-        )}
+            </>
-      </Consumer>
+          )}
+        </Consumer>
+      )}
       {infoDialogVisible && (
         <InfoDialog visible={infoDialogVisible} isProfile />
       )}

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.setActiveClient("");
-            this.activeClients = [];
+          this.setSelection("");
-            this.selection = [];
-          });
         } catch (e) {}
       } else {
         this.setActiveClient(clientId);
 
         await this.changeClientStatus(clientId, status);
 
+        this.setActiveClient("");
+        this.setSelection("");
+
         //TODO OAuth, show toast
       }
     };