Merge branch 'master' of github.com:binary-com/deriv-app into bug-743…

…62-feedback-button-does-nothing
binary-com · Sep 20, 2022 · 6f76f3e · 6f76f3e
2 parents aaeac4a + b7f09b3
commit 6f76f3e
Show file tree

Hide file tree

Showing 26 changed files with 2,164 additions and 387 deletions.
diff --git a/.github/workflows/generate_and_push_deriv_api_types.yml b/.github/workflows/generate_and_push_deriv_api_types.yml
@@ -105,11 +105,12 @@ jobs:
             git push --set-upstream origin "$package_name" -f
 
             # Get the diff and use this as the PRs body.
-            pr_body=$(curl "https://diff.intrinsic.com/$package_name/$safe_old_version/$new_version.diff")
+            diff_url="https://diff.intrinsic.com/$package_name/$safe_old_version/$new_version.diff"
+            pr_body=$(curl $diff_url)
 
             # Use "gh" to create a PR from the CLI.
             sudo apt install gh
             gh auth login --with-token <<< ${{ github.token }}
             gh pr close "$package_name" || true
-            gh pr create --title "Bump $package_name from $safe_old_version to $new_version" --body "\`\`\`diff $pr_body \`\`\`" --base "master" --head "binary-com:$package_name"
+            gh pr create --title "Bump $package_name from $safe_old_version to $new_version" --body "Diff url: $diff_url\n \`\`\`diff ${pr_body:0:5000} \`\`\`" --base "master" --head "binary-com:$package_name"
           fi
diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-details/payment-agent-details.scss b/packages/cashier/src/pages/payment-agent/payment-agent-details/payment-agent-details.scss
@@ -4,6 +4,8 @@
         color: var(--brand-red-coral);
         font-weight: bold;
         font-size: var(--text-size-xs);
+        word-wrap: break-word;
+
         @include mobile {
             padding-left: 0;
         }
@@ -13,6 +15,7 @@
             margin-bottom: 8px;
             display: flex;
             flex-direction: row;
+            word-break: break-all;
 
             &:first-child {
                 & .payment-agent-details__contact {

diff --git a/packages/cfd/jest.config.js b/packages/cfd/jest.config.js
@@ -3,17 +3,18 @@ const baseConfigForPackages = require('../../jest.config.base');
 module.exports = {
     ...baseConfigForPackages,
     moduleNameMapper: {
-        "\\.s(c|a)ss$": "<rootDir>/../../__mocks__/styleMock.js",
-        "^.+\\.svg$": "<rootDir>/../../__mocks__/styleMock.js",
-        '^_common\/(.*)$': "<rootDir>/src/_common/$1",
-        '^App\/(.*)$': "<rootDir>/src/App/$1",
-        '^Assets\/(.*)$': "<rootDir>/src/Assets/$1",
-        '^Constants\/(.*)$': "<rootDir>/src/Constants/$1",
-        '^Constants$': "<rootDir>/src/Constants/index.js",
-        '^Documents\/(.*)$': "<rootDir>/src/Documents/$1",
-        '^Modules\/(.*)$': "<rootDir>/src/Modules/$1",
-        '^Utils\/(.*)$': "<rootDir>/src/Utils/$1",
-        '^Services\/(.*)$': "<rootDir>/src/Services/$1",
-        '^Stores\/(.*)$': "<rootDir>/src/Stores/$1",
+        '\\.s(c|a)ss$': '<rootDir>/../../__mocks__/styleMock.js',
+        '^.+\\.svg$': '<rootDir>/../../__mocks__/styleMock.js',
+        '^_common/(.*)$': '<rootDir>/src/_common/$1',
+        '^App/(.*)$': '<rootDir>/src/App/$1',
+        '^Assets/(.*)$': '<rootDir>/src/Assets/$1',
+        '^Components/(.*)$': '<rootDir>/src/Components/$1',
+        '^Constants/(.*)$': '<rootDir>/src/Constants/$1',
+        '^Constants$': '<rootDir>/src/Constants/index.js',
+        '^Documents/(.*)$': '<rootDir>/src/Documents/$1',
+        '^Modules/(.*)$': '<rootDir>/src/Modules/$1',
+        '^Utils/(.*)$': '<rootDir>/src/Utils/$1',
+        '^Services/(.*)$': '<rootDir>/src/Services/$1',
+        '^Stores/(.*)$': '<rootDir>/src/Stores/$1',
     },
 };