Merge pull request #8 from daostack/modal-service-nesting-fix-2

Fix modal service nesting ; remove unnecessary console log

src/arc.ts

@@ -127,7 +127,6 @@ export async function initializeArc(provider?: Web3Provider): Promise<boolean> {
         return (count !== 10);
       },
       delay: () => {
-        console.log(Math.floor(Math.random() * (30000 - 5000 + 1) + 5000));
         // This will give a random delay between retries between the range of 5 to 30 seconds.
         return Math.floor(Math.random() * (30000 - 5000 + 1) + 5000);
       },

src/lib/proposalUtils.ts

@@ -80,27 +80,27 @@ export function restoreModalFormEntries(name: string): { [key: string]: any } {
   if (valuesString) {
     sessionStorage.removeItem(formValuesKey(name));
     try {
-      const values = JSON.parse(valuesString);
-
-      const processValue = (key: string): void => {
+      const rootValues = JSON.parse(valuesString);
+      const processValue = (values: { [key: string]: any }, key: string): void => {
         const value = values[key];
         // Moment interprets something like "100" as a date
         if (typeof value === "string" && isNaN(value as any)) {
           const date = moment(value);
           if (date?.isValid()) {
             values[key] = date;
           }
+        } else if (typeof value === "object") {
+          Object.keys(value).map((key: string) => processValue(value, key));
         }
       };
       /**
        * convert ISO date/time strings to Moment object
        */
-      Object.keys(values).map(processValue);
-      return values;
+      Object.keys(rootValues).map((key: string) => processValue(rootValues, key));
+      return rootValues;
     }
     // eslint-disable-next-line no-empty
     catch { }
   }
-
   return {};
 }