diff --git a/web/cashtab/.gitignore b/web/cashtab/.gitignore
--- a/web/cashtab/.gitignore
+++ b/web/cashtab/.gitignore
@@ -27,9 +27,3 @@
*.zip
*.pem
dist/
-
-# Ignore fbt generated files
-.source_strings.json
-.src_manifest.json
-.enum_manifest.json
-src/translatedFbts.json
diff --git a/web/cashtab/config/paths.js b/web/cashtab/config/paths.js
--- a/web/cashtab/config/paths.js
+++ b/web/cashtab/config/paths.js
@@ -70,8 +70,6 @@
appBuild: resolveApp('build'),
appPublic: resolveApp('public'),
appHtml: resolveApp('public/index.html'),
- appI18nJs: resolveApp('src/i18n/init.js'),
- appI18n: resolveApp('src/i18n'),
appIndexJs: resolveModule(resolveApp, 'src/index'),
appPackageJson: resolveApp('package.json'),
appSrc: resolveApp('src'),
diff --git a/web/cashtab/config/webpack.config.js b/web/cashtab/config/webpack.config.js
--- a/web/cashtab/config/webpack.config.js
+++ b/web/cashtab/config/webpack.config.js
@@ -274,7 +274,6 @@
isEnvDevelopment &&
require.resolve('react-dev-utils/webpackHotDevClient'),
// Finally, this is your app's code:
- paths.appI18nJs,
paths.appIndexJs,
// We include the app code last so that if there is a runtime error during
// initialization, it doesn't blow up the WebpackDevServer client, and
@@ -397,7 +396,6 @@
// https://github.com/facebook/create-react-app/issues/253
modules: [
'node_modules',
- paths.appI18n,
paths.appNodeModules,
].concat(modules.additionalModulePaths || []),
// These are the reasonable defaults supported by the Node ecosystem.
@@ -483,17 +481,6 @@
},
},
],
- [
- 'babel-plugin-fbt',
- {
- fbtEnumPath: path.join(
- paths.appPath,
- '.enum_manifest.json',
- ),
- extraOptions: { __self: true },
- },
- ],
- 'babel-plugin-fbt-runtime',
],
// This is a feature of `babel-loader` for webpack (not Babel itself).
// It enables caching results in ./node_modules/.cache/babel-loader/
diff --git a/web/cashtab/extension/src/components/App.js b/web/cashtab/extension/src/components/App.js
--- a/web/cashtab/extension/src/components/App.js
+++ b/web/cashtab/extension/src/components/App.js
@@ -28,8 +28,6 @@
useHistory,
} from 'react-router-dom';
-import fbt from 'fbt';
-
const GlobalStyle = createGlobalStyle`
.ant-modal-wrap > div > div.ant-modal-content > div > div > div.ant-modal-confirm-btns > button, .ant-modal > button, .ant-modal-confirm-btns > button, .ant-modal-footer > button {
border-radius: 8px;
@@ -254,7 +252,7 @@
onClick={() => history.push('/wallet')}
>
- Wallet
+ Wallet
history.push('/send')}
>
- Send
+ Send
history.push('/configure')}
>
- Settings
+ Settings
) : null}
diff --git a/web/cashtab/package-lock.json b/web/cashtab/package-lock.json
--- a/web/cashtab/package-lock.json
+++ b/web/cashtab/package-lock.json
@@ -17,7 +17,6 @@
"dotenv-expand": "^5.1.0",
"ecashaddrjs": "^1.0.1",
"ethereum-blockies-base64": "^1.0.2",
- "fbt": "^0.16.4",
"localforage": "^1.9.0",
"lodash.isempty": "^4.4.0",
"lodash.isequal": "^4.5.0",
@@ -46,8 +45,6 @@
"babel-eslint": "^10.0.3",
"babel-jest": "^26.6.3",
"babel-loader": "^8.0.6",
- "babel-plugin-fbt": "^0.19.1",
- "babel-plugin-fbt-runtime": "^0.9.16",
"babel-plugin-named-asset-import": "^0.3.7",
"babel-preset-react-app": "^10.0.0",
"camelcase": "^5.3.1",
@@ -62,7 +59,6 @@
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-webpack-plugin": "^2.5.4",
"extensionizer": "^1.0.1",
- "fbt-generate-translations": "^0.0.4",
"file-loader": "^6.2.0",
"fs-extra": "^7.0.1",
"html-webpack-plugin": "^4.5.1",
@@ -349,6 +345,7 @@
},
"node_modules/@babel/helper-plugin-utils": {
"version": "7.13.0",
+ "dev": true,
"license": "MIT"
},
"node_modules/@babel/helper-remap-async-to-generator": {
@@ -661,6 +658,7 @@
},
"node_modules/@babel/plugin-syntax-class-properties": {
"version": "7.12.13",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.12.13"
@@ -704,6 +702,7 @@
},
"node_modules/@babel/plugin-syntax-flow": {
"version": "7.12.13",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.12.13"
@@ -736,6 +735,7 @@
},
"node_modules/@babel/plugin-syntax-jsx": {
"version": "7.12.13",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.12.13"
@@ -757,6 +757,7 @@
},
"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
"version": "7.8.3",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.8.0"
@@ -767,6 +768,7 @@
},
"node_modules/@babel/plugin-syntax-numeric-separator": {
"version": "7.10.4",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.10.4"
@@ -777,6 +779,7 @@
},
"node_modules/@babel/plugin-syntax-object-rest-spread": {
"version": "7.8.3",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.8.0"
@@ -787,6 +790,7 @@
},
"node_modules/@babel/plugin-syntax-optional-catch-binding": {
"version": "7.8.3",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.8.0"
@@ -797,6 +801,7 @@
},
"node_modules/@babel/plugin-syntax-optional-chaining": {
"version": "7.8.3",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.8.0"
@@ -947,17 +952,6 @@
"@babel/core": "^7.0.0-0"
}
},
- "node_modules/@babel/plugin-transform-flow-strip-types": {
- "version": "7.13.0",
- "license": "MIT",
- "dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/plugin-syntax-flow": "^7.12.13"
- },
- "peerDependencies": {
- "@babel/core": "^7.0.0-0"
- }
- },
"node_modules/@babel/plugin-transform-for-of": {
"version": "7.13.0",
"dev": true,
@@ -1018,6 +1012,7 @@
},
"node_modules/@babel/plugin-transform-modules-commonjs": {
"version": "7.13.8",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-module-transforms": "^7.13.0",
@@ -1617,24 +1612,6 @@
"node": ">=8"
}
},
- "node_modules/@fbtjs/default-collection-transform": {
- "version": "0.0.1",
- "license": "MIT",
- "peer": true,
- "dependencies": {
- "@babel/core": "^7.0.0",
- "@babel/generator": "^7.0.0",
- "@babel/parser": "^7.7.4",
- "@babel/plugin-syntax-class-properties": "^7.0.0",
- "@babel/plugin-syntax-flow": "^7.7.4",
- "@babel/plugin-syntax-jsx": "^7.0.0",
- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
- "@babel/plugin-syntax-numeric-separator": "^7.2.0",
- "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
- "@babel/plugin-syntax-optional-catch-binding": "^7.0.0",
- "@babel/plugin-syntax-optional-chaining": "^7.0.0"
- }
- },
"node_modules/@fortawesome/fontawesome-free": {
"version": "5.15.3",
"hasInstallScript": true,
@@ -4090,17 +4067,6 @@
"safer-buffer": "^2.1.0"
}
},
- "node_modules/assert": {
- "version": "2.0.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "es6-object-assign": "^1.1.0",
- "is-nan": "^1.2.1",
- "object-is": "^1.0.1",
- "util": "^0.12.0"
- }
- },
"node_modules/assert-plus": {
"version": "1.0.0",
"dev": true,
@@ -4542,49 +4508,12 @@
},
"node_modules/babel-plugin-dynamic-import-node": {
"version": "2.3.3",
+ "dev": true,
"license": "MIT",
"dependencies": {
"object.assign": "^4.1.0"
}
},
- "node_modules/babel-plugin-fbt": {
- "version": "0.19.1",
- "license": "MIT",
- "dependencies": {
- "@babel/core": "^7.0.0",
- "@babel/generator": "^7.0.0",
- "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
- "@babel/plugin-transform-flow-strip-types": "^7.2.0",
- "@babel/plugin-transform-modules-commonjs": "^7.8.3",
- "@babel/types": "^7.2.2",
- "fb-babel-plugin-utils": "^0.12.0",
- "glob": "^7.1.6",
- "invariant": "^2.2.4",
- "jest-docblock": "^26.0.0",
- "nullthrows": "^1.1.1",
- "shelljs": "^0.8.4",
- "yargs": "^15.3.1"
- },
- "bin": {
- "fbt-collect": "dist/bin/collectFbt.bin.js",
- "fbt-manifest": "dist/bin/manifest.bin.js",
- "fbt-translate": "dist/bin/translate.bin.js"
- },
- "peerDependencies": {
- "@fbtjs/default-collection-transform": "^0.0.x"
- }
- },
- "node_modules/babel-plugin-fbt-runtime": {
- "version": "0.9.16",
- "license": "MIT",
- "dependencies": {
- "@babel/core": "^7.0.0",
- "fbjs": "^1.0.0"
- },
- "peerDependencies": {
- "babel-plugin-fbt": "^0.19.x"
- }
- },
"node_modules/babel-plugin-istanbul": {
"version": "6.0.0",
"dev": true,
@@ -6087,15 +6016,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/cli-color": {
- "version": "0.1.7",
- "dependencies": {
- "es5-ext": "0.8.x"
- },
- "engines": {
- "node": ">=0.1.103"
- }
- },
"node_modules/cli-cursor": {
"version": "2.1.0",
"license": "MIT",
@@ -7895,6 +7815,7 @@
},
"node_modules/detect-newline": {
"version": "3.1.0",
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=8"
@@ -7957,12 +7878,6 @@
"randombytes": "^2.0.0"
}
},
- "node_modules/difflib": {
- "version": "0.2.4",
- "dependencies": {
- "heap": ">= 0.2.0"
- }
- },
"node_modules/dir-glob": {
"version": "3.0.1",
"license": "MIT",
@@ -8151,15 +8066,6 @@
"node": ">=0.10"
}
},
- "node_modules/dreamopt": {
- "version": "0.6.0",
- "dependencies": {
- "wordwrap": ">=0.0.2"
- },
- "engines": {
- "node": ">=0.4.0"
- }
- },
"node_modules/duplexer": {
"version": "0.1.2",
"license": "MIT"
@@ -8303,13 +8209,6 @@
"node": ">= 0.8"
}
},
- "node_modules/encoding": {
- "version": "0.1.13",
- "license": "MIT",
- "dependencies": {
- "iconv-lite": "^0.6.2"
- }
- },
"node_modules/end-of-stream": {
"version": "1.4.4",
"license": "MIT",
@@ -8469,12 +8368,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/es5-ext": {
- "version": "0.8.2",
- "engines": {
- "node": ">=0.4"
- }
- },
"node_modules/es6-error": {
"version": "4.1.1",
"license": "MIT"
@@ -8499,11 +8392,6 @@
"next-tick": "~1.0.0"
}
},
- "node_modules/es6-object-assign": {
- "version": "1.1.0",
- "dev": true,
- "license": "MIT"
- },
"node_modules/es6-symbol": {
"version": "3.1.3",
"dev": true,
@@ -9674,24 +9562,6 @@
"node": ">=0.8.0"
}
},
- "node_modules/fb-babel-plugin-utils": {
- "version": "0.12.0",
- "license": "MIT",
- "dependencies": {
- "@babel/core": "^7.0.0",
- "@babel/generator": "^7.0.0",
- "@babel/parser": "^7.7.4",
- "@babel/plugin-syntax-class-properties": "^7.0.0",
- "@babel/plugin-syntax-flow": "^7.7.4",
- "@babel/plugin-syntax-jsx": "^7.0.0",
- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
- "@babel/plugin-syntax-numeric-separator": "^7.2.0",
- "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
- "@babel/plugin-syntax-optional-catch-binding": "^7.0.0",
- "@babel/plugin-syntax-optional-chaining": "^7.0.0",
- "json-diff": "^0.5.4"
- }
- },
"node_modules/fb-watchman": {
"version": "2.0.1",
"dev": true,
@@ -9700,186 +9570,6 @@
"bser": "2.1.1"
}
},
- "node_modules/fbjs": {
- "version": "1.0.0",
- "license": "MIT",
- "dependencies": {
- "core-js": "^2.4.1",
- "fbjs-css-vars": "^1.0.0",
- "isomorphic-fetch": "^2.1.1",
- "loose-envify": "^1.0.0",
- "object-assign": "^4.1.0",
- "promise": "^7.1.1",
- "setimmediate": "^1.0.5",
- "ua-parser-js": "^0.7.18"
- }
- },
- "node_modules/fbjs-css-vars": {
- "version": "1.0.2",
- "license": "MIT"
- },
- "node_modules/fbjs/node_modules/core-js": {
- "version": "2.6.12",
- "hasInstallScript": true,
- "license": "MIT"
- },
- "node_modules/fbt": {
- "version": "0.16.4",
- "license": "MIT",
- "dependencies": {
- "invariant": "^2.2.4"
- },
- "peerDependencies": {
- "babel-plugin-fbt": "^0.19.x",
- "babel-plugin-fbt-runtime": "^0.9.x",
- "react": "0.12.0 - 17.x.x"
- }
- },
- "node_modules/fbt-generate-translations": {
- "version": "0.0.4",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "assert": "^2.0.0",
- "yargs": "^13.3.0"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/ansi-regex": {
- "version": "4.1.0",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/cliui": {
- "version": "5.0.0",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "string-width": "^3.1.0",
- "strip-ansi": "^5.2.0",
- "wrap-ansi": "^5.1.0"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/emoji-regex": {
- "version": "7.0.3",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/fbt-generate-translations/node_modules/find-up": {
- "version": "3.0.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "locate-path": "^3.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/is-fullwidth-code-point": {
- "version": "2.0.0",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/locate-path": {
- "version": "3.0.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-locate": "^3.0.0",
- "path-exists": "^3.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/p-locate": {
- "version": "3.0.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-limit": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/path-exists": {
- "version": "3.0.0",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/string-width": {
- "version": "3.1.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/strip-ansi": {
- "version": "5.2.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-regex": "^4.1.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/wrap-ansi": {
- "version": "5.1.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^3.2.0",
- "string-width": "^3.0.0",
- "strip-ansi": "^5.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/yargs": {
- "version": "13.3.2",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "cliui": "^5.0.0",
- "find-up": "^3.0.0",
- "get-caller-file": "^2.0.1",
- "require-directory": "^2.1.1",
- "require-main-filename": "^2.0.0",
- "set-blocking": "^2.0.0",
- "string-width": "^3.0.0",
- "which-module": "^2.0.0",
- "y18n": "^4.0.0",
- "yargs-parser": "^13.1.2"
- }
- },
- "node_modules/fbt-generate-translations/node_modules/yargs-parser": {
- "version": "13.1.2",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
- }
- },
"node_modules/fecha": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
@@ -10969,9 +10659,6 @@
"he": "bin/he"
}
},
- "node_modules/heap": {
- "version": "0.2.6"
- },
"node_modules/hex-color-regex": {
"version": "1.1.0",
"dev": true,
@@ -11699,15 +11386,9 @@
"node": ">= 0.4"
}
},
- "node_modules/interpret": {
- "version": "1.4.0",
- "license": "MIT",
- "engines": {
- "node": ">= 0.10"
- }
- },
"node_modules/invariant": {
"version": "2.2.4",
+ "dev": true,
"license": "MIT",
"dependencies": {
"loose-envify": "^1.0.0"
@@ -11935,17 +11616,6 @@
"node": ">=6"
}
},
- "node_modules/is-generator-function": {
- "version": "1.0.8",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/is-glob": {
"version": "4.0.1",
"license": "MIT",
@@ -11978,21 +11648,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/is-nan": {
- "version": "1.3.2",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "call-bind": "^1.0.0",
- "define-properties": "^1.1.3"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/is-negative-zero": {
"version": "2.0.1",
"license": "MIT",
@@ -12259,29 +11914,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/isomorphic-fetch": {
- "version": "2.2.1",
- "license": "MIT",
- "dependencies": {
- "node-fetch": "^1.0.1",
- "whatwg-fetch": ">=0.10.0"
- }
- },
- "node_modules/isomorphic-fetch/node_modules/is-stream": {
- "version": "1.1.0",
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/isomorphic-fetch/node_modules/node-fetch": {
- "version": "1.7.3",
- "license": "MIT",
- "dependencies": {
- "encoding": "^0.1.11",
- "is-stream": "^1.0.1"
- }
- },
"node_modules/isstream": {
"version": "0.1.2",
"dev": true,
@@ -12717,6 +12349,7 @@
},
"node_modules/jest-docblock": {
"version": "26.0.0",
+ "dev": true,
"license": "MIT",
"dependencies": {
"detect-newline": "^3.0.0"
@@ -14977,20 +14610,6 @@
"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
"integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
},
- "node_modules/json-diff": {
- "version": "0.5.4",
- "dependencies": {
- "cli-color": "~0.1.6",
- "difflib": "~0.2.1",
- "dreamopt": "~0.6.0"
- },
- "bin": {
- "json-diff": "bin/json-diff.js"
- },
- "engines": {
- "node": "*"
- }
- },
"node_modules/json-parse-better-errors": {
"version": "1.0.2",
"license": "MIT"
@@ -16793,10 +16412,6 @@
"boolbase": "~1.0.0"
}
},
- "node_modules/nullthrows": {
- "version": "1.1.1",
- "license": "MIT"
- },
"node_modules/num2fraction": {
"version": "1.2.2",
"dev": true,
@@ -21433,13 +21048,6 @@
"node": ">=0.4.0"
}
},
- "node_modules/promise": {
- "version": "7.3.1",
- "license": "MIT",
- "dependencies": {
- "asap": "~2.0.3"
- }
- },
"node_modules/promise-inflight": {
"version": "1.0.1",
"dev": true,
@@ -22648,15 +22256,6 @@
"node": ">=4"
}
},
- "node_modules/rechoir": {
- "version": "0.6.2",
- "dependencies": {
- "resolve": "^1.1.6"
- },
- "engines": {
- "node": ">= 0.10"
- }
- },
"node_modules/recursive-readdir": {
"version": "2.2.2",
"license": "MIT",
@@ -23961,6 +23560,7 @@
},
"node_modules/setimmediate": {
"version": "1.0.5",
+ "dev": true,
"license": "MIT"
},
"node_modules/setprototypeof": {
@@ -24004,21 +23604,6 @@
"version": "1.7.2",
"license": "MIT"
},
- "node_modules/shelljs": {
- "version": "0.8.4",
- "license": "BSD-3-Clause",
- "dependencies": {
- "glob": "^7.0.0",
- "interpret": "^1.0.0",
- "rechoir": "^0.6.2"
- },
- "bin": {
- "shjs": "bin/shjs"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/shellwords": {
"version": "0.1.1",
"dev": true,
@@ -26758,19 +26343,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/util": {
- "version": "0.12.3",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "inherits": "^2.0.3",
- "is-arguments": "^1.0.4",
- "is-generator-function": "^1.0.7",
- "is-typed-array": "^1.1.3",
- "safe-buffer": "^5.1.2",
- "which-typed-array": "^1.1.2"
- }
- },
"node_modules/util-deprecate": {
"version": "1.0.2",
"license": "MIT"
@@ -29166,7 +28738,8 @@
}
},
"@babel/helper-plugin-utils": {
- "version": "7.13.0"
+ "version": "7.13.0",
+ "dev": true
},
"@babel/helper-remap-async-to-generator": {
"version": "7.13.0",
@@ -29387,6 +28960,7 @@
},
"@babel/plugin-syntax-class-properties": {
"version": "7.12.13",
+ "dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.12.13"
}
@@ -29414,6 +28988,7 @@
},
"@babel/plugin-syntax-flow": {
"version": "7.12.13",
+ "dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.12.13"
}
@@ -29434,6 +29009,7 @@
},
"@babel/plugin-syntax-jsx": {
"version": "7.12.13",
+ "dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.12.13"
}
@@ -29447,30 +29023,35 @@
},
"@babel/plugin-syntax-nullish-coalescing-operator": {
"version": "7.8.3",
+ "dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.8.0"
}
},
"@babel/plugin-syntax-numeric-separator": {
"version": "7.10.4",
+ "dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.10.4"
}
},
"@babel/plugin-syntax-object-rest-spread": {
"version": "7.8.3",
+ "dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.8.0"
}
},
"@babel/plugin-syntax-optional-catch-binding": {
"version": "7.8.3",
+ "dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.8.0"
}
},
"@babel/plugin-syntax-optional-chaining": {
"version": "7.8.3",
+ "dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.8.0"
}
@@ -29569,13 +29150,6 @@
"@babel/helper-plugin-utils": "^7.12.13"
}
},
- "@babel/plugin-transform-flow-strip-types": {
- "version": "7.13.0",
- "requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/plugin-syntax-flow": "^7.12.13"
- }
- },
"@babel/plugin-transform-for-of": {
"version": "7.13.0",
"dev": true,
@@ -29616,6 +29190,7 @@
},
"@babel/plugin-transform-modules-commonjs": {
"version": "7.13.8",
+ "dev": true,
"requires": {
"@babel/helper-module-transforms": "^7.13.0",
"@babel/helper-plugin-utils": "^7.13.0",
@@ -30051,23 +29626,6 @@
}
}
},
- "@fbtjs/default-collection-transform": {
- "version": "0.0.1",
- "peer": true,
- "requires": {
- "@babel/core": "^7.0.0",
- "@babel/generator": "^7.0.0",
- "@babel/parser": "^7.7.4",
- "@babel/plugin-syntax-class-properties": "^7.0.0",
- "@babel/plugin-syntax-flow": "^7.7.4",
- "@babel/plugin-syntax-jsx": "^7.0.0",
- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
- "@babel/plugin-syntax-numeric-separator": "^7.2.0",
- "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
- "@babel/plugin-syntax-optional-catch-binding": "^7.0.0",
- "@babel/plugin-syntax-optional-chaining": "^7.0.0"
- }
- },
"@fortawesome/fontawesome-free": {
"version": "5.15.3"
},
@@ -31757,16 +31315,6 @@
"safer-buffer": "^2.1.0"
}
},
- "assert": {
- "version": "2.0.0",
- "dev": true,
- "requires": {
- "es6-object-assign": "^1.1.0",
- "is-nan": "^1.2.1",
- "object-is": "^1.0.1",
- "util": "^0.12.0"
- }
- },
"assert-plus": {
"version": "1.0.0",
"dev": true
@@ -32043,35 +31591,11 @@
},
"babel-plugin-dynamic-import-node": {
"version": "2.3.3",
+ "dev": true,
"requires": {
"object.assign": "^4.1.0"
}
},
- "babel-plugin-fbt": {
- "version": "0.19.1",
- "requires": {
- "@babel/core": "^7.0.0",
- "@babel/generator": "^7.0.0",
- "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
- "@babel/plugin-transform-flow-strip-types": "^7.2.0",
- "@babel/plugin-transform-modules-commonjs": "^7.8.3",
- "@babel/types": "^7.2.2",
- "fb-babel-plugin-utils": "^0.12.0",
- "glob": "^7.1.6",
- "invariant": "^2.2.4",
- "jest-docblock": "^26.0.0",
- "nullthrows": "^1.1.1",
- "shelljs": "^0.8.4",
- "yargs": "^15.3.1"
- }
- },
- "babel-plugin-fbt-runtime": {
- "version": "0.9.16",
- "requires": {
- "@babel/core": "^7.0.0",
- "fbjs": "^1.0.0"
- }
- },
"babel-plugin-istanbul": {
"version": "6.0.0",
"dev": true,
@@ -33190,12 +32714,6 @@
"resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
"integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="
},
- "cli-color": {
- "version": "0.1.7",
- "requires": {
- "es5-ext": "0.8.x"
- }
- },
"cli-cursor": {
"version": "2.1.0",
"requires": {
@@ -34440,7 +33958,8 @@
"dev": true
},
"detect-newline": {
- "version": "3.1.0"
+ "version": "3.1.0",
+ "dev": true
},
"detect-node": {
"version": "2.0.5",
@@ -34481,12 +34000,6 @@
"randombytes": "^2.0.0"
}
},
- "difflib": {
- "version": "0.2.4",
- "requires": {
- "heap": ">= 0.2.0"
- }
- },
"dir-glob": {
"version": "3.0.1",
"requires": {
@@ -34621,12 +34134,6 @@
"create-hmac": "^1.1.4"
}
},
- "dreamopt": {
- "version": "0.6.0",
- "requires": {
- "wordwrap": ">=0.0.2"
- }
- },
"duplexer": {
"version": "0.1.2"
},
@@ -34741,12 +34248,6 @@
"version": "1.0.2",
"dev": true
},
- "encoding": {
- "version": "0.1.13",
- "requires": {
- "iconv-lite": "^0.6.2"
- }
- },
"end-of-stream": {
"version": "1.4.4",
"requires": {
@@ -34869,9 +34370,6 @@
"is-symbol": "^1.0.2"
}
},
- "es5-ext": {
- "version": "0.8.2"
- },
"es6-error": {
"version": "4.1.1"
},
@@ -34895,10 +34393,6 @@
}
}
},
- "es6-object-assign": {
- "version": "1.1.0",
- "dev": true
- },
"es6-symbol": {
"version": "3.1.3",
"dev": true,
@@ -35672,23 +35166,6 @@
"websocket-driver": ">=0.5.1"
}
},
- "fb-babel-plugin-utils": {
- "version": "0.12.0",
- "requires": {
- "@babel/core": "^7.0.0",
- "@babel/generator": "^7.0.0",
- "@babel/parser": "^7.7.4",
- "@babel/plugin-syntax-class-properties": "^7.0.0",
- "@babel/plugin-syntax-flow": "^7.7.4",
- "@babel/plugin-syntax-jsx": "^7.0.0",
- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
- "@babel/plugin-syntax-numeric-separator": "^7.2.0",
- "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
- "@babel/plugin-syntax-optional-catch-binding": "^7.0.0",
- "@babel/plugin-syntax-optional-chaining": "^7.0.0",
- "json-diff": "^0.5.4"
- }
- },
"fb-watchman": {
"version": "2.0.1",
"dev": true,
@@ -35696,139 +35173,6 @@
"bser": "2.1.1"
}
},
- "fbjs": {
- "version": "1.0.0",
- "requires": {
- "core-js": "^2.4.1",
- "fbjs-css-vars": "^1.0.0",
- "isomorphic-fetch": "^2.1.1",
- "loose-envify": "^1.0.0",
- "object-assign": "^4.1.0",
- "promise": "^7.1.1",
- "setimmediate": "^1.0.5",
- "ua-parser-js": "^0.7.18"
- },
- "dependencies": {
- "core-js": {
- "version": "2.6.12"
- }
- }
- },
- "fbjs-css-vars": {
- "version": "1.0.2"
- },
- "fbt": {
- "version": "0.16.4",
- "requires": {
- "invariant": "^2.2.4"
- }
- },
- "fbt-generate-translations": {
- "version": "0.0.4",
- "dev": true,
- "requires": {
- "assert": "^2.0.0",
- "yargs": "^13.3.0"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "4.1.0",
- "dev": true
- },
- "cliui": {
- "version": "5.0.0",
- "dev": true,
- "requires": {
- "string-width": "^3.1.0",
- "strip-ansi": "^5.2.0",
- "wrap-ansi": "^5.1.0"
- }
- },
- "emoji-regex": {
- "version": "7.0.3",
- "dev": true
- },
- "find-up": {
- "version": "3.0.0",
- "dev": true,
- "requires": {
- "locate-path": "^3.0.0"
- }
- },
- "is-fullwidth-code-point": {
- "version": "2.0.0",
- "dev": true
- },
- "locate-path": {
- "version": "3.0.0",
- "dev": true,
- "requires": {
- "p-locate": "^3.0.0",
- "path-exists": "^3.0.0"
- }
- },
- "p-locate": {
- "version": "3.0.0",
- "dev": true,
- "requires": {
- "p-limit": "^2.0.0"
- }
- },
- "path-exists": {
- "version": "3.0.0",
- "dev": true
- },
- "string-width": {
- "version": "3.1.0",
- "dev": true,
- "requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- }
- },
- "strip-ansi": {
- "version": "5.2.0",
- "dev": true,
- "requires": {
- "ansi-regex": "^4.1.0"
- }
- },
- "wrap-ansi": {
- "version": "5.1.0",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.0",
- "string-width": "^3.0.0",
- "strip-ansi": "^5.0.0"
- }
- },
- "yargs": {
- "version": "13.3.2",
- "dev": true,
- "requires": {
- "cliui": "^5.0.0",
- "find-up": "^3.0.0",
- "get-caller-file": "^2.0.1",
- "require-directory": "^2.1.1",
- "require-main-filename": "^2.0.0",
- "set-blocking": "^2.0.0",
- "string-width": "^3.0.0",
- "which-module": "^2.0.0",
- "y18n": "^4.0.0",
- "yargs-parser": "^13.1.2"
- }
- },
- "yargs-parser": {
- "version": "13.1.2",
- "dev": true,
- "requires": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
- }
- }
- }
- },
"fecha": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
@@ -36568,9 +35912,6 @@
"version": "1.2.0",
"dev": true
},
- "heap": {
- "version": "0.2.6"
- },
"hex-color-regex": {
"version": "1.1.0",
"dev": true
@@ -37089,11 +36430,9 @@
"side-channel": "^1.0.4"
}
},
- "interpret": {
- "version": "1.4.0"
- },
"invariant": {
"version": "2.2.4",
+ "dev": true,
"requires": {
"loose-envify": "^1.0.0"
}
@@ -37218,10 +36557,6 @@
"version": "2.1.0",
"dev": true
},
- "is-generator-function": {
- "version": "1.0.8",
- "dev": true
- },
"is-glob": {
"version": "4.0.1",
"requires": {
@@ -37240,14 +36575,6 @@
"is-map": {
"version": "2.0.2"
},
- "is-nan": {
- "version": "1.3.2",
- "dev": true,
- "requires": {
- "call-bind": "^1.0.0",
- "define-properties": "^1.1.3"
- }
- },
"is-negative-zero": {
"version": "2.0.1"
},
@@ -37392,25 +36719,6 @@
"isobject": {
"version": "3.0.1"
},
- "isomorphic-fetch": {
- "version": "2.2.1",
- "requires": {
- "node-fetch": "^1.0.1",
- "whatwg-fetch": ">=0.10.0"
- },
- "dependencies": {
- "is-stream": {
- "version": "1.1.0"
- },
- "node-fetch": {
- "version": "1.7.3",
- "requires": {
- "encoding": "^0.1.11",
- "is-stream": "^1.0.1"
- }
- }
- }
- },
"isstream": {
"version": "0.1.2",
"dev": true
@@ -37688,6 +36996,7 @@
},
"jest-docblock": {
"version": "26.0.0",
+ "dev": true,
"requires": {
"detect-newline": "^3.0.0"
}
@@ -39215,14 +38524,6 @@
"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
"integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
},
- "json-diff": {
- "version": "0.5.4",
- "requires": {
- "cli-color": "~0.1.6",
- "difflib": "~0.2.1",
- "dreamopt": "~0.6.0"
- }
- },
"json-parse-better-errors": {
"version": "1.0.2"
},
@@ -40510,9 +39811,6 @@
"boolbase": "~1.0.0"
}
},
- "nullthrows": {
- "version": "1.1.1"
- },
"num2fraction": {
"version": "1.2.2",
"dev": true
@@ -43470,12 +42768,6 @@
"progress": {
"version": "2.0.3"
},
- "promise": {
- "version": "7.3.1",
- "requires": {
- "asap": "~2.0.3"
- }
- },
"promise-inflight": {
"version": "1.0.1",
"dev": true
@@ -44260,12 +43552,6 @@
"util.promisify": "^1.0.0"
}
},
- "rechoir": {
- "version": "0.6.2",
- "requires": {
- "resolve": "^1.1.6"
- }
- },
"recursive-readdir": {
"version": "2.2.2",
"requires": {
@@ -45149,7 +44435,8 @@
}
},
"setimmediate": {
- "version": "1.0.5"
+ "version": "1.0.5",
+ "dev": true
},
"setprototypeof": {
"version": "1.1.1",
@@ -45177,14 +44464,6 @@
"shell-quote": {
"version": "1.7.2"
},
- "shelljs": {
- "version": "0.8.4",
- "requires": {
- "glob": "^7.0.0",
- "interpret": "^1.0.0",
- "rechoir": "^0.6.2"
- }
- },
"shellwords": {
"version": "0.1.1",
"dev": true,
@@ -47083,18 +46362,6 @@
"use": {
"version": "3.1.1"
},
- "util": {
- "version": "0.12.3",
- "dev": true,
- "requires": {
- "inherits": "^2.0.3",
- "is-arguments": "^1.0.4",
- "is-generator-function": "^1.0.7",
- "is-typed-array": "^1.1.3",
- "safe-buffer": "^5.1.2",
- "which-typed-array": "^1.1.2"
- }
- },
"util-deprecate": {
"version": "1.0.2"
},
diff --git a/web/cashtab/package.json b/web/cashtab/package.json
--- a/web/cashtab/package.json
+++ b/web/cashtab/package.json
@@ -14,7 +14,6 @@
"dotenv-expand": "^5.1.0",
"ecashaddrjs": "^1.0.1",
"ethereum-blockies-base64": "^1.0.2",
- "fbt": "^0.16.4",
"localforage": "^1.9.0",
"lodash.isempty": "^4.4.0",
"lodash.isequal": "^4.5.0",
@@ -39,16 +38,6 @@
]
},
"scripts": {
- "manifest-fbts": "NODE_ENV=production node node_modules/babel-plugin-fbt/dist/bin/manifest --src src",
- "collect-fbts": "NODE_ENV=production node node_modules/babel-plugin-fbt/dist/bin/collectFbt --pretty --manifest < .src_manifest.json > .source_strings.json",
- "translate-fbts": "NODE_ENV=production node node_modules/babel-plugin-fbt/dist/bin/translate.js --pretty --translations translations/*.json --jenkins > src/translatedFbts.json",
- "translate-fbts-single-file": "NODE_ENV=production node node_modules/babel-plugin-fbt/dist/bin/translate.js --pretty --jenkins --stdin < translation_input.json > src/translatedFbts.json",
- "clean-fbts": "rm .enum_manifest.json .src_manifest.json .source_strings.json src/translatedFbts.json 2&> /dev/null || exit 0",
- "fbt-generate-translations": "NODE_ENV=production node node_modules/fbt-generate-translations --locales src/i18n/locales.js --multi-files translations",
- "fbt-generate-translations-single-file": "NODE_ENV=production node node_modules/fbt-generate-translations --locales src/i18n/locales.js",
- "prepare-fbts": "NODE_ENV=production npm run manifest-fbts && npm run collect-fbts && npm run fbt-generate-translations && npm run translate-fbts",
- "prestart": "npm run prepare-fbts",
- "prebuild": "npm run prepare-fbts",
"start": "node scripts/start.js",
"build": "node scripts/build.js",
"extension": "./scripts/extension.sh",
@@ -151,8 +140,6 @@
"babel-eslint": "^10.0.3",
"babel-jest": "^26.6.3",
"babel-loader": "^8.0.6",
- "babel-plugin-fbt": "^0.19.1",
- "babel-plugin-fbt-runtime": "^0.9.16",
"babel-plugin-named-asset-import": "^0.3.7",
"babel-preset-react-app": "^10.0.0",
"camelcase": "^5.3.1",
@@ -167,7 +154,6 @@
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-webpack-plugin": "^2.5.4",
"extensionizer": "^1.0.1",
- "fbt-generate-translations": "^0.0.4",
"file-loader": "^6.2.0",
"fs-extra": "^7.0.1",
"html-webpack-plugin": "^4.5.1",
diff --git a/web/cashtab/src/components/App.js b/web/cashtab/src/components/App.js
--- a/web/cashtab/src/components/App.js
+++ b/web/cashtab/src/components/App.js
@@ -30,8 +30,6 @@
useHistory,
} from 'react-router-dom';
-import fbt from 'fbt';
-
const GlobalStyle = createGlobalStyle`
.ant-modal-wrap > div > div.ant-modal-content > div > div > div.ant-modal-confirm-btns > button, .ant-modal > button, .ant-modal-confirm-btns > button, .ant-modal-footer > button {
border-radius: 8px;
@@ -266,7 +264,7 @@
onClick={() => history.push('/wallet')}
>
- Wallet
+ Wallet
history.push('/send')}
>
- Send
+ Send
history.push('/configure')}
>
- Settings
+ Settings
) : null}
diff --git a/web/cashtab/src/i18n/init.js b/web/cashtab/src/i18n/init.js
deleted file mode 100644
--- a/web/cashtab/src/i18n/init.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { init } from 'fbt';
-import translations from '../translatedFbts.json';
-import locales from './locales';
-const viewerContext = {
- locale: navigator.language.replace('-', '_'),
-};
-
-init({
- translations,
- hooks: {
- getViewerContext: () => viewerContext,
- },
- locales,
- defaultLocale: navigator.language,
-});
diff --git a/web/cashtab/src/i18n/locales.js b/web/cashtab/src/i18n/locales.js
deleted file mode 100644
--- a/web/cashtab/src/i18n/locales.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
- en_US: {
- bcp47: 'en-US',
- displayName: 'English (US)',
- englishName: 'English (US)',
- rtl: false,
- },
- pt_BR: {
- bcp47: 'pt-BR',
- displayName: 'Português (Brasil)',
- englishName: 'Portuguese (Brazilian)',
- rtl: false,
- },
-};
diff --git a/web/cashtab/translations/en_US.json b/web/cashtab/translations/en_US.json
deleted file mode 100644
--- a/web/cashtab/translations/en_US.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "fb-locale": "en_US",
- "translations": {
- "t+5SwD1ho9xhYy5PlfAPGg==": {
- "translations": [
- {
- "translation": "Wallet"
- }
- ]
- },
- "fXmXHZxGc0NA87a+A1ppng==": {
- "translations": [
- {
- "translation": "Send"
- }
- ]
- },
- "M8PvPwXAFjS9vGdEg8xnWw==": {
- "translations": [
- {
- "translation": "Settings"
- }
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/web/cashtab/translations/pt_BR.json b/web/cashtab/translations/pt_BR.json
deleted file mode 100644
--- a/web/cashtab/translations/pt_BR.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "fb-locale": "pt_BR",
- "translations": {
- "t+5SwD1ho9xhYy5PlfAPGg==": {
- "translations": [
- {
- "translation": "Carteira"
- }
- ]
- },
- "fXmXHZxGc0NA87a+A1ppng==": {
- "translations": [
- {
- "translation": "Enviar"
- }
- ]
- },
- "M8PvPwXAFjS9vGdEg8xnWw==": {
- "translations": [
- {
- "translation": "Opções"
- }
- ]
- }
- }
-}
\ No newline at end of file