chore(release): Production v1.6.8 (#571)

* test: Add detox with a simple e2e test (#396) * Try with latest detox * Try on Github action * Fix syntax * Generate app.json * Remove test * Show yarn start output * Try tunnel * Correct start command * No tunnel * Give some buffer * Record videos * Fix command * Always upload artifact * Update version * Add a waitFor * Timeout 3min * 30 min timeout * Add timeout for 1st test * Add console * reloadApp beforeAll * ci: Use only one job for production (#537) * chore(deps): Bump @apollo/client from 3.0.0-beta.41 to 3.0.0-beta.43 (#539) Bumps [@apollo/client](https://github.com/apollographql/apollo-client) from 3.0.0-beta.41 to 3.0.0-beta.43. - [Release notes](https://github.com/apollographql/apollo-client/releases) - [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md) - [Commits](apollographql/apollo-client@v3.0.0-beta.41...v3.0.0-beta.43) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * chore(deps): Bump expo-font from 8.1.0 to 8.1.1 (#542) Bumps [expo-font](https://github.com/expo/expo/tree/HEAD/packages/expo-font) from 8.1.0 to 8.1.1. - [Release notes](https://github.com/expo/expo/releases) - [Changelog](https://github.com/expo/expo/blob/master/packages/expo-font/CHANGELOG.md) - [Commits](https://github.com/expo/expo/commits/HEAD/packages/expo-font) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * chore(deps): Bump date-fns from 2.11.1 to 2.12.0 (#538) Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.11.1 to 2.12.0. - [Release notes](https://github.com/date-fns/date-fns/releases) - [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md) - [Commits](date-fns/date-fns@v2.11.1...v2.12.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * chore(deps): Bump @types/react-native from 0.62.1 to 0.62.2 (#545) Bumps [@types/react-native](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-native) from 0.62.1 to 0.62.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-native) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * chore(deps): Bump @types/i18n-js from 3.0.1 to 3.0.2 (#540) Bumps [@types/i18n-js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/i18n-js) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/i18n-js) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * fix(deps): Update Expo to 37.0.7 (#548) * chore(deps): Bump @apollo/react-hooks from 3.1.4 to 3.1.5 (#553) Bumps [@apollo/react-hooks](https://github.com/apollographql/react-apollo) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/apollographql/react-apollo/releases) - [Changelog](https://github.com/apollographql/react-apollo/blob/@apollo/react-hooks@3.1.5/Changelog.md) - [Commits](https://github.com/apollographql/react-apollo/compare/@apollo/react-hooks@3.1.4...@apollo/react-hooks@3.1.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * chore(deps): Bump detox from 16.1.1 to 16.2.1 (#555) Bumps [detox](https://github.com/wix/Detox) from 16.1.1 to 16.2.1. - [Release notes](https://github.com/wix/Detox/releases) - [Commits](wix/Detox@16.1.1...16.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * fix: Improve translations slightly (#556) * chore(release): 1.6.3 * fix: Fix production.yml not running on CI (#557) * Try GITHB)REF * try * Try with set-env * Remove id vars * Should work * chore(release): 1.6.4 * fix: Remove Apollo warning about cache (#558) * fix: Remove Apollo warning about cache * Update Apollo Client * Lint all files * Regenerate yarn * chore(release): 1.6.5 * chore(deps): Bump @types/react-native from 0.60.31 to 0.62.4 (#566) Bumps [@types/react-native](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-native) from 0.60.31 to 0.62.4. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-native) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * chore(deps): Bump detox from 16.2.1 to 16.3.0 (#559) Bumps [detox](https://github.com/wix/Detox) from 16.2.1 to 16.3.0. - [Release notes](https://github.com/wix/Detox/releases) - [Commits](wix/Detox@16.2.1...16.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * fix(deps): Bump expo to 37.0.8 (#567) * fix: Use our own FCM credentials (#568) * fix: Use our own FCM credentials * Only add googleServicesFile if necessary * timeout 10s * chore(release): 1.6.6 * fix: Fix production build (#569) * Try * Fix generate script * chore(release): 1.6.7 * fix: Fix using staging URL in prod (#570) * chore(release): 1.6.8 Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
shootismoke · Apr 28, 2020 · aa9f24a · aa9f24a
1 parent 638a6f8
commit aa9f24a
Show file tree

Hide file tree

Showing 34 changed files with 2,903 additions and 506 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -1,21 +1,56 @@
 name: pr
 
-on: [pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+      - 'production-v*.*'
+
+env:
+  SIS_HAWK_KEY: ${{ secrets.SIS_STAGING_HAWK_KEY }}
+  SIS_SENTRY_ORG: ${{ secrets.SIS_STAGING_SENTRY_ORG }}
+  SIS_SENTRY_PROJECT: ${{ secrets.SIS_STAGING_SENTRY_PROJECT }}
+  SIS_SENTRY_AUTH_TOKEN: ${{ secrets.SIS_STAGING_SENTRY_AUTH_TOKEN }}
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Run yarn lint
-        run: |
-          yarn install
-          yarn lint
-  test:
-    runs-on: ubuntu-latest
+      - run: yarn install
+      - run: yarn lint
+
+  test-e2e:
+    runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Run yarn test
+      - uses: expo/expo-github-action@v5
+        with:
+          expo-version: 3.x
+          expo-cache: true
+      - name: Install applesimutils
+        run: |
+          brew tap wix/brew
+          brew install applesimutils
+      - run: yarn install
+      - name: Generate staging app.json
+        run: ./scripts/generateAppJson.js > app.json
+      - name: Download ExpoClient binary
+        run: ./e2e/dl_expo_bins.sh
+      - name: Run E2E Tests
         run: |
-          yarn install
-          yarn test
+          # Start packager in background
+          yarn start >/dev/null &
+          PID=$(ps $! | tail -1 | awk '{print $1}')
+          # Run e2e test
+          yarn test:e2e
+          # Kill packager
+          kill $PID
+      - uses: actions/upload-artifact@master
+        if: always()
+        with:
+          name: test-e2e-artifacts
+          path: ./artifacts
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -10,41 +10,20 @@ on:
 env:
   SIS_AQICN_TOKEN: ${{ secrets.SIS_PRODUCTION_AQICN_TOKEN }}
   SIS_AMPLITUDE_API_KEY: ${{ secrets.SIS_PRODUCTION_AMPLITUDE_API_KEY }}
+  SIS_BACKEND_URL: https://shootismoke.now.sh/api/graphql
   SIS_HAWK_KEY: ${{ secrets.SIS_PRODUCTION_HAWK_KEY }}
   SIS_SENTRY_PUBLIC_DNS: ${{ secrets.SIS_PRODUCTION_SENTRY_PUBLIC_DNS }}
   SIS_SENTRY_ORG: ${{ secrets.SIS_PRODUCTION_SENTRY_ORG }}
   SIS_SENTRY_PROJECT: ${{ secrets.SIS_PRODUCTION_SENTRY_PROJECT }}
   SIS_SENTRY_AUTH_TOKEN: ${{ secrets.SIS_PRODUCTION_SENTRY_AUTH_TOKEN }}
+  SIS_GOOGLE_SERVICES_JSON: ${{ secrets.SIS_PRODUCTION_GOOGLE_SERVICES_JSON }}
   SIS_ANDROID_GOOGLE_MAPS_KEY: ${{ secrets.SIS_PRODUCTION_ANDROID_GOOGLE_MAPS_KEY }}
   SIS_IOS_GOOGLE_MAPS_KEY: ${{ secrets.SIS_PRODUCTION_IOS_GOOGLE_MAPS_KEY }}
 
 jobs:
-  # Publish to the current production release channel
-  expo-production-publish:
-    if: startsWith(github.ref, 'refs/heads/production-v') # On production-v* branches
+  # Build native binaries on production release channel
+  expo-production:
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-      - uses: expo/expo-github-action@v5
-        with:
-          expo-version: 3.x
-          expo-username: ${{ secrets.EXPO_CLI_USERNAME }}
-          expo-password: ${{ secrets.EXPO_CLI_PASSWORD }}
-          expo-cache: true
-      - run: yarn install
-      - name: Set GITHUB_BRANCH # Will be production-v*.*
-        id: vars
-        run: echo ::set-output name=GITHUB_BRANCH::${GITHUB_REF:11} # Remove refs/heads/
-      - name: Generate production app.json
-        run: ./scripts/generateAppJson.js
-      - run: expo publish --release-channel=${{ steps.vars.outputs.GITHUB_BRANCH }}
-
-  # Build native binaries for testing or uploading to store
-  expo-production-binaries:
-    if: startsWith(github.ref, 'refs/tags/v') # On v* tags
     strategy:
       matrix:
         build: [android-apk, android-app-bundle, ios]
@@ -59,7 +38,6 @@ jobs:
       # expo-cli can only run one build at a time
       # https://github.com/expo/expo-cli/issues/1820
       max-parallel: 1
-    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
@@ -72,9 +50,14 @@ jobs:
           expo-password: ${{ secrets.EXPO_CLI_PASSWORD }}
           expo-cache: true
       - run: yarn install
-      - name: Set GITHUB_TAG # Will be v*.*.*
-        id: vars
-        run: echo ::set-output name=GITHUB_TAG::${GITHUB_REF:10} # Remove /refs/tags/
+      - name: Set RELEASE_CHANNEL env variable # Will be v*.* (major.minor)
+        if: startsWith(github.ref, 'refs/heads/production-v')
+        run: echo ::set-env name=RELEASE_CHANNEL::${GITHUB_REF:22} # Remove refs/heads/production-
+      - name: Set RELEASE_CHANNEL env variable # Will be v*.*.* (major.minor.patch)
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: echo ::set-env name=RELEASE_CHANNEL::${GITHUB_REF:10} # Remove refs/tags/
       - name: Generate production app.json
-        run: ./scripts/generateAppJson.js
-      - run: expo ${{ matrix.expo_build_command }} --release-channel=production-${{ steps.vars.outputs.GITHUB_TAG }}
+        run: |
+          ./scripts/generateAppJson.js > app.json
+          ./scripts/generateGoogleServicesJson.js > google-services.json
+      - run: expo ${{ matrix.expo_build_command }} --release-channel=production-${{ env.RELEASE_CHANNEL }}
diff --git a/.github/workflows/master.yml → .github/workflows/staging.yml b/.github/workflows/master.yml → .github/workflows/staging.yml
@@ -12,7 +12,7 @@ env:
   SIS_SENTRY_AUTH_TOKEN: ${{ secrets.SIS_STAGING_SENTRY_AUTH_TOKEN }}
 
 jobs:
-  expo-publish-staging:
+  expo-staging:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -27,5 +27,5 @@ jobs:
           expo-cache: true
       - run: yarn install
       - name: Generate staging app.json
-        run: ./scripts/generateAppJson.js
+        run: ./scripts/generateAppJson.js > app.json
       - run: expo publish
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 # expo
 .expo/
 .tmp/
+bin/
 
 # dependencies
 /node_modules
@@ -24,6 +25,7 @@ yarn-error.log*
 app.json
 app.staging.json
 app.production.json
+google-services.json
 
 # ide files
 .idea/
diff --git a/App/Screens/About/About.tsx b/App/Screens/About/About.tsx
@@ -182,7 +182,7 @@ export function About(props: AboutProps): React.ReactElement {
       </View>
 
       <ScrollIntoView
-        onMount={route.params.scrollInto === 'aboutBetaInaccurate'}
+        onMount={route.params?.scrollInto === 'aboutBetaInaccurate'}
         style={styles.section}
       >
         <Text style={styles.h2}>{t('about_beta_inaccurate_title')}</Text>
@@ -207,7 +207,7 @@ export function About(props: AboutProps): React.ReactElement {
       </View>
 
       <ScrollIntoView
-        onMount={route.params.scrollInto === 'aboutWhyIsTheStationSoFarTitle'}
+        onMount={route.params?.scrollInto === 'aboutWhyIsTheStationSoFarTitle'}
         style={styles.section}
       >
         <Text style={styles.h2}>

diff --git a/App/Screens/Details/Header/Header.tsx b/App/Screens/Details/Header/Header.tsx
@@ -122,9 +122,9 @@ export function Header(props: HeaderProps): React.ReactElement {
           />
           {renderInfo(
             t('details_header_latest_update_label'),
-            `${formatDistanceToNow(new Date(api.pm25.date.local))} ${t(
-              'details_header_latest_update_ago'
-            )}`
+            t('details_header_latest_update_ago', {
+              time: formatDistanceToNow(new Date(api.pm25.date.local)),
+            })
           )}
           {renderInfo(
             t('details_header_primary_pollutant_label'),

diff --git a/App/Screens/ErrorScreen/ErrorScreen.tsx b/App/Screens/ErrorScreen/ErrorScreen.tsx
@@ -26,6 +26,7 @@ import { t } from '../../localization';
 import { ErrorContext } from '../../stores';
 import { track, trackScreen } from '../../util/amplitude';
 import { sentryError } from '../../util/sentry';
+import { testIds } from '../../util/testId';
 import * as theme from '../../util/theme';
 import { ErrorStackParams } from '../routeParams';
 
@@ -72,7 +73,7 @@ export function ErrorScreen(props: ErrorScreenProps): React.ReactElement {
   }, [error]);
 
   return (
-    <View style={styles.container}>
+    <View style={styles.container} testID={testIds.Error.screen}>
       <Image source={errorPicture} />
       <View>
         <Text style={styles.errorText}>
@@ -92,7 +93,10 @@ export function ErrorScreen(props: ErrorScreenProps): React.ReactElement {
       </Button>
       <Text style={theme.text}>{t('error_screen_error_description')}</Text>
       <ScrollView style={styles.errorScrollView}>
-        <TouchableOpacity onPress={(): void => setShowDetails(!showDetails)}>
+        <TouchableOpacity
+          onPress={(): void => setShowDetails(!showDetails)}
+          testID={testIds.Error.showDetails}
+        >
           {showDetails ? (
             <Text style={styles.errorMessage}>
               {t('error_screen_error_message', {

diff --git a/App/Screens/Search/fetchAlgolia.ts b/App/Screens/Search/fetchAlgolia.ts
@@ -91,7 +91,7 @@ export function fetchAlgolia(
                   query: search,
                 },
                 {
-                  timeout: 5000,
+                  timeout: 10000,
                 }
               ),
             'fetchAlgolia'

diff --git a/App/localization/languages/en.json b/App/localization/languages/en.json
@@ -81,7 +81,7 @@
   "details_air_quality_station_marker": "Air Quality Station",
   "details_your_position_marker": "Your position",
   "details_header_latest_update_label": "Latest Update:",
-  "details_header_latest_update_ago": "ago",
+  "details_header_latest_update_ago": "{{time}} ago",
   "details_header_primary_pollutant_label": "Primary Pollutant:",
   "details_distance_label": "AQI Station: {{distanceToStation}}{{distanceUnit}} away",
   "distance_unit_short_km": "km",

diff --git a/App/localization/languages/es.json b/App/localization/languages/es.json
@@ -68,7 +68,7 @@
   "home_wait_more_days": "{{days}} dias mas",
   "home_wait_until_results": "para enseñar sus resultados",
   "search_current_location": "Su ubicación presentemente",
-  "details_header_latest_update_ago": "hace",
+  "details_header_latest_update_ago": "hace {{time}}",
   "distance_unit": "km",
   "haversine_distance_unit": "km",
   "past_stations_loading": "Cargando",

diff --git a/App/localization/languages/fr.json b/App/localization/languages/fr.json
@@ -68,7 +68,7 @@
   "home_wait_more_days": "{{days}} plus de jours",
   "home_wait_until_results": "Vos résultats",
   "search_current_location": "Votre position",
-  "details_header_latest_update_ago": "depuis",
+  "details_header_latest_update_ago": "il y a {{time}}",
   "distance_unit": "km",
   "haversine_distance_unit": "km",
   "past_stations_loading": "Chargement",

diff --git a/App/localization/languages/it.json b/App/localization/languages/it.json
@@ -47,7 +47,7 @@
   "details_air_quality_station_marker": "Stazione Qualità Aria",
   "details_your_position_marker": "La tua posizione",
   "details_header_latest_update_label": "Ultimo aggiornamento:",
-  "details_header_latest_update_ago": "fa",
+  "details_header_latest_update_ago": "fa {{time}}",
   "details_header_primary_pollutant_label": "Primary Pollutant:",
   "details_distance_label": "Stazione AQI: {{distanceToStation}}{{distanceUnit}} lontano",
   "distance_unit_short_km": "km",

diff --git a/App/localization/languages/kr.json b/App/localization/languages/kr.json
@@ -68,7 +68,7 @@
   "home_wait_more_days": "{{days}} 일 더",
   "home_wait_until_results": "결과 표시",
   "search_current_location": "당신의 현재 위치",
-  "details_header_latest_update_ago": "전에",
+  "details_header_latest_update_ago": "전에 {{time}}",
   "distance_unit": "킬로미터",
   "haversine_distance_unit": "킬로미터",
   "past_stations_loading": "로딩중",

diff --git a/App/localization/languages/ru.json b/App/localization/languages/ru.json
@@ -47,7 +47,7 @@
   "details_air_quality_station_marker": "Станция определения качества воздуха (AQI)",
   "details_your_position_marker": "Ваше местоположение",
   "details_header_latest_update_label": "Последнее обновление:",
-  "details_header_latest_update_ago": "тому назад",
+  "details_header_latest_update_ago": "тому назад {{time}}",
   "details_header_primary_pollutant_label": "Основной загрязнитель:",
   "details_distance_label": "Расстояние до AQI станции: {{distanceToStation}}{{distanceUnit}}",
   "distance_unit_short_km": "км",

diff --git a/App/localization/languages/sv.json b/App/localization/languages/sv.json
@@ -47,7 +47,7 @@
   "details_air_quality_station_marker": "Luftkvalitetsstation",
   "details_your_position_marker": "Din position",
   "details_header_latest_update_label": "Senaste uppdatering:",
-  "details_header_latest_update_ago": "sedan",
+  "details_header_latest_update_ago": "sedan {{time}}",
   "details_header_primary_pollutant_label": "Huvudsakligt förorenande ämne:",
   "details_distance_label": "LKS Station: {{distanceToStation}}{{distanceUnit}} away",
   "distance_unit_short_km": "km",

diff --git a/App/localization/languages/ua.json b/App/localization/languages/ua.json
@@ -47,7 +47,7 @@
   "details_air_quality_station_marker": "Станція моніторингу повітря",
   "details_your_position_marker": "Твоє положення",
   "details_header_latest_update_label": "Останнє оновлення:",
-  "details_header_latest_update_ago": "назад",
+  "details_header_latest_update_ago": "назад {{time}}",
   "details_header_primary_pollutant_label": "Основний забрудник:",
   "details_distance_label": "Станція в {{distanceToStation}}{{distanceUnit}} звідси",
   "distance_unit_short_km": "км",

diff --git a/App/localization/languages/zh-tw.json b/App/localization/languages/zh-tw.json
@@ -68,7 +68,7 @@
   "home_wait_more_days": "{{days}} 更多天",
   "home_wait_until_results": "顯示你的結果",
   "search_current_location": "你現在的位置",
-  "details_header_latest_update_ago": "之前",
+  "details_header_latest_update_ago": "{{time}} 之前",
   "distance_unit": "公里",
   "haversine_distance_unit": "公里",
   "past_stations_loading": "載入中",

diff --git a/App/stores/apollo.ts b/App/stores/apollo.ts
@@ -27,7 +27,6 @@ import { persistCache } from 'apollo-cache-persist';
 import Constants from 'expo-constants';
 import { AsyncStorage } from 'react-native';
 
-import { IS_PROD } from '../util/constants';
 import { sentryError } from '../util/sentry';
 import {
   credentials,
@@ -36,10 +35,6 @@ import {
   hawkFetch,
 } from './util';
 
-const BACKEND_URI = IS_PROD
-  ? 'https://shootismoke.now.sh/api/graphql'
-  : 'https://staging.shootismoke.now.sh/api/graphql';
-
 // FIXME Which type should this have?
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type TCacheShape = any;
@@ -106,7 +101,10 @@ export async function getApolloClient(): Promise<ApolloClient<TCacheShape>> {
       // Retry on error
       new RetryLink(),
       // Classic HTTP link
-      createHttpLink({ fetch: hawkFetch(BACKEND_URI), uri: BACKEND_URI }),
+      createHttpLink({
+        fetch: hawkFetch(Constants.manifest.extra.backendUrl),
+        uri: Constants.manifest.extra.backendUrl,
+      }),
     ]),
     name: 'shootismoke-expo',
     typeDefs: [userSchema],

diff --git a/App/stores/util/gql.ts b/App/stores/util/gql.ts
@@ -48,7 +48,6 @@ type DeepPartial<T> = {
 
 const GET_USER = gql`
   query getUser($expoInstallationId: ID!) {
-    __typename
     getUser(expoInstallationId: $expoInstallationId) {
       __typename
       _id
@@ -63,7 +62,6 @@ const GET_USER = gql`
 
 const CREATE_USER = gql`
   mutation createUser($input: CreateUserInput!) {
-    __typename
     createUser(input: $input) {
       __typename
       _id
@@ -78,7 +76,6 @@ const CREATE_USER = gql`
 
 const UPDATE_USER = gql`
   mutation updateUser($expoInstallationId: ID!, $input: UpdateUserInput!) {
-    __typename
     updateUser(expoInstallationId: $expoInstallationId, input: $input) {
       __typename
       _id