From e36514410964f2a92292bd7bafc9b69df0fb5784 Mon Sep 17 00:00:00 2001
From: shekhar-cis <shekhar.c@cisinlabs.com>
Date: Mon, 3 Oct 2022 13:22:59 +0530
Subject: [PATCH] Resolve conflicts

---
 src/bitmessagekivy/baseclass/common.py | 2 +-
 src/bitmessagekivy/main.kv             | 2 ++
 src/bitmessagekivy/screens_data.json   | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/bitmessagekivy/baseclass/common.py b/src/bitmessagekivy/baseclass/common.py
index f588176a..720f4245 100644
--- a/src/bitmessagekivy/baseclass/common.py
+++ b/src/bitmessagekivy/baseclass/common.py
@@ -44,7 +44,7 @@ data_screens = {
 
 def load_image_path():
     """Return the path of kivy images"""
-    image_path = os.path.abspath(os.path.join('images', 'kivy'))
+    image_path = os.path.abspath(os.path.join('pybitmessage', 'images', 'kivy'))
     return image_path
 
 
diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv
index 505ac1ba..7221c0d6 100644
--- a/src/bitmessagekivy/main.kv
+++ b/src/bitmessagekivy/main.kv
@@ -216,6 +216,8 @@ MDNavigationLayout:
             id:id_myaddress
         ScanScreen:
             id:id_scanscreen
+        Payment:
+            id:id_payment
     MDNavigationDrawer:
         id: nav_drawer
 
diff --git a/src/bitmessagekivy/screens_data.json b/src/bitmessagekivy/screens_data.json
index 590c0a1d..392b071a 100644
--- a/src/bitmessagekivy/screens_data.json
+++ b/src/bitmessagekivy/screens_data.json
@@ -11,5 +11,10 @@
     "Scanner": {
         "kv_string": "scan_screen",
         "Import": "from pybitmessage.bitmessagekivy.baseclass.scan_screen import ScanScreen"
+    },
+    "Payment": {
+        "kv_string": "payment",
+        "name_screen": "payment",
+        "Import": "from pybitmessage.bitmessagekivy.baseclass.payment import Payment"
     }
 }