Merge pull request #4437 from brave-intl/staging

Prod Release 05-13-2024
brave-intl · May 15, 2024 · 8ae2887 · 8ae2887
2 parents 5727371 + 6834d0e
commit 8ae2887
Show file tree

Hide file tree

Showing 24 changed files with 3,390 additions and 6,678 deletions.
diff --git a/.reviewdog.yml b/.reviewdog.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,10 +4,5 @@
         "app/javascript/locale",
         "nextjs/src/messages",
         "public/creators-landing/src/locale"
-    ],
-      "workbench.colorCustomizations": {
-      "activityBar.background": "#340e05",
-      "titleBar.activeBackground": "#FB542B",
-      "titleBar.activeForeground": "#FDFBF6"
-  },
+    ]
 }
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -337,7 +337,7 @@ GEM
       actionpack (>= 6.0.0, < 7.2)
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minitest (5.22.2)
     minitest-retry (0.2.2)
       minitest (>= 5.0)
@@ -359,20 +359,20 @@ GEM
       net-protocol
     newrelic_rpm (9.7.1)
     nio4r (2.7.0)
-    nokogiri (1.16.2)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.2-aarch64-linux)
+    nokogiri (1.16.5-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.2-arm-linux)
+    nokogiri (1.16.5-arm-linux)
       racc (~> 1.4)
-    nokogiri (1.16.2-arm64-darwin)
+    nokogiri (1.16.5-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86-linux)
+    nokogiri (1.16.5-x86-linux)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-darwin)
+    nokogiri (1.16.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -511,7 +511,7 @@ GEM
     recaptcha (5.16.0)
     redis (5.1.0)
       redis-client (>= 0.17.0)
-    redis-client (0.21.0)
+    redis-client (0.22.1)
       connection_pool
     redis-prescription (2.6.0)
     redis-session-store (0.11.5)
@@ -585,7 +585,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    sidekiq (7.2.2)
+    sidekiq (7.2.4)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)

diff --git a/app/helpers/publishers_helper.rb b/app/helpers/publishers_helper.rb
@@ -71,7 +71,7 @@ def has_balance?(publisher)
   def publisher_overall_bat_balance_amount(publisher)
     amount = 0.0
     error_catcher do
-      amount = if publisher.only_user_funds?
+      amount = if publisher.only_user_funds? || !publisher.allowed_to_create_referrals?
         publisher.wallet&.contribution_balance&.amount_bat
       elsif publisher.no_grants?
         (publisher.wallet&.overall_balance&.amount_bat || 0) - (publisher.wallet&.contribution_balance&.amount_bat || 0)

diff --git a/app/javascript/packs/banner_editor.jsx b/app/javascript/packs/banner_editor.jsx
@@ -3,8 +3,6 @@ import ReactDOM from "react-dom";
 import { FormattedMessage, IntlProvider } from "react-intl";
 import AvatarEditor from "react-avatar-editor";
 
-import "babel-polyfill";
-
 import BannerPreview from "../packs/banner_preview.jsx";
 import Navbar from "../packs/navbar.jsx";
 

diff --git a/app/javascript/packs/case.jsx b/app/javascript/packs/case.jsx
diff --git a/app/javascript/publishers/home.js b/app/javascript/publishers/home.js
@@ -1,5 +1,4 @@
 import { fetchAfterDelay, submitForm } from "../utils/request";
-import "babel-polyfill";
 import fetch from "../utils/fetchPolyfill";
 import flash from "../utils/flash";
 import { Wallet } from "../wallet";

diff --git a/app/views/publishers/cases/new.html.slim b/app/views/publishers/cases/new.html.slim
@@ -32,7 +32,6 @@
         label
           strong= t('publishers.cases.shared.evidence')
 
-        #fileUploadSection
         = f.file_field :files, multiple: true, class: 'd-none'
         .row
           - @case.files.each do |file|
@@ -50,5 +49,3 @@
             .badge.badge-light =t('publishers.cases.shared.saving')
           h5.fade#saved
             .badge.badge-success =t('publishers.cases.shared.saved')
