From 1e23ead8c62f86018f3f743bcde59363b56ef70e Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Thu, 18 Apr 2019 14:06:22 -0500
Subject: [PATCH] Add code to restore the state of previously expanded folders
 when accounts are collapsed and expanded.

---
 iOS/Master/MasterViewController.swift | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/iOS/Master/MasterViewController.swift b/iOS/Master/MasterViewController.swift
index 24750db74..def7fd0c6 100644
--- a/iOS/Master/MasterViewController.swift
+++ b/iOS/Master/MasterViewController.swift
@@ -604,10 +604,20 @@ private extension MasterViewController {
 		animatingChanges = true
 		
 		var indexPathsToInsert = [IndexPath]()
-		for i in 0..<expandNode.childNodes.count {
-			if let child = expandNode.childAtIndex(i) {
-				indexPathsToInsert.append(IndexPath(row: i, section: section))
-				shadowTable[section].insert(child, at: i)
+		var i = 0
+		
+		func addNode(_ node: Node) {
+			indexPathsToInsert.append(IndexPath(row: i, section: section))
+			shadowTable[section].insert(node, at: i)
+			i = i + 1
+		}
+		
+		for child in expandNode.childNodes {
+			addNode(child)
+			if expandedNodes.contains(child) {
+				for gChild in child.childNodes {
+					addNode(gChild)
+				}
 			}
 		}