Merge branch 'master' into fix-mx-message

Author: sara-fs

.github/workflows/generate_app_id.yml

@@ -0,0 +1,62 @@
+name: Binary App ID Generator
+
+on:
+    issue_comment:
+        types: [edited]
+
+jobs:
+    generate_app_id:
+        timeout-minutes: 5
+        runs-on: ubuntu-latest
+        steps:
+            - name: Capture Vercel preview URL
+              id: vercel_preview_url
+              uses: binary-com/vercel-preview-url-action@v0.0.3
+              with:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            - name: Generate Binary App ID for deployment Preview URL
+              id: generate_app_id
+              uses: DerivFE/binary-app-id-action@master
+              with:
+                  BINARY_API_TOKEN: ${{ secrets.BINARY_API_TOKEN }}
+                  BINARY_APP_ID: ${{ secrets.BINARY_APP_ID }}
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  max_retries: 5
+                  vercel_preview_url: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}
+            - name: Comment on pull request with App ID and URLs
+              id: sticky_comment_on_pr
+              if: steps.generate_app_id.outputs.should_post_comment
+              uses: marocchino/sticky-pull-request-comment@v1
+              with:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  header: binary-app-id-action
+                  number: ${{github.event.issue.number}}
+                  message: |
+                      A production App ID was automatically generated for this PR. ([log](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}))
+                      
+                      - **PR test**: [${{ steps.generate_app_id.outputs.pr_url }}](${{ steps.generate_app_id.outputs.pr_url }})
+                      - **URLs**:
+                          - **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}/en/logged_inws.html?qa_server=frontend.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
+                          - **Original**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}/en/logged_inws.html
+                      - **App ID**: `${{ steps.generate_app_id.outputs.app_id }}`
+
+                      <details>
+                        <summary>Click here to copy & paste above information.</summary>
+
+                        ```
+                        - **PR**: [${{ steps.generate_app_id.outputs.pr_url }}](${{ steps.generate_app_id.outputs.pr_url }})
+                        - **URLs**:
+                            - **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}/en/logged_inws.html?qa_server=frontend.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
+                            - **Original**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}/en/logged_inws.html
+                        - **App ID**: `${{ steps.generate_app_id.outputs.app_id }}`
+                        ```
+                      </details>
+
+            - name: Store generated URL in artifact
+              run: echo "HOME_URL=${{ steps.vercel_preview_url.outputs.vercel_preview_url }}/en/logged_inws.html?qa_server=frontend.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}" >> ${{ github.workspace }}/url.txt
+            - name: Upload artifact
+              uses: actions/upload-artifact@master
+              with:
+                  name: generated_url
+                  path: ${{ github.workspace }}/url.txt
+                  retention-days: 1

README.md

@@ -22,6 +22,17 @@ In order to use your custom domain, please put it in a file named `CNAME` inside
 How to work with this project
 =============================
 
+## Test link deployments
+
+There are two types of test link deployment preview:
+
+1. Automatic deployment
+
+Upon creating PR, `vercel` (https://vercel.com/) will auto-generate test link inside the PR. you can use that to preview test link for the changes you have made.
+
+2. Manual deployments
+
+You can manually deploy your test link using gh-pages with the following configurations:
 ### Deploy to your gh-pages for the first time
 
 1. Register your application [here](https://developers.binary.com/applications/). This will give you the ability to redirect back to your github pages after login.
@@ -70,7 +81,7 @@ In order to remove the created folders from your gh-pages, you can use either:
   or
 - `grunt shell:remove_folder --keep --folder=br_branchname1,br_branchname2,...`: only keeps the specified folder(s) on your gh-pages and removes everything else. Just add the `--keep` flag.
 
-### Preview on your local machine
+## Preview on your local machine
 - To preview your changes locally, run `sudo grunt serve`
 - It will watch for js/css changes and rebuild on every change you make.
 - To test changes made to templates, you need to re-compile them:

build/aliases.yaml

@@ -64,3 +64,9 @@ release:
 releaseci:
   - 'default'
   - 'shell:compile_production'
+
+release_test_link:
+  - 'copy'
+  - 'css'
+  - 'js'
+  - 'shell:compile_production'

build/config/helpers.js

@@ -1,4 +1,4 @@
-const isRelease = (grunt) => ['release', 'releaseci'].indexOf(grunt.cli.tasks[0]) != -1;
+const isRelease = (grunt) => ['release', 'releaseci', 'release_test_link'].indexOf(grunt.cli.tasks[0]) != -1;
 
 const getReleaseTarget = (grunt) => {
     const release_target = Object.keys(global.release_config).find(grunt.option);

package-lock.json

@@ -7,7 +7,8 @@
     "livereload": "sudo -p 'enter password for sudo:' grunt livereload",
     "serve": "sudo -p 'enter password for sudo:' grunt serve",
     "start": "sudo -p 'enter password for sudo:' grunt start",
-    "eslint": "eslint --fix \"src/**/*.jsx\" src/"
+    "eslint": "eslint --fix \"src/**/*.jsx\" src/",
+    "build": "grunt release_test_link --production"
   },
   "repository": {
     "type": "git",
@@ -127,7 +128,7 @@
     "js-cookie": "2.2.0",
     "kinetic": "5.2.0",
     "moment": "2.19.4",
-    "onfido-sdk-ui": "^6.7.2",
+    "onfido-sdk-ui": "^6.3.0",
     "promise-polyfill": "6.1.0",
     "prop-types": "15.6.1",
     "react": "16.8.6",

package.json

@@ -25,6 +25,7 @@ module.exports = [
     ['new_account/realws',                      'app/new_account/real',                        'default',    'Real Money Account Opening'],
     ['new_account/virtualws',                   'app/new_account/virtual',                     'default',    'Create New Virtual-money Account'],
     ['new_account/welcome',                     'app/new_account/welcome_page',                'default',    'Welcome to Binary.com'],
+    ['new_account/welcome_onboarding',          'app/new_account/welcome_onboarding',             'default',    'Welcome to Binary.com'],
 
     ['resources',                               'app/resources/index',                         'default',    'Resources'],
     ['resources/asset_indexws',                 'app/resources/asset_index',                   'full_width', 'Asset Index'],