resolving merge conflicts

1 files changed, 0 insertions, 37 deletions

diff --git a/app_expo/models/character-store/character-store.ts b/app_expo/models/character-store/character-store.ts
deleted file mode 100644
index 9751118..0000000
--- a/app_expo/models/character-store/character-store.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Instance, SnapshotOut, types } from 'mobx-state-tree'
-import { CharacterModel, CharacterSnapshot } from '../character/character'
-import { CharacterApi } from '../../services/api/character-api'
-import { withEnvironment } from '../extensions/with-environment'
-
-/**
- * Example store containing Rick and Morty characters
- */
-export const CharacterStoreModel = types
-  .model('CharacterStore')
-  .props({
-    characters: types.optional(types.array(CharacterModel), []),
-  })
-  .extend(withEnvironment)
-  .actions((self) => ({
-    saveCharacters: (characterSnapshots: CharacterSnapshot[]) => {
-      self.characters.replace(characterSnapshots)
-    },
-  }))
-  .actions((self) => ({
-    getCharacters: async () => {
-      const characterApi = new CharacterApi(self.environment.api)
-      const result = await characterApi.getCharacters()
-
-      if (result.kind === 'ok') {
-        self.saveCharacters(result.characters)
-      } else {
-        __DEV__ && console.tron.log(result.kind)
-      }
-    },
-  }))
-
-type CharacterStoreType = Instance<typeof CharacterStoreModel>
-export interface CharacterStore extends CharacterStoreType {}
-type CharacterStoreSnapshotType = SnapshotOut<typeof CharacterStoreModel>
-export interface CharacterStoreSnapshot extends CharacterStoreSnapshotType {}
-export const createCharacterStoreDefaultModel = () => types.optional(CharacterStoreModel, {})