diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8f9b743..c74dbfdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## [1.12.5] - 2019-08-03
+
+### Fix
+
+- [#176](https://github.com/benhurott/react-native-masked-text/issues/176) Deprecation Warning: componentWillReceiveProps
+    - Thanks to [Maksim Markelov](https://github.com/mmarkelov) for contributing!
+
+### Chore
+
+- Use find instead of filter on mask resolver.
+    - Thanks to [rodineijf](https://github.com/rodineijf) for contributing!
+
 ## [1.12.4] - 2019-07-12
 
 ### Fix
diff --git a/dist/lib/base-text-component.js b/dist/lib/base-text-component.js
index 6334ef5f..f605f2bb 100644
--- a/dist/lib/base-text-component.js
+++ b/dist/lib/base-text-component.js
@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);var _maskResolver=require('./mask-resolver');var _maskResolver2=_interopRequireDefault(_maskResolver);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var BaseTextComponent=function(_PureComponent){_inherits(BaseTextComponent,_PureComponent);function BaseTextComponent(props){_classCallCheck(this,BaseTextComponent);var _this=_possibleConstructorReturn(this,(BaseTextComponent.__proto__||Object.getPrototypeOf(BaseTextComponent)).call(this,props));_this._resolveMaskHandler();return _this;}_createClass(BaseTextComponent,[{key:'componentDidMount',value:function componentDidMount(){this._bindProps(this.props);}},{key:'componentWillReceiveProps',value:function componentWillReceiveProps(nextProps){this._bindProps(nextProps);}},{key:'updateValue',value:function updateValue(text){var maskedText=this._getMaskedValue(text);var rawText=this.props.includeRawValueInChangeText?this.getRawValueFor(maskedText):undefined;return{maskedText:maskedText,rawText:rawText};}},{key:'isValid',value:function isValid(){return this._maskHandler.validate(this._getDefaultValue(this.props.value),this._getOptions());}},{key:'getRawValueFor',value:function getRawValueFor(value){return this._maskHandler.getRawValue(this._getDefaultValue(value),this._getOptions());}},{key:'getRawValue',value:function getRawValue(){return this.getRawValueFor(this.props.value);}},{key:'getDisplayValueFor',value:function getDisplayValueFor(value){return this._getMaskedValue(value);}},{key:'_getOptions',value:function _getOptions(){return this.props.options;}},{key:'_mustUpdateValue',value:function _mustUpdateValue(newValue){return this.props.value!==newValue;}},{key:'_resolveMaskHandler',value:function _resolveMaskHandler(){this._maskHandler=_maskResolver2.default.resolve(this.props.type);}},{key:'_bindProps',value:function _bindProps(nextProps){if(this.props.type!==nextProps.type){this._resolveMaskHandler();}}},{key:'_getDefaultMaskedValue',value:function _getDefaultMaskedValue(value){if(this._getDefaultValue(value)===''){return'';}return this._getMaskedValue(value);}},{key:'_getMaskedValue',value:function _getMaskedValue(value){var defaultValue=this._getDefaultValue(value);if(defaultValue===''){return'';}return this._maskHandler.getValue(defaultValue,this._getOptions());}},{key:'_getDefaultValue',value:function _getDefaultValue(value){if(value===undefined||value===null){return'';}return value;}}]);return BaseTextComponent;}(_react.PureComponent);exports.default=BaseTextComponent;
\ No newline at end of file
+Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);var _maskResolver=require('./mask-resolver');var _maskResolver2=_interopRequireDefault(_maskResolver);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var BaseTextComponent=function(_PureComponent){_inherits(BaseTextComponent,_PureComponent);function BaseTextComponent(props){_classCallCheck(this,BaseTextComponent);var _this=_possibleConstructorReturn(this,(BaseTextComponent.__proto__||Object.getPrototypeOf(BaseTextComponent)).call(this,props));_this._resolveMaskHandler();return _this;}_createClass(BaseTextComponent,[{key:'componentDidMount',value:function componentDidMount(){this._bindProps(this.props);}},{key:'componentDidUpdate',value:function componentDidUpdate(){this._bindProps(this.props);}},{key:'updateValue',value:function updateValue(text){var maskedText=this._getMaskedValue(text);var rawText=this.props.includeRawValueInChangeText?this.getRawValueFor(maskedText):undefined;return{maskedText:maskedText,rawText:rawText};}},{key:'isValid',value:function isValid(){return this._maskHandler.validate(this._getDefaultValue(this.props.value),this._getOptions());}},{key:'getRawValueFor',value:function getRawValueFor(value){return this._maskHandler.getRawValue(this._getDefaultValue(value),this._getOptions());}},{key:'getRawValue',value:function getRawValue(){return this.getRawValueFor(this.props.value);}},{key:'getDisplayValueFor',value:function getDisplayValueFor(value){return this._getMaskedValue(value);}},{key:'_getOptions',value:function _getOptions(){return this.props.options;}},{key:'_mustUpdateValue',value:function _mustUpdateValue(newValue){return this.props.value!==newValue;}},{key:'_resolveMaskHandler',value:function _resolveMaskHandler(){this._maskHandler=_maskResolver2.default.resolve(this.props.type);}},{key:'_bindProps',value:function _bindProps(nextProps){if(this.props.type!==nextProps.type){this._resolveMaskHandler();}}},{key:'_getDefaultMaskedValue',value:function _getDefaultMaskedValue(value){if(this._getDefaultValue(value)===''){return'';}return this._getMaskedValue(value);}},{key:'_getMaskedValue',value:function _getMaskedValue(value){var defaultValue=this._getDefaultValue(value);if(defaultValue===''){return'';}return this._maskHandler.getValue(defaultValue,this._getOptions());}},{key:'_getDefaultValue',value:function _getDefaultValue(value){if(value===undefined||value===null){return'';}return value;}}]);return BaseTextComponent;}(_react.PureComponent);exports.default=BaseTextComponent;
\ No newline at end of file
diff --git a/dist/lib/mask-resolver.js b/dist/lib/mask-resolver.js
index 1d10f727..9d25d454 100644
--- a/dist/lib/mask-resolver.js
+++ b/dist/lib/mask-resolver.js
@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _masks=require('./masks');var Masks=_interopRequireWildcard(_masks);function _interopRequireWildcard(obj){if(obj&&obj.__esModule){return obj;}else{var newObj={};if(obj!=null){for(var key in obj){if(Object.prototype.hasOwnProperty.call(obj,key))newObj[key]=obj[key];}}newObj.default=obj;return newObj;}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}var maskKeys=Object.keys(Masks);var MaskResolver=function(){function MaskResolver(){_classCallCheck(this,MaskResolver);}_createClass(MaskResolver,null,[{key:'resolve',value:function resolve(type){var maskKey=maskKeys.filter(function(m){var handler=Masks[m];return handler&&handler.getType&&handler.getType()===type;})[0];var handler=Masks[maskKey];if(!handler){throw new Error('Mask type not supported.');}return new handler();}}]);return MaskResolver;}();exports.default=MaskResolver;
\ No newline at end of file
+Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _masks=require('./masks');var Masks=_interopRequireWildcard(_masks);function _interopRequireWildcard(obj){if(obj&&obj.__esModule){return obj;}else{var newObj={};if(obj!=null){for(var key in obj){if(Object.prototype.hasOwnProperty.call(obj,key))newObj[key]=obj[key];}}newObj.default=obj;return newObj;}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}var maskKeys=Object.keys(Masks);var MaskResolver=function(){function MaskResolver(){_classCallCheck(this,MaskResolver);}_createClass(MaskResolver,null,[{key:'resolve',value:function resolve(type){var maskKey=maskKeys.find(function(m){var handler=Masks[m];return handler&&handler.getType&&handler.getType()===type;});var handler=Masks[maskKey];if(!handler){throw new Error('Mask type not supported.');}return new handler();}}]);return MaskResolver;}();exports.default=MaskResolver;
\ No newline at end of file
diff --git a/lib/base-text-component.js b/lib/base-text-component.js
index cd87314b..e4da6950 100644
--- a/lib/base-text-component.js
+++ b/lib/base-text-component.js
@@ -11,8 +11,8 @@ export default class BaseTextComponent extends PureComponent {
         this._bindProps(this.props);
     }
 
-    componentWillReceiveProps(nextProps) {
-        this._bindProps(nextProps);
+    componentDidUpdate() {
+        this._bindProps(this.props);
     }
 
     updateValue(text) {
diff --git a/lib/mask-resolver.js b/lib/mask-resolver.js
index 1853099d..125abcb7 100644
--- a/lib/mask-resolver.js
+++ b/lib/mask-resolver.js
@@ -4,10 +4,10 @@ var maskKeys = Object.keys(Masks);
 
 export default class MaskResolver {
 	static resolve(type) {
-		let maskKey = maskKeys.filter(m => {
+		let maskKey = maskKeys.find(m => {
 			var handler = Masks[m];
 			return handler && handler.getType && handler.getType() === type;
-		})[0];
+		});
 
 		let handler = Masks[maskKey];
 
diff --git a/package.json b/package.json
index 33f1b690..574624ab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-masked-text",
-    "version": "1.12.4",
+    "version": "1.12.5",
     "description": "Text and TextInput with mask for React Native applications",
     "licenses": [
         {