Skip to content

Commit

Permalink
Rebrand: s/Copay/Cobit
Browse files Browse the repository at this point in the history
- Transition to Cobit as the default (and only) flavor
- Update app config (appConfig.json, package.json, config.xml)
- Update API keys (google services, firebase)
- Update texts and URLs
- Update license
  • Loading branch information
shesek committed Aug 26, 2017
1 parent 388c536 commit 3139e5e
Show file tree
Hide file tree
Showing 31 changed files with 99 additions and 108 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install:
- npm run apply:bitpay
- npm run apply:cobit
# after_success:
# - npm run exec:coveralls
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2016 BitPay, Inc.
Copyright (c) 2017 The Cobit Developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion app-template/apply.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var templates = {
'manifest.json': 'chrome-app/',
// 'bower.json': '/',
};
var configDir = process.argv[2] || 'copay';
var configDir = process.argv[2] || 'cobit';
var JSONheader = ' { ' + "\n" + ' "//":"Changes to this file will be overwritten",' + "\n" + ' "//":" Modify it in the app-template directory", ' + "\n";

var MakefileHeader = "# PLEASE! Do not edit this file directly \n# Modify it at app-template/\n";
Expand Down
20 changes: 10 additions & 10 deletions app-template/cobit/GoogleService-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,34 @@
<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
<string>ca-app-pub-3940256099942544/4411468910</string>
<key>CLIENT_ID</key>
<string>149194066736-tukkdahsck00842frm4l7c2r04bhhj4l.apps.googleusercontent.com</string>
<string>506418741918-crv77qia0kb4djbtg7tlju56ugdbfe19.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.149194066736-tukkdahsck00842frm4l7c2r04bhhj4l</string>
<string>com.googleusercontent.apps.506418741918-crv77qia0kb4djbtg7tlju56ugdbfe19</string>
<key>API_KEY</key>
<string>AIzaSyAygvOaO5hmkL2Vze66yVAGU2QhcoTyZFA</string>
<string>AIzaSyArISIWo0fgqiGCL1Mfc3tN-7U3e7fax50</string>
<key>GCM_SENDER_ID</key>
<string>149194066736</string>
<string>506418741918</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.bitpay.copay</string>
<string>com.cobit</string>
<key>PROJECT_ID</key>
<string>bitpay-wallet</string>
<string>cobit-89d4a</string>
<key>STORAGE_BUCKET</key>
<string>bitpay-wallet.appspot.com</string>
<string>cobit-89d4a.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<true/>
<key>IS_ANALYTICS_ENABLED</key>
<false/>
<key>IS_APPINVITE_ENABLED</key>
<true/>
<false/>
<key>IS_GCM_ENABLED</key>
<true/>
<key>IS_SIGNIN_ENABLED</key>
<true/>
<key>GOOGLE_APP_ID</key>
<string>1:149194066736:ios:6de8942b48fea047</string>
<string>1:506418741918:ios:0821b2684746d9ce</string>
<key>DATABASE_URL</key>
<string>https://bitpay-wallet.firebaseio.com</string>
<string>https://cobit-89d4a.firebaseio.com</string>
</dict>
</plist>
58 changes: 29 additions & 29 deletions app-template/cobit/appConfig.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
{
"packageName": "copay",
"packageDescription": "Copay Bitcoin Wallet",
"packageNameId": "com.bitpay.copay",
"statusBarColor": "#192c3a",
"userVisibleName": "Copay",
"purposeLine": "Copay Bitcoin Wallet",
"bundleName": "copay",
"appUri": "copay",
"name": "copay",
"nameNoSpace": "copay",
"nameCase": "Copay",
"nameCaseNoSpace": "Copay",
"gitHubRepoName": "copay",
"gitHubRepoUrl": "git://github.com/bitpay/copay.git",
"gitHubRepoBugs": "https://github.com/bitpay/copay/issues",
"disclaimerUrl": "https://copay.io/disclaimer",
"url": "https://copay.io",
"appDescription": "Copay Bitcoin Wallet",
"winAppName": "CopayWallet",
"WindowsStoreIdentityName": "18C7659D.Copay-SecureBitcoinWallet",
"WindowsStoreDisplayName": "Copay - Secure Bitcoin Wallet",
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
"pushSenderId": "1036948132229",
"description": "A Secure Bitcoin Wallet",
"version": "3.7.3",
"androidVersion": "373000",
"packageName": "cobit",
"packageDescription": "Cobit Bitcoin Wallet",
"packageNameId": "com.cobit",
"statusBarColor": "#e95420",
"userVisibleName": "Cobit",
"purposeLine": "Cobit Bitcoin Wallet",
"bundleName": "cobit",
"appUri": "cobit",
"name": "cobit",
"nameNoSpace": "cobit",
"nameCase": "Cobit",
"nameCaseNoSpace": "Cobit",
"gitHubRepoName": "cobit",
"gitHubRepoUrl": "git://github.com/cobit-wallet/cobit.git",
"gitHubRepoBugs": "https://github.com/cobit-wallet/cobit/issues",
"disclaimerUrl": "https://cobit.community/disclaimer",
"url": "https://cobit.community",
"appDescription": "Cobit Bitcoin Wallet",
"winAppName": "CobitWallet",
"WindowsStoreIdentityName": "",
"WindowsStoreDisplayName": "",
"windowsAppId": "",
"pushSenderId": "",
"description": "Secure Bitcoin Wallet (Community Edition)",
"version": "0.1.0",
"androidVersion": "1",
"_extraCSS": null,
"_enabledExtensions": {
"coinbase": true,
"glidera": true,
"amazon": true
"coinbase": false,
"glidera": false,
"amazon": false
}
}
18 changes: 9 additions & 9 deletions app-template/cobit/google-services.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"project_info": {
"project_number": "149194066736",
"firebase_url": "https://bitpay-wallet.firebaseio.com",
"project_id": "bitpay-wallet",
"storage_bucket": "bitpay-wallet.appspot.com"
"project_number": "506418741918",
"firebase_url": "https://cobit-89d4a.firebaseio.com",
"project_id": "cobit-89d4a",
"storage_bucket": "cobit-89d4a.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:149194066736:android:6de8942b48fea047",
"mobilesdk_app_id": "1:506418741918:android:0821b2684746d9ce",
"android_client_info": {
"package_name": "com.bitpay.copay"
"package_name": "com.cobit"
}
},
"oauth_client": [
{
"client_id": "149194066736-1gf0d9nk288dke5jdiuj8unkplhl8nco.apps.googleusercontent.com",
"client_id": "506418741918-1qigk739j9trn46u7fqdggkblr0fop89.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCZ8nyjRBe-0Lyur0LjO-SOkjv32uNQKy0"
"current_key": "AIzaSyCuAAGX0BLiPq8Ax8cjuoffUNgRwoMTEUY"
}
],
"services": {
Expand All @@ -39,4 +39,4 @@
}
],
"configuration_version": "1"
}
}
6 changes: 3 additions & 3 deletions app-template/config-template.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.bitpay.*BUNDLENAME*"
<widget id="com.cobit"
version="*VERSION*"
android-versionCode="*ANDROIDVERSION*"
ios-CFBundleVersion="*VERSION*">
<name>*USERVISIBLENAME*</name>
<description>
*PURPOSELINE*
</description>
<author email="[email protected]" href="*URL*">
BitPay Inc.
<author email="[email protected]" href="*URL*">
The Cobit Developers
</author>
<content src="index.html" />
<access origin="*" />
Expand Down
2 changes: 1 addition & 1 deletion app-template/ionic.config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "*USERVISIBLENAME*",
"app_id": "com.bitpay.*BUNDLENAME*"
"app_id": "com.cobit"
}
2 changes: 1 addition & 1 deletion app-template/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"manifest_version": 2,
"name": "*PACKAGENAME*",
"name": "*PURPOSELINE*",
"description": "*DESCRIPTION*",
"version": "*VERSION*",
"permissions": [
Expand Down
11 changes: 5 additions & 6 deletions app-template/package-template.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "*PACKAGENAME*",
"description": "*DESCRIPTION*",
"author": "BitPay",
"author": "Cobit",
"version": "*VERSION*",
"keywords": [
"bitcoin",
"wallet",
"bitpay",
"copay",
"multisignature",
"bitcore"
"community",
"rough consensus",
"running code"
],
"main": "www/index.html",
"title": "*USERVISIBLENAME*",
Expand Down Expand Up @@ -108,8 +108,7 @@
"run:android-release": "cordova run android --device --release",
"log:android": "adb logcat | grep chromium",
"sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/25.0.3/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk",
"apply:copay": "npm i fs-extra && cd app-template && node apply.js copay && npm i && cordova prepare",
"apply:bitpay": "npm i fs-extra && cd app-template && node apply.js bitpay && npm i && cordova prepare",
"apply:cobit": "npm i fs-extra && cd app-template && node apply.js cobit && npm i && cordova prepare",
"test": "echo \"no package tests configured\"",
"clean": "trash platforms && trash plugins && cordova prepare",
"unstage-package": "git reset package.json",
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "copay",
"name": "cobit",
"keywords": [
"copay",
"cobit",
"wallet",
"multisignature",
"bitcore"
Expand Down
4 changes: 2 additions & 2 deletions chrome-app/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Configs
BUILDDIR=build
ZIPFILE=copay-chrome-extension.zip
ZIPFILE=cobit-chrome-extension.zip

INCLUDE=$(shell cat ./include)
INITIAL=./initial.js
Expand All @@ -24,4 +24,4 @@ $(ZIPFILE): dir files
cd $(BUILDDIR)
rm -f $(ZIPFILE)
zip -qr $(ZIPFILE) "`basename $(BUILDDIR)`"
@echo "** The Chrome Extension is ready at copay-chrome-extension.zip"
@echo "** The Chrome Extension is ready at cobit-chrome-extension.zip"
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"name": "distribution-not-selected",
"description": "Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.",
"description": "Set the distribution by running 'npm run apply:cobit'.",
"primary-package-json": "See the tempate in app-template/package.json",
"pre-commit": "unstage-package",
"changes": "changes to this file can be commited with the --no-verify option",
"scripts": {
"postinstall": "npm run apply:copay && echo && echo \"Repo configured for standard Copay distribution. To switch to the BitPay distribution, run 'npm run apply:bitpay'.\" && echo",
"start": "echo && echo \"Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo",
"apply:copay": "npm i [email protected] && cd app-template && node apply.js copay && cd .. && npm i",
"apply:bitpay": "npm i [email protected] && cd app-template && node apply.js bitpay && cd .. && npm i",
"postinstall": "npm run apply:cobit && echo && echo \"Repo configured for standard Cobit distribution.\" && echo",
"start": "echo && echo \"Set the distribution by running 'npm run apply:cobit'.\" && echo",
"apply:cobit": "npm i [email protected] && cd app-template && node apply.js cobit && cd .. && npm i",
"unstage-package": "git reset package.json",
"clean-all": "git clean -dfx"
},
Expand All @@ -17,7 +16,7 @@
},
"license": "MIT",
"repository": {
"url": "git://github.com/bitpay/bitpay-wallet.git",
"url": "git://github.com/cobit-wallet/cobit.git",
"type": "git"
}
}
2 changes: 1 addition & 1 deletion src/js/controllers/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ angular.module('copayApp.controllers').controller('createController',
*/

if (appConfigService.name == 'copay') {
if (appConfigService.name == 'cobit') {
if (n > 1 && walletService.externalSource.ledger.supported)
seedOptions.push({
id: walletService.externalSource.ledger.id,
Expand Down
2 changes: 1 addition & 1 deletion src/js/controllers/feedback/complete.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('completeController', function
});

var defaults = configService.getDefaults();
var downloadUrl = appConfigService.name == 'copay' ? defaults.download.copay.url : defaults.download.bitpay.url;
var downloadUrl = defaults.download.cobit.url

function quickFeedback(cb) {
window.plugins.spinnerDialog.show();
Expand Down
4 changes: 2 additions & 2 deletions src/js/controllers/feedback/rateApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ angular.module('copayApp.controllers').controller('rateAppController', function(
var defaults = configService.getDefaults();
var url;
if (isAndroid)
url = $scope.appName == 'Copay' ? defaults.rateApp.copay.android : defaults.rateApp.bitpay.android;
url = defaults.rateApp.cobit.android;
if (isIOS)
url = $scope.appName == 'Copay' ? defaults.rateApp.copay.ios : defaults.rateApp.bitpay.ios;
url = defaults.rateApp.cobit.ios;

externalLinkService.open(url);
$state.go('tabs.rate.complete', {
Expand Down
2 changes: 1 addition & 1 deletion src/js/controllers/import.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ angular.module('copayApp.controllers').controller('importController',
$scope.formData.derivationPath = derivationPathHelper.default;
$scope.formData.account = 1;
$scope.importErr = false;
$scope.isCopay = appConfigService.name == 'copay';
$scope.isCopay = appConfigService.name == 'cobit';
$scope.fromHardwareWallet = { value: false };

if ($stateParams.code)
Expand Down
3 changes: 2 additions & 1 deletion src/js/controllers/join.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ angular.module('copayApp.controllers').controller('joinController',
if ($stateParams.url) {
var data = $stateParams.url;
data = data.replace('copay:', '');
data = data.replace('cobit:', '');
$scope.onQrCodeScannedJoin(data);
}

Expand All @@ -74,7 +75,7 @@ angular.module('copayApp.controllers').controller('joinController',
*/

if (appConfigService.name == 'copay') {
if (appConfigService.name == 'cobit') {
if (walletService.externalSource.ledger.supported) {
$scope.seedOptions.push({
id: walletService.externalSource.ledger.id,
Expand Down
2 changes: 1 addition & 1 deletion src/js/controllers/onboarding/backupRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ angular.module('copayApp.controllers').controller('backupRequestController', fun
$scope.openPopup = function() {

var title = gettextCatalog.getString('Watch out!');
var message = gettextCatalog.getString('If this device is replaced or this app is deleted, neither you nor BitPay can recover your funds without a backup.');
var message = gettextCatalog.getString('If this device is replaced or this app is deleted, neither you nor Cobit can recover your funds without a backup.');
var okText = gettextCatalog.getString('I understand');
var cancelText = gettextCatalog.getString('Go back');
popupService.showConfirm(title, message, okText, cancelText, function(val) {
Expand Down
2 changes: 1 addition & 1 deletion src/js/controllers/onboarding/terms.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ angular.module('copayApp.controllers').controller('termsController', function($s
var url = appConfigService.disclaimerUrl;
var optIn = true;
var title = gettextCatalog.getString('View Terms of Service');
var message = gettextCatalog.getString('The official English Terms of Service are available on the BitPay website.');
var message = gettextCatalog.getString('The official English Terms of Service are available on the Cobit website.');
var okText = gettextCatalog.getString('Open Website');
var cancelText = gettextCatalog.getString('Go Back');
externalLinkService.open(url, optIn, title, message, okText, cancelText);
Expand Down
2 changes: 1 addition & 1 deletion src/js/controllers/preferencesAbout.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('preferencesAbout',
$scope.commitHash = $window.commitHash;

$scope.openExternalLink = function() {
var url = 'https://github.com/bitpay/' + appConfigService.gitHubRepoName + '/tree/' + $window.commitHash + '';
var url = 'https://github.com/cobit-wallet/' + appConfigService.gitHubRepoName + '/tree/' + $window.commitHash + '';
var optIn = true;
var title = gettextCatalog.getString('Open GitHub Project');
var message = gettextCatalog.getString('You can see the latest developments and contribute to this open source app by visiting our project on GitHub.');
Expand Down
4 changes: 2 additions & 2 deletions src/js/controllers/preferencesLogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ angular.module('copayApp.controllers').controller('preferencesLogs',
};

$scope.prepareLogs = function() {
var log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n';
var log = 'Cobit Session Logs\n Be careful, this could contain sensitive private data\n\n';
log += '\n\n';
log += historicLog.get().map(function(v) {
return '[' + v.timestamp + '][' + v.level + ']' + v.msg;
Expand All @@ -48,7 +48,7 @@ angular.module('copayApp.controllers').controller('preferencesLogs',

window.plugins.socialsharing.shareViaEmail(
body,
'Copay Logs',
'Cobit Logs',
null, // TO: must be null or an array
null, // CC: must be null or an array
null, // BCC: must be null or an array
Expand Down
Loading

0 comments on commit 3139e5e

Please sign in to comment.