Merge pull request #55 from Monobladegg/main

Fixed bug about loading Because of firebase
montelibero-org · Nov 9, 2024 · 780d3cc · 780d3cc
2 parents 6217aa7 + c9f13d3
commit 780d3cc
Show file tree

Hide file tree

Showing 10 changed files with 2,136 additions and 808 deletions.
diff --git a/.env.dist b/.env.dist
@@ -2,9 +2,9 @@
 
 NEXT_PUBLIC_FIREBASE_API_KEY=
 NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN=
+NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID=
 NEXT_PUBLIC_FIREBASE_PROJECT_ID=
 NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET=
-NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID=
 NEXT_PUBLIC_FIREBASE_APP_ID=
 
 # GitHub (optional)

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/shared/api/firebase/firestore/Transactions/getAllTransactions/index.ts b/src/shared/api/firebase/firestore/Transactions/getAllTransactions/index.ts
@@ -32,7 +32,8 @@ async function getAllTransactions(
   net: "public" | "testnet"
 ): Promise<TransactionData[]> {
   if (!firestore) {
-    throw new Error("Firestore not initialized");
+    console.warn("Firestore not initialized");
+    return [];
   }
 
   let collectionName: string;

diff --git a/src/shared/lib/processKeys/index.tsx b/src/shared/lib/processKeys/index.tsx
@@ -19,21 +19,13 @@ const processKeys = (
   let processedValue: string = value;
 
   // Convert regular expression strings to RegExp objects with boundaries and case-insensitive flag
-  const regexPatterns: { [type: string]: RegExp[] } = Object.entries(
+  Object.entries(
     dataKeys
   ).reduce((acc, [type, patterns]) => {
     acc[type] = patterns.map((pattern) => new RegExp(`^${pattern}$`, "i"));
     return acc;
   }, {} as { [type: string]: RegExp[] });
 
-  const isValidKey = Object.values(regexPatterns).some((patterns) =>
-    patterns.some((pattern) => pattern.test(key))
-  );
-
-  if (!isValidKey) {
-    console.log("")
-  }
-
   // Decode base64 value
   const decodedValue = decodeBase64(value);
 

diff --git a/src/shared/store/slices/firebase/firebaseSettingsSlice/index.ts b/src/shared/store/slices/firebase/firebaseSettingsSlice/index.ts
@@ -30,16 +30,27 @@ export const firebaseSettingsSlice: StateCreator<
       }
     }
 
-    const newFirebaseApp = initializeApp(config, name);
-    set({ firebaseApp: newFirebaseApp });
-
-    const newFirestore = getFirestore(newFirebaseApp);
-    set({ firestore: newFirestore });
+    if (
+      config.apiKey &&
+      config.appId &&
+      config.messagingSenderId &&
+      config.storageBucket &&
+      config.projectId &&
+      config.authDomain
+    ) {
+      const newFirebaseApp = initializeApp(config, name);
+      set({ firebaseApp: newFirebaseApp });
+
+      if (newFirebaseApp) {
+        const newFirestore = getFirestore(newFirebaseApp);
+        set({ firestore: newFirestore });
+        return newFirebaseApp;
+      }
+    }
 
-    return newFirebaseApp;
   };
 
-  const setFirestore = (newFirestore: Firestore) => {
+  const setFirestore = (newFirestore: Firestore | undefined) => {
     set({ firestore: newFirestore });
   };
 

diff --git a/src/shared/types/store/slices/firebase/firebaseSettingsSlice/index.ts b/src/shared/types/store/slices/firebase/firebaseSettingsSlice/index.ts
@@ -7,8 +7,11 @@ export interface FirebaseAppState {
 }
 
 export interface FirebaseAppActions {
-  initializeFirebase: (config: FirebaseOptions) => FirebaseApp;
-  setFirestore: (firestore: Firestore) => void;
+  initializeFirebase: (
+    config: FirebaseOptions,
+    appName?: string
+  ) => FirebaseApp | undefined;
+  setFirestore: (firestore: Firestore | undefined) => void;
 }
 
 interface IFirebaseSettingsSlice extends FirebaseAppState, FirebaseAppActions {}

diff --git a/src/views/Layout/layout.tsx b/src/views/Layout/layout.tsx
@@ -113,7 +113,7 @@ const PageLayout: FC<Props> = ({ children }) => {
         setLastFetchedHash(latestHash);
 
       } catch (error) {
-        console.error("Error fetching commit hash:", error);
+        console.warn("Error fetching commit hash:", error);
       }
     };
 
@@ -164,7 +164,6 @@ const PageLayout: FC<Props> = ({ children }) => {
         storageBucket: process.env.NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET,
         messagingSenderId: process.env.NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID,
         appId: process.env.NEXT_PUBLIC_FIREBASE_APP_ID,
-        measurementId: process.env.NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID,
       });
     } else {
       initializeFirebase({
@@ -176,7 +175,6 @@ const PageLayout: FC<Props> = ({ children }) => {
           "Firebase-messagingSenderId"
         )!,
         appId: window.localStorage.getItem("Firebase-appId")!,
-        measurementId: window.localStorage.getItem("Firebase-measurementId")!,
       });
     }
   }, []);

diff --git a/src/views/account/AccountInfo.tsx b/src/views/account/AccountInfo.tsx
@@ -57,6 +57,7 @@ const AccountInfo: FC<Props> = ({ ID }) => {
     setInformation,
     information,
     firestore,
+    firebaseApp,
   } = useStore(useShallow((state) => state));
   const [secondInformation, setSecondInformation] = useState<Information>();
   const [seqNumsIsStales, setSeqNumsIsStales] = useState<ISeqNumIsStale[]>([]);
