🐛 Fix possible crashes

likecoin · Aug 5, 2020 · 7e6e155 · 7e6e155
1 parent cd2c378
commit 7e6e155
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 28 deletions.
diff --git a/app/components/content-list/content-list.tsx b/app/components/content-list/content-list.tsx
@@ -56,7 +56,7 @@ export class ContentList extends React.Component<ContentListProps> {
   private onItemSwipeOpen = (key: string, ref: React.RefObject<SwipeRow<{}>>) => {
     Object.keys(this.listItemRefs).forEach((refKey: string) => {
       if (refKey !== key) {
-        this.listItemRefs[refKey].current.closeRow()
+        this.listItemRefs[refKey]?.current?.closeRow()
       }
     })
     this.listItemRefs[key] = ref
@@ -68,7 +68,7 @@ export class ContentList extends React.Component<ContentListProps> {
 
   private onScrollBeginDrag = () => {
     Object.keys(this.listItemRefs).forEach((refKey: string) => {
-      this.listItemRefs[refKey].current.closeRow()
+      this.listItemRefs[refKey]?.current?.closeRow()
     })
   }
 

diff --git a/app/screens/statistics-screen/statistics-rewarded-dashboard.tsx b/app/screens/statistics-screen/statistics-rewarded-dashboard.tsx
@@ -93,17 +93,20 @@ export class StatisticsRewardedDashbaord extends React.Component<Props> {
       title = getPeriodText ? getPeriodText() : ""
     }
 
-    const likeAmount = hasSelectedDayOfWeek
-      ? days[selectedDayOfWeek].totalLikeAmount
-      : weeklyLikeAmount
+    const likeAmount =
+      (hasSelectedDayOfWeek
+        ? days[selectedDayOfWeek]?.totalLikeAmount
+        : weeklyLikeAmount) || 0
 
-    const likeAmountFromCivicLikers = hasSelectedDayOfWeek
-      ? days[selectedDayOfWeek].totalCivicLikeAmount
-      : weeklyLikeAmountFromCivicLikers
+    const likeAmountFromCivicLikers =
+      (hasSelectedDayOfWeek
+        ? days[selectedDayOfWeek]?.totalCivicLikeAmount
+        : weeklyLikeAmountFromCivicLikers) || 0
 
-    const likeAmountFromCreatorFunds = hasSelectedDayOfWeek
-      ? days[selectedDayOfWeek].totalBasicLikeAmount
-      : weeklyLikeAmountFromCreatorsFund
+    const likeAmountFromCreatorFunds =
+      (hasSelectedDayOfWeek
+        ? days[selectedDayOfWeek]?.totalBasicLikeAmount
+        : weeklyLikeAmountFromCreatorsFund) || 0
 
     const dataItems: StatisticsDataGridItemProps[] = [
       {

diff --git a/app/screens/statistics-screen/statistics-supported-dashboard.tsx b/app/screens/statistics-screen/statistics-supported-dashboard.tsx
@@ -70,17 +70,21 @@ export class StatisticsSupportedDashbaord extends React.Component<Props> {
     } else {
       title = getPeriodText ? getPeriodText() : ""
     }
-    const likeAmount = hasSelectedDayOfWeek
-      ? days[selectedDayOfWeek].totalLikeAmount
-      : weekLikeAmount
 
-    const worksCount = hasSelectedDayOfWeek
-      ? days[selectedDayOfWeek].totalWorksCount
-      : weekWorksCount
+    const likeAmount =
+      (hasSelectedDayOfWeek
+        ? days[selectedDayOfWeek]?.totalLikeAmount
+        : weekLikeAmount) || 0
 
-    const creatorsCount = hasSelectedDayOfWeek
-      ? days[selectedDayOfWeek].totalCreatorsCount
-      : weekCreatorsCount
+    const worksCount =
+      (hasSelectedDayOfWeek
+        ? days[selectedDayOfWeek]?.totalWorksCount
+        : weekWorksCount) || 0
+
+    const creatorsCount =
+      (hasSelectedDayOfWeek
+        ? days[selectedDayOfWeek]?.totalCreatorsCount
+        : weekCreatorsCount) || 0
 
     return (
       <View

diff --git a/package.json b/package.json
@@ -117,7 +117,7 @@
     "npm-run-all": "4.1.5",
     "patch-package": "6.1.2",
     "postinstall-prepare": "1.0.1",
-    "prettier": "1.18.2",
+    "prettier": "^1.19.1",
     "react-devtools-core": "3.6.3",
     "react-native-dotenv": "^0.2.0",
     "react-native-svg-transformer": "^0.13.0",
@@ -146,19 +146,19 @@
     ]
   },
   "prettier": {
-    "printWidth": 100,
+    "printWidth": 80,
     "semi": false,
     "singleQuote": false,
     "trailingComma": "all"
   },
   "eslintConfig": {
     "parser": "@typescript-eslint/parser",
     "extends": [
-      "prettier",
+      "standard",
       "plugin:@typescript-eslint/recommended",
       "plugin:react/recommended",
       "plugin:react-native/all",
-      "standard"
+      "prettier"
     ],
     "parserOptions": {
       "ecmaFeatures": {
@@ -194,6 +194,7 @@
       "comma-dangle": 0,
       "no-unused-vars": 0,
       "no-undef": 0,
+      "no-unused-expressions": 0,
       "quotes": 0,
       "react/no-unescaped-entities": 0,
       "react-native/no-raw-text": 0,
@@ -205,6 +206,7 @@
       "@typescript-eslint/no-explicit-any": 0,
       "@typescript-eslint/no-object-literal-type-assertion": 0,
       "@typescript-eslint/no-empty-interface": 0,
+      "@typescript-eslint/no-unused-expressions": 1,
       "@typescript-eslint/no-var-requires": 0
     }
   }

diff --git a/yarn.lock b/yarn.lock
@@ -9204,10 +9204,10 @@ prepend-http@^1.0.1:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
-prettier@1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
-  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
+prettier@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
 pretty-format@^24.7.0, pretty-format@^24.9.0:
   version "24.9.0"