4 files changed, 7 insertions, 12 deletions
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index fd4b01753..6e2a72f3a 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -1,5 +1,4 @@
 import { computed, observable, reaction } from "mobx";
-import * as rp from 'request-promise';
 import { DataSym, Doc, DocListCast, DocListCastAsync } from "../../fields/Doc";
 import { Id } from "../../fields/FieldSymbols";
 import { InkTool } from "../../fields/InkField";
@@ -16,9 +15,7 @@ import { Utils } from "../../Utils";
 import { DocServer } from "../DocServer";
 import { Docs, DocumentOptions, DocUtils } from "../documents/Documents";
 import { DocumentType } from "../documents/DocumentTypes";
-import { Networking } from "../Network";
 import { CollectionDockingView } from "../views/collections/CollectionDockingView";
-import { DimUnit } from "../views/collections/collectionMulticolumn/CollectionMulticolumnView";
 import { CollectionView, CollectionViewType } from "../views/collections/CollectionView";
 import { TreeView } from "../views/collections/TreeView";
 import { Colors } from "../views/global/globalEnums";
@@ -39,6 +36,7 @@ import { ColorScheme } from "./SettingsManager";
 import { SharingManager } from "./SharingManager";
 import { SnappingManager } from "./SnappingManager";
 import { UndoManager } from "./UndoManager";
+import * as rp from 'request-promise';
 
 interface Button {
     title?: string;
@@ -1386,7 +1384,7 @@ export class CurrentUserUtils {
             if (response) {
                 const result: { id: string, email: string, cacheDocumentIds: string } = JSON.parse(response);
                 Doc.CurrentUserEmail = result.email;
-                resolvedPorts = JSON.parse(await Networking.FetchFromServer("/resolvedPorts"));
+                resolvedPorts = JSON.parse(await (await fetch("/resolvedPorts")).text());
                 DocServer.init(window.location.protocol, window.location.hostname, resolvedPorts.socket, result.email);
                 result.cacheDocumentIds && (await DocServer.GetRefFields(result.cacheDocumentIds.split(";")));
                 return result;
diff --git a/src/client/util/History.ts b/src/client/util/History.ts
index cbe36b401..e6f75a7db 100644
--- a/src/client/util/History.ts
+++ b/src/client/util/History.ts
@@ -103,8 +103,7 @@ export namespace HistoryUtil {
                     return undefined;
                 }
                 const parser = requiredFields[required];
-                let value = opts[required];
-                value = parse(parser, value);
+                const value = parse(parser, opts[required]);
                 if (value !== null && value !== undefined) {
                     current[required] = value;
                 }
@@ -114,8 +113,7 @@ export namespace HistoryUtil {
                     continue;
                 }
                 const parser = optionalFields[opt];
-                let value = opts[opt];
-                value = parse(parser, value);
+                const value = parse(parser, opts[opt]);
                 if (value !== undefined) {
                     current[opt] = value;
                 }
diff --git a/src/client/util/Import & Export/DirectoryImportBox.tsx b/src/client/util/Import & Export/DirectoryImportBox.tsx
index 925b74efa..cf72cd0df 100644
--- a/src/client/util/Import & Export/DirectoryImportBox.tsx
+++ b/src/client/util/Import & Export/DirectoryImportBox.tsx
@@ -86,7 +86,7 @@ export class DirectoryImportBox extends React.Component<FieldViewProps> {
         for (let i = 0; i < files.length; i++) {
             const file = files.item(i);
             if (file && !unsupported.includes(file.type)) {
-                const ext = path.extname(file.name).toLowerCase();
+                const ext = file.name.replace(/.*\./, "").toLowerCase(); // path.extname(file.name).toLowerCase();
                 if (AcceptableMedia.imageFormats.includes(ext)) {
                     validated.push(file);
                 }
@@ -120,7 +120,7 @@ export class DirectoryImportBox extends React.Component<FieldViewProps> {
             }
             const { accessPaths, exifData } = result;
             const path = Utils.prepend(accessPaths.agnostic.client);
-            const document = await DocUtils.DocumentFromType(type, path, { _width: 300, title: name });
+            const document = type && await DocUtils.DocumentFromType(type, path, { _width: 300, title: name });
             const { data, error } = exifData;
             if (document) {
                 Doc.GetProto(document).exif = error || Doc.Get.FromJson({ data });
diff --git a/src/client/util/UndoManager.ts b/src/client/util/UndoManager.ts
index 44e44d335..d1f1a0099 100644
--- a/src/client/util/UndoManager.ts
+++ b/src/client/util/UndoManager.ts
@@ -1,5 +1,4 @@
 import { observable, action, runInAction } from "mobx";
-import 'source-map-support/register';
 import { Without } from "../../Utils";
 
 function getBatchName(target: any, key: string | symbol): string {
@@ -107,7 +106,7 @@ export namespace UndoManager {
     }
     export function FilterBatches(fieldTypes: string[]) {
         const fieldCounts: { [key: string]: number } = {};
-        const lastStack = UndoManager.undoStack.lastElement();
+        const lastStack = UndoManager.undoStack.slice(-1)[0];//.lastElement();
         if (lastStack) {
             lastStack.forEach(ev => fieldTypes.includes(ev.prop) && (fieldCounts[ev.prop] = (fieldCounts[ev.prop] || 0) + 1));
             const fieldCount2: { [key: string]: number } = {};