@@ -83,13 +84,20 @@ const AccountInfo: FC<Props> = ({ ID }) => {
 
   useEffect(() => {
     if (
-      information?.signers &&
-      information.signers.length > 0 &&
-      (decodedTransactions === null || decodedTransactions.length > 0)
+      (information?.signers &&
+        information.signers.length > 0 &&
+        (decodedTransactions === null ||
+          (decodedTransactions.length > 0 && firestore && firebaseApp))) ||
+      (Array.isArray(decodedTransactions) &&
+        decodedTransactions.length === 0 &&
+        !firestore &&
+        !firebaseApp)
     ) {
       setIsLoading(false);
+    } else {
+      setIsLoading(true);
     }
-  }, [information, decodedTransactions]);
+  }, [information, decodedTransactions, firestore, firebaseApp]);
 
   useEffect(() => {
     const newCollapsesBlocks = { ...collapsesBlocks };
@@ -170,10 +178,6 @@ const AccountInfo: FC<Props> = ({ ID }) => {
     }
   }, [accounts, information.signers]);
 
-  useEffect(() => {
-    console.log(information.signers);
-  }, [information.signers]);
-
   useEffect(() => {
     setIsVisibleTx(false);
   }, [ID, accounts]);
@@ -267,31 +271,23 @@ const AccountInfo: FC<Props> = ({ ID }) => {
 
   useEffect(() => {
     const fetchTransactions = async () => {
-      try {
-        const transactions = await getAllTransactions(firestore, net);
-        setTransactionsFromFirebase(transactions);
+      const transactions = await getAllTransactions(firestore, net);
+      setTransactionsFromFirebase(transactions);
 
-        const decodedList: DecodedTransactions = [];
+      const decodedList: DecodedTransactions = [];
 
-        transactions.forEach(({ xdr }, index) => {
-          try {
-            const transaction = TransactionBuilder.fromXDR(
-              xdr,
-              network
-            ) as Transaction;
+      transactions.forEach(({ xdr }, index) => {
+        const transaction = TransactionBuilder.fromXDR(
+          xdr,
+          network
+        ) as Transaction;
 
-            if (transaction.source === ID) {
-              decodedList.push({ index, transaction });
-            }
-          } catch (error) {
-            console.error("Ошибка при декодировании транзакции:", error);
-          }
-        });
+        if (transaction.source === ID) {
+          decodedList.push({ index, transaction });
+        }
+      });
 
-        setDecodedTransactions(decodedList.length > 0 ? decodedList : null);
-      } catch (error) {
-        console.error("Ошибка при получении транзакций:", error);
-      }
+      setDecodedTransactions(decodedList.length > 0 ? decodedList : null);
     };
 
     if (net && ID) {
@@ -333,12 +329,6 @@ const AccountInfo: FC<Props> = ({ ID }) => {
     return [];
   }, [information?.signers]);
 
-  useEffect(() => {
-    console.log("collapsesBlocks.transactions", collapsesBlocks.transactions);
-    console.log("isVisibleTx", isVisibleTx);
-    console.log("decodedTransactions", decodedTransactions);
-  }, [decodedTransactions, isVisibleTx, collapsesBlocks.transactions]);
-
   return (
     <MainLayout>
       <div className="container">

diff --git a/src/views/account/main.tsx b/src/views/account/main.tsx
@@ -10,7 +10,7 @@ const Account: FC = () => {
   const [isValidId, setIsValidId] = useState<boolean | null>(null);
   const params = useSearchParams();
   const id: string | undefined | null = params?.get("id");
- 
+
   useEffect(() => {
     if (id) setIsValidId(StellarSdk.StrKey.isValidEd25519PublicKey(id));
   }, [id]);

diff --git a/src/widgets/Layout/Modals/FirebaseSettingsModal/ui/index.tsx b/src/widgets/Layout/Modals/FirebaseSettingsModal/ui/index.tsx
@@ -31,7 +31,6 @@ const FirebaseSettingsModal: FC = () => {
     storageBucket: "",
     messagingSenderId: "",
     appId: "",
-    measurementId: "",
   });
 
   const changeFormValue = (key: keyof FirebaseOptions, value: string) => {
@@ -58,8 +57,6 @@ const FirebaseSettingsModal: FC = () => {
       messagingSenderId:
         window.localStorage.getItem("Firebase-messagingSenderId") ?? "",
       appId: window.localStorage.getItem("Firebase-appId") ?? "",
-      measurementId:
-        window.localStorage.getItem("Firebase-measurementId") ?? "",
     });
     setCurrentFirebase(
       (window.localStorage.getItem(
@@ -79,8 +76,6 @@ const FirebaseSettingsModal: FC = () => {
         messagingSenderId:
           window.localStorage.getItem("Firebase-messagingSenderId") ?? "",
         appId: window.localStorage.getItem("Firebase-appId") ?? "",
-        measurementId:
-          window.localStorage.getItem("Firebase-measurementId") ?? "",
       });
     } else {
       initializeFirebase({
@@ -90,7 +85,6 @@ const FirebaseSettingsModal: FC = () => {
         storageBucket: process.env.NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET,
         messagingSenderId: process.env.NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID,
         appId: process.env.NEXT_PUBLIC_FIREBASE_APP_ID,
-        measurementId: process.env.NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID,
       });
 
       console.log(firebaseApp);