From fa8659881694f56dedfeae395e44b41e4f89b78d Mon Sep 17 00:00:00 2001
From: Definitely Not Vlad <vlad@definitely-not-vlad.com>
Date: Tue, 10 Jan 2023 13:27:54 +0100
Subject: [PATCH 1/2] Default to Rubik-Regular for fontName when resolving font
 family

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 theme.js          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4f54c8d8..4aa10744 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/ui",
-  "version": "6.1.1",
+  "version": "6.1.2-rc.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 4185d71d..efda9eb0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/ui",
-  "version": "6.1.1",
+  "version": "6.1.2-rc.0",
   "description": "Styleable set of components for React Native applications",
   "scripts": {
     "lint": "eslint .",
diff --git a/theme.js b/theme.js
index 85c50cb2..ad0fe741 100644
--- a/theme.js
+++ b/theme.js
@@ -68,7 +68,7 @@ export function responsiveHeight(dimension, actualRefVal = window.height) {
 // 'fontWeight' and 'fontStyle' aren't always supplied for every component, so we're setting default
 // values of 'normal'.
 export function resolveFontFamily(
-  fontName,
+  fontName = 'Rubik-Regular',
   fontWeight = 'normal',
   fontStyle = 'normal',
 ) {

From f9f306fbfe52995eb48b8456a9e0c7585883c15c Mon Sep 17 00:00:00 2001
From: Definitely Not Vlad <vlad@definitely-not-vlad.com>
Date: Tue, 10 Jan 2023 15:12:46 +0100
Subject: [PATCH 2/2] Remove rc sufix

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4aa10744..a47fa6a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/ui",
-  "version": "6.1.2-rc.0",
+  "version": "6.1.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index efda9eb0..43c770f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/ui",
-  "version": "6.1.2-rc.0",
+  "version": "6.1.2",
   "description": "Styleable set of components for React Native applications",
   "scripts": {
     "lint": "eslint .",