diff --git a/package-lock.json b/package-lock.json
index 09dd5ed21a79..4797bfba16b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -144,7 +144,7 @@
         "electron-builder": "23.5.0",
         "electron-notarize": "^1.2.1",
         "eslint": "^7.6.0",
-        "eslint-config-expensify": "^2.0.31",
+        "eslint-config-expensify": "^2.0.36",
         "eslint-plugin-jest": "^24.1.0",
         "eslint-plugin-jsx-a11y": "^6.6.1",
         "eslint-plugin-react-hooks": "^4.6.0",
@@ -21919,11 +21919,10 @@
       }
     },
     "node_modules/eslint-config-expensify": {
-      "version": "2.0.31",
-      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.31.tgz",
-      "integrity": "sha512-ekIF8oDR3UD6wghyzP7M6Kf0QSVtkW9UH90vXdXsm67kkTOX9ej47KvI7yGemxLvk/vOmj2mzb+Kg3TihwnghA==",
+      "version": "2.0.36",
+      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.36.tgz",
+      "integrity": "sha512-8tQsyWhPUFRGJYCucTJd2FFVOOUQfsxGlGynVncCKgI96fmkagurhAu/zteszW0Ora6gAf7BkIuW6z6ZKKBdjg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "@lwc/eslint-plugin-lwc": "^0.11.0",
         "babel-eslint": "^10.1.0",
@@ -56055,9 +56054,9 @@
       }
     },
     "eslint-config-expensify": {
-      "version": "2.0.31",
-      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.31.tgz",
-      "integrity": "sha512-ekIF8oDR3UD6wghyzP7M6Kf0QSVtkW9UH90vXdXsm67kkTOX9ej47KvI7yGemxLvk/vOmj2mzb+Kg3TihwnghA==",
+      "version": "2.0.36",
+      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.36.tgz",
+      "integrity": "sha512-8tQsyWhPUFRGJYCucTJd2FFVOOUQfsxGlGynVncCKgI96fmkagurhAu/zteszW0Ora6gAf7BkIuW6z6ZKKBdjg==",
       "dev": true,
       "requires": {
         "@lwc/eslint-plugin-lwc": "^0.11.0",
diff --git a/package.json b/package.json
index 58f1ac7f5b8a..0624b4bb0924 100644
--- a/package.json
+++ b/package.json
@@ -176,7 +176,7 @@
     "electron-builder": "23.5.0",
     "electron-notarize": "^1.2.1",
     "eslint": "^7.6.0",
-    "eslint-config-expensify": "^2.0.31",
+    "eslint-config-expensify": "^2.0.36",
     "eslint-plugin-jest": "^24.1.0",
     "eslint-plugin-jsx-a11y": "^6.6.1",
     "eslint-plugin-react-hooks": "^4.6.0",
diff --git a/src/libs/Localize/index.js b/src/libs/Localize/index.js
index 6c68ae7016bc..24eb2e060064 100644
--- a/src/libs/Localize/index.js
+++ b/src/libs/Localize/index.js
@@ -76,7 +76,7 @@ function translateLocal(phrase, variables) {
  * @return {String}
  */
 function arrayToString(anArray) {
-    const and = this.translateLocal('common.and');
+    const and = translateLocal('common.and');
     let aString = '';
     if (_.size(anArray) === 1) {
         aString = anArray[0];
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index 1d38e7f87f78..e8993e12d042 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -1,8 +1,6 @@
 import React, {Component} from 'react';
-import {
-    SafeAreaView,
-    View,
-} from 'react-native';
+import {View} from 'react-native';
+import {SafeAreaView} from 'react-native-safe-area-context';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';