Revert "ramin/merge_dev_into_master (#260)"

This reverts commit b12c641.

Author: ramin-deriv

.circleci/config.yml

@@ -2,49 +2,43 @@ version: 2.1
 executors:
   flutter_executor:
     docker:
-      - image: cirrusci/flutter:2.10.5
+      - image: cirrusci/flutter:stable
     environment:
-      _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport"
+      _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
 
 commands:
   prepare_enviroment:
     description: Fetch the repo, do flutter doctor and install deps
     steps:
       - add_ssh_keys:
           fingerprints:
-            - 85:5e:13:f8:60:b2:55:a1:df:d1:8e:77:17:4c:3b:2d
+          - 26:72:b1:08:0f:c1:3b:2b:2d:ea:61:7d:d6:11:63:fb
       - checkout
       - run:
           name: Run Flutter doctor
           command: flutter doctor
       - restore_cache:
           keys:
-            - android-sdk-licenses
-            - gradle
-            - pub-cache
-            - bin
+              - android-sdk-licenses
+              - gradle
+              - pub-cache
+              - bin
       - run:
           name: pub get
           command: flutter pub get
 
-  analyze_code:
-    description: Do flutter analyze
-    steps:
-      - run:
-          name: Code analysis
-          command: flutter analyze --no-pub
-
   code_coverage:
     description: Do prebuild stuff
     steps:
       - run:
           name: Run the application tests
           command: flutter test --coverage
+
       - run:
           name: Upload coverage
           command: |
-            sudo gem install coveralls-lcov
-            coveralls-lcov -t $COVERALLS_REPO_TOKEN coverage/lcov.info
+                sudo gem install coveralls-lcov
+                coveralls-lcov -t $COVERALLS_REPO_TOKEN coverage/lcov.info
 
   build_app:
     description: Build the app
@@ -68,38 +62,37 @@ commands:
       - run:
           name: Check that we can build for all Android platforms
           command: |
-            flutter build -v << parameters.file_type >>  << parameters.buildNumber >> --<< parameters.mode >> << parameters.target >>
+              flutter build -v << parameters.file_type >>  << parameters.buildNumber >> --<< parameters.mode >> << parameters.target >>
           working_directory: <<parameters.working_directory>>
 
   save_env_cache:
-    description: Save the caches
+    description: Save the caches 
     steps:
       - save_cache:
           key: android-sdk-licenses
           paths:
-            - /opt/android-sdk-linux/licenses
+              - /opt/android-sdk-linux/licenses
 
       - save_cache:
           key: pub-cache
           paths:
-            - /home/cirrus/.pub-cache
+              - /home/cirrus/.pub-cache
 
       - save_cache:
           key: gradle
           paths:
-            - ~/.gradle
+              - ~/.gradle
 
       - save_cache:
           key: bin
           paths:
-            - /usr/local/bin
+              - /usr/local/bin
 
 jobs:
   build_pr:
     executor: flutter_executor
     steps:
       - prepare_enviroment
-      - analyze_code
       - code_coverage
       - build_app:
           target: "--target-platform android-arm,android-arm64,android-x86,android-x64"
@@ -108,25 +101,25 @@ jobs:
       - run:
           name: Copy APK
           command: |
-            sudo mkdir -p /artifacts && sudo chown "$(whoami)" /artifacts && cp build/app/outputs/flutter-apk/app-debug.apk /artifacts/deriv-chart.apk
+              sudo mkdir -p /artifacts && sudo chown "$(whoami)" /artifacts && cp build/app/outputs/apk/app.apk /artifacts/p2p-cashier.apk
           working_directory: ~/project/example
 
       - store_artifacts:
           path: /artifacts
-      # - run:
-      #     name: Upload to Slack
-      #     command: |
-      #         export GIT_COMMIT_DESC=$(git log --format=oneline -n 1 | sed -E 's/^[^ ]+ (.*)$/\1/g')
-      #         echo $CIRCLE_BUILD_URL
-      #         # If we wanted to upload the APK rather than providing a link, we can do that via
-      #         # something like this, but it requires an API token:
-      #         # curl -F file=@/artifacts/otc-cashier.apk -F channels=$SLACK_CHANNEL -F token=$SLACK_API_TOKEN -F title="${CIRCLE_PROJECT_REPONAME} | branch -> ${CIRCLE_BRANCH} | commit -> ${GIT_COMMIT_DESC}"  https://slack.com/api/files.upload
-      #         # See https://medium.com/major-league/delivering-builds-through-slack-with-circle-ci-3d9e685e08f2 for an example
-      #         if [ "$CIRCLE_BRANCH" = "master" ]; then
-      #             # That 221348483 magic number is the internal CircleCI repository ID.
-      #             # Since it's not easily accessible from the environment or API, it's hardcoded for now.
-      #             curl -X POST --data-urlencode "payload={\"channel\": \"#mobile_flutter_chart\", \"username\": \"CircleCI\", \"text\": \"Latest Android build for Deriv Chart:\\nhttps://${CIRCLE_BUILD_NUM}-221348483-gh.circle-artifacts.com/0/artifacts/deriv-chart.apk\\n> $GIT_COMMIT_DESC\", \"icon_emoji\": \":autobot:\"}" $SLACK_URL
-      #         fi
+      - run:
+          name: Upload to Slack
+          command: |
+              export GIT_COMMIT_DESC=$(git log --format=oneline -n 1 | sed -E 's/^[^ ]+ (.*)$/\1/g')
+              echo $CIRCLE_BUILD_URL
+              # If we wanted to upload the APK rather than providing a link, we can do that via
+              # something like this, but it requires an API token:
+              # curl -F file=@/artifacts/otc-cashier.apk -F channels=$SLACK_CHANNEL -F token=$SLACK_API_TOKEN -F title="${CIRCLE_PROJECT_REPONAME} | branch -> ${CIRCLE_BRANCH} | commit -> ${GIT_COMMIT_DESC}"  https://slack.com/api/files.upload
+              # See https://medium.com/major-league/delivering-builds-through-slack-with-circle-ci-3d9e685e08f2 for an example
+              if [ "$CIRCLE_BRANCH" = "master" ]; then
+                  # That 221348483 magic number is the internal CircleCI repository ID.
+                  # Since it's not easily accessible from the environment or API, it's hardcoded for now.
+                  curl -X POST --data-urlencode "payload={\"channel\": \"#project_p2p_cashier\", \"username\": \"CircleCI\", \"text\": \"Latest Android build for P2P cashier:\\nhttps://${CIRCLE_BUILD_NUM}-221348483-gh.circle-artifacts.com/0/artifacts/p2p-cashier.apk\\n> $GIT_COMMIT_DESC\", \"icon_emoji\": \":autobot:\"}" $SLACK_URL
+              fi
       - save_env_cache
 
 workflows:

.gitignore

@@ -5,7 +5,6 @@ build/
 pubspec.lock
 .flutter-plugins
 .flutter-plugins-dependencies
-.last_build_id
 
 # Mac
 .DS_Store
@@ -48,9 +47,6 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# Visual Studio code
-launch.json
-
 # IntelliJ
 *.iml
 .idea/workspace.xml
@@ -64,8 +60,6 @@ launch.json
 .idea/modules.xml
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
-.idea/codeStyles
-.idea/misc.xml
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
@@ -101,4 +95,3 @@ lint/outputs/
 lint/tmp/
 # lint/reports/
 coverage
-.fvm/