From 9729a4c7249fd831a8b3f2ea2596aeab195a0abd Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 13 Dec 2018 14:34:43 -0500
Subject: [PATCH] enpass json importer

---
 jslib                               | 2 +-
 src/app/tools/import.component.html | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jslib b/jslib
index 18ac2db323..e64fdf4e21 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 18ac2db3232735357f33b29b81ce2daeb9a85011
+Subproject commit e64fdf4e2137cfd28377ab02bf9967442eb599e7
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index 9559d724ba..677b7af1d6 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -84,6 +84,10 @@
             and save the CSV file. Note that the importer only supports files exported while Enpass is set to the English
             language, so adjust your settings accordingly.
         </ng-container>
+        <ng-container *ngIf="format === 'enpassjson'">
+            Using the Enpass 6 desktop application, click the menu button and navigate to "File" &rarr; "Export".
+            Select the ".json" file format option and save the JSON file.
+        </ng-container>
         <ng-container *ngIf="format === 'pwsafexml'">
             Using the Password Safe desktop application, navigate to "File" &rarr; "Export To" &rarr; "XML format..." and save the XML
             file.