Merge pull request #468 from Cryptonomic/as-pending

Display pending operations
Cryptonomic · Feb 22, 2021 · 5de134c · 5de134c
2 parents e48f047 + a8e6eab
commit 5de134c
Show file tree

Hide file tree

Showing 10 changed files with 182 additions and 101 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "arronax",
-  "version": "10.0.0",
+  "version": "11.0.0",
   "description": "Blockchain analytics and business intelligence tool for the Tezos chain.",
   "author": "Cryptonomic",
   "license": "GPL-3.0",
@@ -29,7 +29,7 @@
     "@types/throttle-debounce": "^2.1.0",
     "autosuggest-highlight": "^3.1.1",
     "base64url": "^3.0.1",
-    "conseiljs": "5.0.2-beta.2",
+    "conseiljs": "5.0.7-2",
     "d3": "^5.16.0",
     "i18next": "^19.5.1",
     "i18next-browser-languagedetector": "^5.0.0",
@@ -47,7 +47,7 @@
     "react-moment": "^0.9.7",
     "react-redux": "^7.1.3",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "^3.4.3",
+    "react-scripts": "3.4.4",
     "react-swipeable-views": "^0.13.9",
     "redux": "^4.0.5",
     "redux-devtools-extension": "^2.13.8",

diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -30,7 +30,8 @@
             "platform": "Platform",
             "network": "Network",
             "display_name": "Display Name",
-            "url": "Url",
+            "conseilUrl": "Conseil Url",
+            "tezosNode": "Tezos Node",
             "api_key": "Api Key"
         },
         "customPaginator": {

diff --git a/src/containers/App/index.tsx b/src/containers/App/index.tsx
@@ -72,7 +72,7 @@ class Arronax extends React.Component<Props, States> {
         this.state = {
             isSettingCollapsed: false,
             selectedTool: ToolType.FILTER,
-            isOpenConfigMdoal: false,
+            isOpenConfigModal: false,
             page: 0
         };
 
@@ -241,9 +241,9 @@ class Arronax extends React.Component<Props, States> {
         initMessage();
     };
 
-    closeConfigModal = () => this.setState({ isOpenConfigMdoal: false });
+    closeConfigModal = () => this.setState({ isOpenConfigModal: false });
 
-    openConfigModal = () => this.setState({ isOpenConfigMdoal: true });
+    openConfigModal = () => this.setState({ isOpenConfigModal: true });
 
     onAddConfig = (config: Config, isUse: boolean) => {
         const { addConfig } = this.props;
@@ -297,7 +297,7 @@ class Arronax extends React.Component<Props, States> {
             rowsPerPage,
             modal: { open },
         } = this.props;
-        const { isSettingCollapsed, selectedTool, isOpenConfigMdoal, page } = this.state;
+        const { isSettingCollapsed, selectedTool, isOpenConfigModal, page } = this.state;
         const isRealLoading = isLoading || !isFullLoaded;
 
         const fullTabsList = entities.map((entity) => entity.name);
@@ -383,7 +383,7 @@ class Arronax extends React.Component<Props, States> {
                         <DismissButton onClick={this.handleErrorClose}>{t('general.verbs.dismiss')}</DismissButton>
                     </DialogActions>
                 </Dialog>
-                <ConfigModal t={t} open={isOpenConfigMdoal} onClose={this.closeConfigModal} addConfig={this.onAddConfig} />
+                <ConfigModal t={t} open={isOpenConfigModal} onClose={this.closeConfigModal} addConfig={this.onAddConfig} />
                 {isFullLoaded && open && <DynamicModal onClickPrimaryKey={this.onClickPrimaryKey} onCloseEntityModal={this.onCloseEntityModal} />}
             </MainContainer>
         );

diff --git a/src/containers/App/types.ts b/src/containers/App/types.ts
@@ -36,7 +36,7 @@ export interface OwnProps {
 export interface States {
     isSettingCollapsed: boolean;
     selectedTool: string;
-    isOpenConfigMdoal: boolean;
+    isOpenConfigModal: boolean;
     page: number;
 }
 

diff --git a/src/containers/Homepage/index.tsx b/src/containers/Homepage/index.tsx
@@ -88,7 +88,7 @@ class Home extends React.Component<Props, States> {
 
         this.state = {
             showLogo: false,
-            isOpenConfigMdoal: false
+            isOpenConfigModal: false
         };
     }
 
@@ -246,7 +246,7 @@ class Home extends React.Component<Props, States> {
         history.replace(`/${platform}/${network}/${selectedEntity}`);
     };
 
-    openConfigModal = () => this.setState({ isOpenConfigMdoal: true });
+    openConfigModal = () => this.setState({ isOpenConfigModal: true });
 
     onSearchById = async (val: string | number) => {
         const { searchById } = this.props;

diff --git a/src/containers/Homepage/types.tsx b/src/containers/Homepage/types.tsx
@@ -28,7 +28,7 @@ export interface OwnProps {
 
 export interface States {
     showLogo: boolean,
-    isOpenConfigMdoal: boolean
+    isOpenConfigModal: boolean
 }
 
 export type Props = OwnProps & RouteComponentProps;