Merge branch 'master' into tma756-bugfix-onpress-tagg-on-sp

# Conflicts:
#	src/components/taggs/TaggsBar.tsx

12 files changed, 1 insertions, 0 deletions

diff --git a/src/assets/icons/compose.svg b/src/assets/icons/compose.svg
new file mode 100644
index 00000000..062e08cf
--- /dev/null
+++ b/src/assets/icons/compose.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 720 720"><defs><style>.cls-1,.cls-2,.cls-3{fill:none;}.cls-1,.cls-2{stroke:#828282;stroke-linecap:round;stroke-width:48px;}.cls-1,.cls-3{stroke-miterlimit:10;}.cls-2{stroke-linejoin:round;}.cls-3{stroke:#5c5b5e;stroke-width:0.91px;}</style></defs><path class="cls-1" d="M607.16,358.14V584.69c0,41.63-38,75.36-85,75.36H122.42c-46.91,0-84.93-33.73-84.93-75.36V168c0-41.62,38-75.4,84.93-75.4H412.23"/><path class="cls-2" d="M672.13,165.09l-289,290.8-52.62,19.66-81.11,30.28,27.77-83.35,17.06-51.26a2,2,0,0,1,.28-.32L585.59,78a60.89,60.89,0,0,1,86.54,0A61.87,61.87,0,0,1,672.13,165.09Z"/><line class="cls-3" x1="280.02" y1="283.62" x2="279.34" y2="283.87"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/cover-placeholder@2x.png b/src/assets/images/cover-placeholder@2x.png
index 402ac1fe..70294346 100644
--- a/src/assets/images/cover-placeholder@2x.png
+++ b/src/assets/images/cover-placeholder@2x.png
diff --git a/src/assets/images/cover-placeholder@3x.png b/src/assets/images/cover-placeholder@3x.png
index be87023d..66fa3ce1 100644
--- a/src/assets/images/cover-placeholder@3x.png
+++ b/src/assets/images/cover-placeholder@3x.png
diff --git a/src/assets/navigationIcons/chat-clicked.png b/src/assets/navigationIcons/chat-clicked.png
new file mode 100644
index 00000000..f62b4cf5
--- /dev/null
+++ b/src/assets/navigationIcons/chat-clicked.png
diff --git a/src/assets/navigationIcons/chat-clicked@2x.png b/src/assets/navigationIcons/chat-clicked@2x.png
new file mode 100644
index 00000000..4ce0f46a
--- /dev/null
+++ b/src/assets/navigationIcons/chat-clicked@2x.png
diff --git a/src/assets/navigationIcons/chat-clicked@3x.png b/src/assets/navigationIcons/chat-clicked@3x.png
new file mode 100644
index 00000000..bd3a1352
--- /dev/null
+++ b/src/assets/navigationIcons/chat-clicked@3x.png
diff --git a/src/assets/navigationIcons/chat-notifications.png b/src/assets/navigationIcons/chat-notifications.png
new file mode 100644
index 00000000..cffb5751
--- /dev/null
+++ b/src/assets/navigationIcons/chat-notifications.png
diff --git a/src/assets/navigationIcons/chat-notifications@2x.png b/src/assets/navigationIcons/chat-notifications@2x.png
new file mode 100644
index 00000000..22ae62db
--- /dev/null
+++ b/src/assets/navigationIcons/chat-notifications@2x.png
diff --git a/src/assets/navigationIcons/chat-notifications@3x.png b/src/assets/navigationIcons/chat-notifications@3x.png
new file mode 100644
index 00000000..98b1073d
--- /dev/null
+++ b/src/assets/navigationIcons/chat-notifications@3x.png
diff --git a/src/assets/navigationIcons/chat.png b/src/assets/navigationIcons/chat.png
new file mode 100644
index 00000000..cffb5751
--- /dev/null
+++ b/src/assets/navigationIcons/chat.png
diff --git a/src/assets/navigationIcons/chat@2x.png b/src/assets/navigationIcons/chat@2x.png
new file mode 100644
index 00000000..22ae62db
--- /dev/null
+++ b/src/assets/navigationIcons/chat@2x.png
diff --git a/src/assets/navigationIcons/chat@3x.png b/src/assets/navigationIcons/chat@3x.png
new file mode 100644
index 00000000..98b1073d
--- /dev/null
+++ b/src/assets/navigationIcons/chat@3x.png