diff -Nru manila-ui-7.0.0/debian/changelog manila-ui-7.0.0/debian/changelog
--- manila-ui-7.0.0/debian/changelog	2022-03-31 13:57:05.000000000 +0000
+++ manila-ui-7.0.0/debian/changelog	2022-04-25 13:58:21.000000000 +0000
@@ -1,3 +1,12 @@
+manila-ui (1:7.0.0-0ubuntu1.1) jammy; urgency=medium
+
+  * d/gbp.conf: Create stable/yoga branch.
+  * d/p/workaround-sdk-bug-in-listing-shares.patch: Cherry-picked
+    from upstream stable/yoga branch to fix listing of shares
+    in OpenStack dashboard (LP: #2003772).
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Mon, 25 Apr 2022 09:58:21 -0400
+
 manila-ui (1:7.0.0-0ubuntu1) jammy; urgency=medium
 
   * d/watch: Scope to 7.x series.
diff -Nru manila-ui-7.0.0/debian/gbp.conf manila-ui-7.0.0/debian/gbp.conf
--- manila-ui-7.0.0/debian/gbp.conf	2022-03-31 13:57:05.000000000 +0000
+++ manila-ui-7.0.0/debian/gbp.conf	2022-04-25 13:58:21.000000000 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = master
+debian-branch = stable/yoga
 upstream-tag = %(version)s
 pristine-tar = True
 
diff -Nru manila-ui-7.0.0/debian/patches/series manila-ui-7.0.0/debian/patches/series
--- manila-ui-7.0.0/debian/patches/series	2022-03-31 13:57:05.000000000 +0000
+++ manila-ui-7.0.0/debian/patches/series	2022-04-25 13:58:21.000000000 +0000
@@ -1,2 +1,3 @@
 add-MANIFEST.in-to-package-missing-files.patch
 manage.py-using-py3.patch
+workaround-sdk-bug-in-listing-shares.patch
diff -Nru manila-ui-7.0.0/debian/patches/workaround-sdk-bug-in-listing-shares.patch manila-ui-7.0.0/debian/patches/workaround-sdk-bug-in-listing-shares.patch
--- manila-ui-7.0.0/debian/patches/workaround-sdk-bug-in-listing-shares.patch	1970-01-01 00:00:00.000000000 +0000
+++ manila-ui-7.0.0/debian/patches/workaround-sdk-bug-in-listing-shares.patch	2022-04-25 13:58:21.000000000 +0000
@@ -0,0 +1,76 @@
+From 9fe5dab14351d622cb3d8778bbd4672088b1023f Mon Sep 17 00:00:00 2001
+From: Goutham Pacha Ravi <gouthampravi@gmail.com>
+Date: Wed, 13 Apr 2022 00:48:04 +0530
+Subject: [PATCH] Workaround SDK bug in listing shares
+
+python-manilaclient 3.3.0 [1] has a bug that causes the shares
+panel to fail to load with an error:
+
+Error: Unable to retrieve share list. Details
+'NoneType' object has no attribute 'pop'
+
+Workaround this problem so we don't have to add the client
+version to a block-list in the UI's requirements files.
+
+Closes-Bug: #1967312
+[1] https://pypi.org/project/python-manilaclient/3.3.0/
+
+Change-Id: I9e79972d9aca4fc7845f4d274751351d948f41ef
+Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
+(cherry picked from commit 3221aceb346fcbe55eec959d5934ac4d0ef18cbd)
+---
+ manila_ui/api/manila.py                                      | 1 +
+ manila_ui/tests/api/test_manila.py                           | 4 +++-
+ .../notes/bug-1967312-fix-shares-panel-8b5da4eee68ba6c4.yaml | 5 +++++
+ 3 files changed, 9 insertions(+), 1 deletion(-)
+ create mode 100644 releasenotes/notes/bug-1967312-fix-shares-panel-8b5da4eee68ba6c4.yaml
+
+diff --git a/manila_ui/api/manila.py b/manila_ui/api/manila.py
+index 43382ea..4af8020 100644
+--- a/manila_ui/api/manila.py
++++ b/manila_ui/api/manila.py
+@@ -88,6 +88,7 @@ def manilaclient(request):
+ 
+ 
+ def share_list(request, search_opts=None):
++    search_opts = search_opts or {}
+     return manilaclient(request).shares.list(search_opts=search_opts)
+ 
+ 
+diff --git a/manila_ui/tests/api/test_manila.py b/manila_ui/tests/api/test_manila.py
+index 911c1a3..bd5d84d 100644
+--- a/manila_ui/tests/api/test_manila.py
++++ b/manila_ui/tests/api/test_manila.py
+@@ -33,6 +33,7 @@ class ManilaApiTests(base.APITestCase):
+ 
+     @ddt.data(
+         {},
++        None,
+         {"name": "fake_share"},
+         {"limit": "3"},
+         {"host": "fake_share_host"},
+@@ -44,8 +45,9 @@ class ManilaApiTests(base.APITestCase):
+         self.assertEqual(
+             self.manilaclient.shares.list.return_value, result)
+ 
++        expected_kwargs = kwargs or {}
+         self.manilaclient.shares.list.assert_called_once_with(
+-            search_opts=kwargs)
++            search_opts=expected_kwargs)
+ 
+     def test_share_get(self):
+         api.share_get(self.request, self.id)
+diff --git a/releasenotes/notes/bug-1967312-fix-shares-panel-8b5da4eee68ba6c4.yaml b/releasenotes/notes/bug-1967312-fix-shares-panel-8b5da4eee68ba6c4.yaml
+new file mode 100644
+index 0000000..07f55b8
+--- /dev/null
++++ b/releasenotes/notes/bug-1967312-fix-shares-panel-8b5da4eee68ba6c4.yaml
+@@ -0,0 +1,5 @@
++---
++fixes:
++  - |
++    `Bug #1967312 <https://launchpad.net/bugs/1967312>`_ that caused the
++    shares dashboard to fail loading has now been fixed.
+-- 
+2.34.1
+