-
-=append_javascript_pack_tag 'case'
diff --git a/app/views/static/index.html b/app/views/static/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><link rel="manifest" href="/manifest.json"/><title>Earn more for content you publish to the web - Brave Creators</title><meta property="og:title" content="Earn more for content you publish to the web - Brave Creators"/><meta property="og:description" content="Viewers who use the Brave Browser may have contributed money to you while surfing the web through Brave Creators. Simply sign up as a verified content creator on Brave Creators to start collecting your contributions."/><meta property="og:image" content="/preview.png"/><meta property="og:type" content="website"/><meta property="og:url" content="https://creators.brave.com"/><script defer="defer" src="/static/js/main.996ffc0f.js" defer></script><link href="/static/css/main.99b73499.css" rel="stylesheet"></head><body><noscript><meta http-equiv="refresh" content="0;url=no_js"/></noscript><div id="root"><div class="full-page-loader"><picture><source srcset="./brave-logo-lion.webp" type="image/webp"/><source srcset="./brave-logo-lion.png" type="image/png"/><img width="80" src="./brave-logo-lion.png" alt="Brave"/></picture></div></div><style>.full-page-loader{display:flex;align-items:center;flex-direction:column;justify-content:center;position:absolute;top:0;right:0;left:0;bottom:0;background:linear-gradient(-45deg,#2a1fad 0,#a91b78 100%);background-size:150% 150%}</style></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="https://creators.brave.com/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><link rel="manifest" href="https://creators.brave.com/manifest.json"/><title>Earn more for content you publish to the web - Brave Creators</title><meta property="og:title" content="Earn more for content you publish to the web - Brave Creators"/><meta property="og:description" content="Viewers who use the Brave Browser may have contributed money to you while surfing the web through Brave Creators. Simply sign up as a verified content creator on Brave Creators to start collecting your contributions."/><meta property="og:image" content="https://creators.brave.com/preview.png"/><meta property="og:type" content="website"/><meta property="og:url" content="https://creators.brave.com"/><script defer="defer" src="/static/js/main.b0e3fdc9.js" defer></script><link href="/static/css/main.4cb5f7de.css" rel="stylesheet"></head><body><noscript><meta http-equiv="refresh" content="0;url=no_js"/></noscript><div id="root"><div class="full-page-loader"><picture><source srcset="./brave-logo-lion.webp" type="image/webp"/><source srcset="./brave-logo-lion.png" type="image/png"/><img width="80" src="./brave-logo-lion.png" alt="Brave"/></picture></div></div><style>.full-page-loader{display:flex;align-items:center;flex-direction:column;justify-content:center;position:absolute;top:0;right:0;left:0;bottom:0;background:linear-gradient(-45deg,#2a1fad 0,#a91b78 100%);background-size:150% 150%}</style></body></html>
diff --git a/babel.config.js b/babel.config.js
@@ -19,10 +19,7 @@ module.exports = function (api) {
     plugins: [
       "syntax-dynamic-import",
       "babel-plugin-styled-components",
-      "transform-object-rest-spread",
-      [
-        "@babel/plugin-proposal-class-properties"
-      ]
+      "transform-object-rest-spread"
     ].filter(Boolean),
   }
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -617,7 +617,7 @@ en:
       referral_program_winddown: |
         The Referral Program has now ended as of November 24, 2020. Please read <b><a href=%{blog_link}>our blog post</a></b> for more details.
       title: Dashboard
-      add_channel_cta: Add a website or YouTube channel to see how much your fans on Brave have contributed so far.
+      add_channel_cta: Register a website or channel to your Brave Creators account so you can start receiving contributions from your supporters.
       merchant: Merchant Keys
       statements:
         heading: Statements

diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js
@@ -11,6 +11,7 @@ const customConfig = {
     fallback: {
       crypto: require.resolve("crypto-browserify"),
       stream: require.resolve("stream-browserify"),
+      vm: require.resolve("vm-browserify")
     },
     extensions: ['.css']
   }

diff --git a/nextjs/package.json b/nextjs/package.json
@@ -18,7 +18,7 @@
     "typecheck": "tsc --noEmit --incremental false"
   },
   "dependencies": {
-    "@brave/leo": "github:brave/leo#80f2230bcfb7d2a87e7025a4e26c502d900fd938",
+    "@brave/leo": "github:brave/leo#895c0a25d197ed0567ddf3ebbd0c8a01fa02fc83",
     "@github/webauthn-json": "^2.1.1",
     "axios": "^1.6.0",
     "clsx": "^2.0.0",

diff --git a/nextjs/src/app/[locale]/publishers/layout.tsx b/nextjs/src/app/[locale]/publishers/layout.tsx
@@ -13,9 +13,10 @@ export default function NavigationLayout({
     <UserProvider>
       <div className='bg-container relative flex items-center justify-between px-2 transition-colors'>
         <Image
-          src='/brave_creators_logo.png'
+          src='/images/brave_creators_logo.png'
           alt='Brave Creators Logo'
           height={80}
+          width={250}
           priority={true}
         />
         <NavDropdown />

diff --git a/nextjs/src/app/[locale]/publishers/settings/page.tsx b/nextjs/src/app/[locale]/publishers/settings/page.tsx
@@ -51,8 +51,8 @@ export default function SettingsPage() {
     push('/');
   }
 
-  function handleToggleChange(e: CustomEvent, name: string) {
-    const newSettings = { ...settings, [name]: e.detail.checked };
+  function handleToggleChange(e, name: string) {
+    const newSettings = { ...settings, [name]: e.checked };
 
     setSettings(newSettings);
     updateAccountSettings(newSettings);

diff --git a/package.json b/package.json
@@ -92,6 +92,7 @@
     "sass": "^1.64.1",
     "sass-loader": "^13.3.2",
     "shakapacker": "7.2.2",
+    "stream-browserify": "^3.0.0",
     "style-loader": "^3.3.3",
     "styled-components": "5.3.11",
     "terser-webpack-plugin": "5.3.9",
@@ -101,46 +102,42 @@
     "webpack-assets-manifest": "5.2.1",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "^4.15.1",
-    "webpack-merge": "5.9"
+    "webpack-merge": "5.9",
+    "vm-browserify": "^1.1.2"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-transform-class-properties": "^7.24.1",
     "@babel/preset-react": "^7.24.1",
-    "@rails/webpacker": "^5.4.4",
     "@types/jest": "^29.5.3",
     "@types/react": "^16.4.7",
     "@types/react-dom": "^16.0.6",
     "@types/styled-components": "^5.1.26",
     "audit-ci": "6.6.1",
-    "autoprefixer": "10.4.15",
-    "babel-core": "7.0.0-bridge.0",
+    "autoprefixer": "10.4.19",
     "babel-plugin-styled-components": "2.1.4",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^7.0.0-beta.3",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-react": "^6.24.1",
     "cssnano": "6.0.1",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.7",
+    "enzyme-adapter-react-16": "^1.15.8",
     "enzyme-to-json": "^3.6.2",
-    "fork-ts-checker-webpack-plugin": "^8.0.0",
-    "husky": "^8.0.3",
-    "jest-styled-components": "^7.1.1",
+    "fork-ts-checker-webpack-plugin": "^9.0.2",
+    "husky": "^9.0.11",
+    "jest-styled-components": "^7.2",
     "node-sass": "9.0.0",
-    "postcss": "8.4.31",
-    "prettier": "3.0.1",
+    "postcss": "8.4.38",
+    "prettier": "3.2.5",
     "stylelint": "^15.10.2",
     "stylelint-config-recommended-scss": "12.0.0",
     "stylelint-config-styled-components": "^0.1.1",
     "stylelint-scss": "5.0.1",
     "sugarss": "^4.0.1",
-    "ts-loader": "9.4.4",
+    "ts-loader": "9.5.1",
     "tslint": "6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "tslint-config-standard": "9.0",
     "tslint-react": "5.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.4.5"
   },
   "resolutions": {
     "**/@babel/traverse": "7.24.1",