Merge pull request #39 from HORNET-Storage/refactor/rename-subscribers-component

Refactor/rename subscribers component

Author: f7f376a1fcd0d0e11a10ed1b6577c9

.env.development

@@ -1,5 +1,5 @@
 REACT_APP_BASE_URL=http://localhost:9002
-REACT_APP_WALLET_BASE_URL=http://localhost:9003  # New wallet base URL
+REACT_APP_WALLET_BASE_URL=http://localhost:9003
 REACT_APP_ASSETS_BUCKET=http://localhost
 REACT_APP_DEMO_MODE=false
 

.husky/pre-commit

@@ -0,0 +1 @@
+shamefully-hoist=true

.npmrc

@@ -1 +1,13 @@
+enableGlobalCache: false
+
 nodeLinker: node-modules
+
+packageExtensions:
+  react-scripts@*:
+    dependencies:
+      typescript: 4.5.5
+  react@*:
+    peerDependencies:
+      react-dom: "*"
+
+yarnPath: .yarn/releases/yarn-1.22.19.cjs

.yarn/releases/yarn-1.22.19.cjs

@@ -66,7 +66,7 @@
     "styled-components": "^5.3.0",
     "typeface-lato": "^1.1.13",
     "typeface-montserrat": "^1.1.13",
-    "typescript": "^5.4.5",
+    "typescript": "5.1.6",
     "uuid": "^8.3.2",
     "web-vitals": "^1.0.1",
     "workbox-background-sync": "^5.1.3",
@@ -99,6 +99,7 @@
     "not IE 11"
   ],
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@types/country-list": "^2.1.0",
     "@types/leaflet": "^1.7.9",
     "@types/react": "^18.0.28",
@@ -136,7 +137,7 @@
     "@types/react": "^18.0.28",
     "react-error-overlay": "6.0.9"
   },
-  "packageManager": "yarn@3.1.1",
+  "packageManager": "yarn@1.22.19",
   "keywords": [
     "lightence",
     "admin",

.yarn/releases/yarn-3.1.1.cjs

@@ -0,0 +1,34 @@
+diff --git a/src/components/layouts/main/sider/sidebarNavigation.tsx b/src/components/layouts/main/sider/sidebarNavigation.tsx
+index fa18628..f2161cd 100644
+--- a/src/components/layouts/main/sider/sidebarNavigation.tsx
++++ b/src/components/layouts/main/sider/sidebarNavigation.tsx
+@@ -1,5 +1,5 @@
+ import React, { useMemo } from 'react';
+-import { DashboardOutlined, TableOutlined } from '@ant-design/icons';
++import { DashboardOutlined, TableOutlined, StopOutlined, FlagOutlined } from '@ant-design/icons';
+ import { ReactComponent as NestIcon } from '@app/assets/icons/hive.svg';
+ import { ReactComponent as BtcIcon } from '@app/assets/icons/btc.svg';
+ import { ReactComponent as StatsIcon } from '@app/assets/icons/stats.svg';
+@@ -20,8 +20,8 @@ export const useSidebarNavigation = (): SidebarNavigationItem[] => {
+   return useMemo(() => {
+     const items: SidebarNavigationItem[] = [
+       {
+         title: 'common.relay-dashboard',
+-        key: 'relay-dashboard',
++        key: 'relay-dashboard',
+         url: '/',
+         icon: <NestIcon />,
+       },
+@@ -31,6 +31,12 @@ export const useSidebarNavigation = (): SidebarNavigationItem[] => {
+         url: '/relay-settings',
+         icon: <StorageSettingsIcon />,
+       },
++      {
++        title: 'Access Control',
++        key: 'blocked-pubkeys',
++        url: '/blocked-pubkeys',
++        icon: <StopOutlined />,
++      },
+       {
+         title: 'Nostr Statistics',
+         key: 'dataTables',

.yarnrc.yml

@@ -0,0 +1,22 @@
+--- a/src/components/layouts/main/sider/sidebarNavigation.tsx
++++ b/src/components/layouts/main/sider/sidebarNavigation.tsx
+@@ -1,5 +1,5 @@
+ import React, { useMemo } from 'react';
+-import { DashboardOutlined, TableOutlined } from '@ant-design/icons';
++import { DashboardOutlined, TableOutlined, StopOutlined, FlagOutlined } from '@ant-design/icons';
+ import { ReactComponent as NestIcon } from '@app/assets/icons/hive.svg';
+ import { ReactComponent as BtcIcon } from '@app/assets/icons/btc.svg';
+ import { ReactComponent as StatsIcon } from '@app/assets/icons/stats.svg';
+@@ -31,6 +31,12 @@ export const useSidebarNavigation = (): SidebarNavigationItem[] => {
+         url: '/relay-settings',
+         icon: <StorageSettingsIcon />,
+       },
++      {
++        title: 'Access Control',
++        key: 'blocked-pubkeys',
++        url: '/blocked-pubkeys',
++        icon: <StopOutlined />,
++      },
+       {
+         title: 'Nostr Statistics',
+         key: 'dataTables',

package.json

@@ -41,9 +41,10 @@ export const getUserActivities = (handleLogout: () => void): Promise<WalletTrans
     }
     // Assuming your backend response matches the WalletTransaction interface
     // eslint-disable-next-line
+    console.log("User Activity Data: ", data)
     return data.map((item: any) => ({
       id: item.ID,
-      witness_tx_id: item.WitnessTxId,
+      witness_tx_id: item.Address,
       date: new Date(item.Date).getTime(),
       output: item.Output,
       value: item.Value,